Automatic merge of /spare/repo/linux-2.6/.git branch HEAD

[linux-2.6] / drivers / char / Makefile

diff --git a/drivers/char/Makefile b/drivers/char/Makefile
index 3ea8cc80ea3dad6c1d52584723882058ad59b810..e3f5c32aac55d24312054b1a0bc32d8c2d84e4df 100644 (file)
--- a/drivers/char/Makefile
+++ b/drivers/char/Makefile
@@ -42,7 +42,7 @@ obj-$(CONFIG_SX)              += sx.o generic_serial.o
 obj-$(CONFIG_RIO)              += rio/ generic_serial.o
 obj-$(CONFIG_HVC_CONSOLE)      += hvc_console.o hvsi.o
 obj-$(CONFIG_RAW_DRIVER)       += raw.o
-obj-$(CONFIG_SGI_SNSC)         += snsc.o
+obj-$(CONFIG_SGI_SNSC)         += snsc.o snsc_event.o
 obj-$(CONFIG_MMTIMER)          += mmtimer.o
 obj-$(CONFIG_VIOCONS) += viocons.o
 obj-$(CONFIG_VIOTAPE)          += viotape.o