diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-21 01:39:23 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-21 01:39:23 +0100 |
| commit | fc887b15d935ead2a00aef5779a18034e7c69ee1 (patch) | |
| tree | 30daa1c9bafbf179047047c67d11ccd98e27d809 /drivers/Makefile | |
| parent | Merge branch 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/ke... (diff) | |
| parent | tty: update MAINTAINERS file due to driver movement (diff) | |
| download | linux-fc887b15d935ead2a00aef5779a18034e7c69ee1.tar.xz linux-fc887b15d935ead2a00aef5779a18034e7c69ee1.zip | |
Merge branch 'tty-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6
* 'tty-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6:
tty: update MAINTAINERS file due to driver movement
tty: move drivers/serial/ to drivers/tty/serial/
tty: move hvc drivers to drivers/tty/hvc/
Diffstat (limited to 'drivers/Makefile')
| -rw-r--r-- | drivers/Makefile | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/Makefile b/drivers/Makefile index 7eb35f479461..b423bb16c3a8 100644 --- a/drivers/Makefile +++ b/drivers/Makefile @@ -24,7 +24,7 @@ obj-$(CONFIG_XEN) += xen/ # regulators early, since some subsystems rely on them to initialize obj-$(CONFIG_REGULATOR) += regulator/ -# char/ comes before serial/ etc so that the VT console is the boot-time +# tty/ comes before char/ so that the VT console is the boot-time # default. obj-y += tty/ obj-y += char/ @@ -38,7 +38,6 @@ obj-$(CONFIG_CONNECTOR) += connector/ obj-$(CONFIG_FB_I810) += video/i810/ obj-$(CONFIG_FB_INTEL) += video/intelfb/ -obj-y += serial/ obj-$(CONFIG_PARPORT) += parport/ obj-y += base/ block/ misc/ mfd/ nfc/ obj-$(CONFIG_NUBUS) += nubus/ |