diff options
author | Steven Whitehouse <swhiteho@redhat.com> | 2006-07-03 16:25:08 +0200 |
---|---|---|
committer | Steven Whitehouse <swhiteho@redhat.com> | 2006-07-03 16:25:08 +0200 |
commit | 0a1340c185734a57fbf4775927966ad4a1347b02 (patch) | |
tree | d9ed8f0dd809a7c542a3356601125ea5b5aaa804 /drivers/char/Makefile | |
parent | [GFS2] Eliminate one instance of __GFP_NOFAIL (diff) | |
parent | [PATCH] genirq: Fixup ARM devel merge (diff) | |
download | linux-0a1340c185734a57fbf4775927966ad4a1347b02.tar.xz linux-0a1340c185734a57fbf4775927966ad4a1347b02.zip |
Merge rsync://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
include/linux/kernel.h
Diffstat (limited to 'drivers/char/Makefile')
-rw-r--r-- | drivers/char/Makefile | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/char/Makefile b/drivers/char/Makefile index fb919bfb2824..6e0f4469d8bb 100644 --- a/drivers/char/Makefile +++ b/drivers/char/Makefile @@ -75,13 +75,15 @@ endif obj-$(CONFIG_TOSHIBA) += toshiba.o obj-$(CONFIG_I8K) += i8k.o obj-$(CONFIG_DS1620) += ds1620.o -obj-$(CONFIG_HW_RANDOM) += hw_random.o +obj-$(CONFIG_HW_RANDOM) += hw_random/ obj-$(CONFIG_FTAPE) += ftape/ obj-$(CONFIG_COBALT_LCD) += lcd.o obj-$(CONFIG_PPDEV) += ppdev.o obj-$(CONFIG_NWBUTTON) += nwbutton.o obj-$(CONFIG_NWFLASH) += nwflash.o obj-$(CONFIG_SCx200_GPIO) += scx200_gpio.o +obj-$(CONFIG_PC8736x_GPIO) += pc8736x_gpio.o +obj-$(CONFIG_NSC_GPIO) += nsc_gpio.o obj-$(CONFIG_CS5535_GPIO) += cs5535_gpio.o obj-$(CONFIG_GPIO_VR41XX) += vr41xx_giu.o obj-$(CONFIG_TANBAC_TB0219) += tb0219.o |