diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-25 11:05:29 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-25 11:05:29 -0400 |
| commit | b7d41a9fbb364c67d91c3588e117eba547e2d4bf (patch) | |
| tree | abf95ce77eaa8b7aed30fded4d3592b4af152a99 /drivers/Makefile | |
| parent | da47c19e5c746829042933c8f945a71e2b62d6fc (diff) | |
| parent | 66fa12c571d35e3cd62574c65f1785a460105397 (diff) | |
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/Makefile | 1 |
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/ | |||
| 51 | obj-$(CONFIG_ATM) += atm/ | 51 | obj-$(CONFIG_ATM) += atm/ |
| 52 | obj-$(CONFIG_FUSION) += message/ | 52 | obj-$(CONFIG_FUSION) += message/ |
| 53 | obj-y += firewire/ | 53 | obj-y += firewire/ |
| 54 | obj-y += ieee1394/ | ||
| 55 | obj-$(CONFIG_UIO) += uio/ | 54 | obj-$(CONFIG_UIO) += uio/ |
| 56 | obj-y += cdrom/ | 55 | obj-y += cdrom/ |
| 57 | obj-y += auxdisplay/ | 56 | obj-y += auxdisplay/ |