diff options
| author | Bryan O'Sullivan <bos@pathscale.com> | 2006-08-25 22:24:31 +0400 |
|---|---|---|
| committer | Roland Dreier <rolandd@cisco.com> | 2006-09-23 02:22:30 +0400 |
| commit | b1c1b6a30eac88665a35a207cc5e6233090b9d65 (patch) | |
| tree | 7f2351404d45a48688e3cc2be355d2fb016e4b18 /drivers/infiniband/Makefile | |
| parent | 367fe711c5dc85dbc3265cf01e34d4d6fbd55f06 (diff) | |
| download | linux-b1c1b6a30eac88665a35a207cc5e6233090b9d65.tar.xz | |
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>
Diffstat (limited to 'drivers/infiniband/Makefile')
| -rw-r--r-- | drivers/infiniband/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/infiniband/Makefile b/drivers/infiniband/Makefile index 893bee0a50b5..08cff32d900e 100644 --- a/drivers/infiniband/Makefile +++ b/drivers/infiniband/Makefile @@ -1,6 +1,6 @@ obj-$(CONFIG_INFINIBAND) += core/ obj-$(CONFIG_INFINIBAND_MTHCA) += hw/mthca/ -obj-$(CONFIG_IPATH_CORE) += hw/ipath/ +obj-$(CONFIG_INFINIBAND_IPATH) += hw/ipath/ obj-$(CONFIG_INFINIBAND_EHCA) += hw/ehca/ obj-$(CONFIG_INFINIBAND_IPOIB) += ulp/ipoib/ obj-$(CONFIG_INFINIBAND_SRP) += ulp/srp/ |