diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2011-02-24 14:36:31 -0500 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-02-24 14:36:31 -0500 |
| commit | f227e08b71b9c273eaa29a57370a3a5b833aa382 (patch) | |
| tree | 9f1483776a2bde3bb1a6bd744e69acf19f6f3428 /drivers/tty/hvc/Makefile | |
| parent | fec38d1752c01ad72789bac9f1a128f7e933735d (diff) | |
| parent | f5412be599602124d2bdd49947b231dd77c0bf99 (diff) | |
Merge 2.6.38-rc6 into tty-next
This was to resolve a merge issue with drivers/char/Makefile and
drivers/tty/serial/68328serial.c
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/tty/hvc/Makefile')
| -rw-r--r-- | drivers/tty/hvc/Makefile | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/tty/hvc/Makefile b/drivers/tty/hvc/Makefile index 7b0edbce9009..40a25d93fe52 100644 --- a/drivers/tty/hvc/Makefile +++ b/drivers/tty/hvc/Makefile | |||
| @@ -11,4 +11,3 @@ obj-$(CONFIG_HVC_IUCV) += hvc_iucv.o | |||
| 11 | obj-$(CONFIG_HVC_UDBG) += hvc_udbg.o | 11 | obj-$(CONFIG_HVC_UDBG) += hvc_udbg.o |
| 12 | obj-$(CONFIG_HVC_BFIN_JTAG) += hvc_bfin_jtag.o | 12 | obj-$(CONFIG_HVC_BFIN_JTAG) += hvc_bfin_jtag.o |
| 13 | obj-$(CONFIG_HVCS) += hvcs.o | 13 | obj-$(CONFIG_HVCS) += hvcs.o |
| 14 | obj-$(CONFIG_VIRTIO_CONSOLE) += virtio_console.o | ||