summaryrefslogtreecommitdiffstats
path: root/drivers/Makefile
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-10-25 08:05:29 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2010-10-25 08:05:29 -0700
commitb7d41a9fbb364c67d91c3588e117eba547e2d4bf (patch)
treeabf95ce77eaa8b7aed30fded4d3592b4af152a99 /drivers/Makefile
parentda47c19e5c746829042933c8f945a71e2b62d6fc (diff)
parent66fa12c571d35e3cd62574c65f1785a460105397 (diff)
downloadlinux-stable-b7d41a9fbb364c67d91c3588e117eba547e2d4bf.tar.gz
linux-stable-b7d41a9fbb364c67d91c3588e117eba547e2d4bf.tar.bz2
linux-stable-b7d41a9fbb364c67d91c3588e117eba547e2d4bf.zip
Merge branch 'ieee1394-removal' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6
* 'ieee1394-removal' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6: ieee1394: remove the old IEEE 1394 driver stack ieee1394: move init_ohci1394_dma to drivers/firewire/ Fix trivial change/delete conflict: drivers/ieee1394/eth1394.c is getting removed, but was modified by the networking merge.
Diffstat (limited to 'drivers/Makefile')
-rw-r--r--drivers/Makefile1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/Makefile b/drivers/Makefile
index 167af319cfdf..14cf9077bb2b 100644
--- a/drivers/Makefile
+++ b/drivers/Makefile
@@ -51,7 +51,6 @@ obj-y += net/
obj-$(CONFIG_ATM) += atm/
obj-$(CONFIG_FUSION) += message/
obj-y += firewire/
-obj-y += ieee1394/
obj-$(CONFIG_UIO) += uio/
obj-y += cdrom/
obj-y += auxdisplay/