diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-04-02 15:51:22 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-04-02 15:51:22 -0400 |
| commit | cd5e25d93e6efeb93db7b6731b0a674495270621 (patch) | |
| tree | 82b38420e37cf3cc71ddbd85b53e874a1f0c2299 /drivers/Makefile | |
| parent | 86dca4f8e6ab1fd8a3fb5838163fc9d7990f416e (diff) | |
| parent | 77d8798b554c856e21400bc8e761bc1b2ded8967 (diff) | |
Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband
* 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband:
IB/ipath: kbuild infrastructure
IB/ipath: infiniband verbs support
IB/ipath: misc infiniband code, part 2
IB/ipath: misc infiniband code, part 1
IB/ipath: infiniband RC protocol support
IB/ipath: infiniband UC and UD protocol support
IB/ipath: infiniband header files
IB/ipath: layering interfaces used by higher-level driver code
IB/ipath: support for userspace apps using core driver
IB/ipath: sysfs and ipathfs support for core driver
IB/ipath: misc driver support code
IB/ipath: chip initialisation code, and diag support
IB/ipath: support for PCI Express devices
IB/ipath: support for HyperTransport devices
IB/ipath: core driver header files
IB/ipath: core device driver
Diffstat (limited to 'drivers/Makefile')
| -rw-r--r-- | drivers/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/Makefile b/drivers/Makefile index 55205c8d2318..447d8e68887a 100644 --- a/drivers/Makefile +++ b/drivers/Makefile | |||
| @@ -69,6 +69,7 @@ obj-$(CONFIG_CPU_FREQ) += cpufreq/ | |||
| 69 | obj-$(CONFIG_MMC) += mmc/ | 69 | obj-$(CONFIG_MMC) += mmc/ |
| 70 | obj-$(CONFIG_NEW_LEDS) += leds/ | 70 | obj-$(CONFIG_NEW_LEDS) += leds/ |
| 71 | obj-$(CONFIG_INFINIBAND) += infiniband/ | 71 | obj-$(CONFIG_INFINIBAND) += infiniband/ |
| 72 | obj-$(CONFIG_IPATH_CORE) += infiniband/ | ||
| 72 | obj-$(CONFIG_SGI_SN) += sn/ | 73 | obj-$(CONFIG_SGI_SN) += sn/ |
| 73 | obj-y += firmware/ | 74 | obj-y += firmware/ |
| 74 | obj-$(CONFIG_CRYPTO) += crypto/ | 75 | obj-$(CONFIG_CRYPTO) += crypto/ |