]> err.no Git - linux-2.6/commit
IB/ipath: merge ipath_core and ib_ipath drivers
authorBryan O'Sullivan <bos@pathscale.com>
Fri, 25 Aug 2006 18:24:31 +0000 (11:24 -0700)
committerRoland Dreier <rolandd@cisco.com>
Fri, 22 Sep 2006 22:22:30 +0000 (15:22 -0700)
commitb1c1b6a30eac88665a35a207cc5e6233090b9d65
tree7f2351404d45a48688e3cc2be355d2fb016e4b18
parent367fe711c5dc85dbc3265cf01e34d4d6fbd55f06
IB/ipath: merge ipath_core and ib_ipath drivers

There is little point in keeping the two drivers separate, so we are
merging them.

Signed-off-by: Bryan O'Sullivan <bryan.osullivan@qlogic.com>
Signed-off-by: Roland Dreier <rolandd@cisco.com>
drivers/infiniband/Makefile
drivers/infiniband/hw/ipath/Kconfig
drivers/infiniband/hw/ipath/Makefile
drivers/infiniband/hw/ipath/ipath_driver.c
drivers/infiniband/hw/ipath/ipath_intr.c
drivers/infiniband/hw/ipath/ipath_kernel.h
drivers/infiniband/hw/ipath/ipath_layer.c
drivers/infiniband/hw/ipath/ipath_layer.h
drivers/infiniband/hw/ipath/ipath_verbs.c
drivers/infiniband/hw/ipath/ipath_verbs.h