diff options
author | 2006-06-13 15:38:11 -0400 | |
---|---|---|
committer | 2006-06-13 15:38:11 -0400 | |
commit | 76df73ff90e99681a99e457aec4cfe0a240b7982 (patch) | |
tree | 0a6302b1a8e5d11aeed8aa49f7e846f35aad4f5a /drivers/char/Makefile | |
parent | [PATCH] wireless: move zd1201 where it belongs (diff) | |
parent | [PATCH] tmpfs: Decrement i_nlink correctly in shmem_rmdir() (diff) | |
download | linux-dev-76df73ff90e99681a99e457aec4cfe0a240b7982.tar.xz linux-dev-76df73ff90e99681a99e457aec4cfe0a240b7982.zip |
Merge branch 'from-linus' into upstream
Diffstat (limited to 'drivers/char/Makefile')
-rw-r--r-- | drivers/char/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/Makefile b/drivers/char/Makefile index f5b01c6d498e..fb919bfb2824 100644 --- a/drivers/char/Makefile +++ b/drivers/char/Makefile @@ -41,9 +41,9 @@ obj-$(CONFIG_N_HDLC) += n_hdlc.o obj-$(CONFIG_AMIGA_BUILTIN_SERIAL) += amiserial.o obj-$(CONFIG_SX) += sx.o generic_serial.o obj-$(CONFIG_RIO) += rio/ generic_serial.o -obj-$(CONFIG_HVC_DRIVER) += hvc_console.o obj-$(CONFIG_HVC_CONSOLE) += hvc_vio.o hvsi.o obj-$(CONFIG_HVC_RTAS) += hvc_rtas.o +obj-$(CONFIG_HVC_DRIVER) += hvc_console.o obj-$(CONFIG_RAW_DRIVER) += raw.o obj-$(CONFIG_SGI_SNSC) += snsc.o snsc_event.o obj-$(CONFIG_MMTIMER) += mmtimer.o |