diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-07 12:23:31 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-07 12:23:31 -0700 |
| commit | 9fa0853a85a3a4067e4ad0aaa5d90984c2dd21b5 (patch) | |
| tree | ac90f6535bc053b3859dc050cbbd577a0a1ef95b /net/Makefile | |
| parent | ef93127e4c7b4b8d46421045641048397eaac43d (diff) | |
| parent | cf4328cd949c2086091c62c5685f1580fe9b55e4 (diff) | |
| download | op-kernel-dev-9fa0853a85a3a4067e4ad0aaa5d90984c2dd21b5.zip op-kernel-dev-9fa0853a85a3a4067e4ad0aaa5d90984c2dd21b5.tar.gz | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6:
[NET]: rfkill: add support for input key to control wireless radio
[NET] net/core: Fix error handling
[TG3]: Update version and reldate.
[TG3]: Eliminate spurious interrupts.
[TG3]: Add ASPM workaround.
[Bluetooth] Correct SCO buffer for another Broadcom based dongle
[Bluetooth] Add support for Targus ACB10US USB dongle
[Bluetooth] Disconnect L2CAP connection after last RFCOMM DLC
[Bluetooth] Check that device is in rfcomm_dev_list before deleting
[Bluetooth] Use in-kernel sockets API
[Bluetooth] Attach host adapters to the Bluetooth bus
[Bluetooth] Fix L2CAP and HCI setsockopt() information leaks
Diffstat (limited to 'net/Makefile')
| -rw-r--r-- | net/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/Makefile b/net/Makefile index 9fdb60c..34e5b2d 100644 --- a/net/Makefile +++ b/net/Makefile @@ -51,6 +51,7 @@ obj-$(CONFIG_IEEE80211) += ieee80211/ obj-$(CONFIG_TIPC) += tipc/ obj-$(CONFIG_NETLABEL) += netlabel/ obj-$(CONFIG_IUCV) += iucv/ +obj-$(CONFIG_RFKILL) += rfkill/ ifeq ($(CONFIG_NET),y) obj-$(CONFIG_SYSCTL) += sysctl_net.o |
