linux-stable-rt/drivers
Adrian Bunk 54af6b4648 [PATCH] MTD_NAND_SHARPSL and MTD_NAND_NANDSIM should be tristate's
MTD_NAND=m and MTD_NAND_SHARPSL=y or MTD_NAND_NANDSIM=y are illegal
combinations that mustn't be allowed.

This patch fixes this bug by making MTD_NAND_SHARPSL and MTD_NAND_NANDSIM
tristate's.

Additionally, it fixes some whitespace damage at these options.

Signed-off-by: Adrian Bunk <bunk@stusta.de>
Acked-by: Richard Purdie <rpurdie@rpsys.net>
Acked-by: "Artem B. Bityutskiy" <dedekind@yandex.ru>
Cc: Thomas Gleixner <tglx@linutronix.de>
Acked-by: David Woodhouse <dwmw2@infradead.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2006-03-31 12:18:48 -08:00
..
acorn
acpi
amba
atm
base
block
bluetooth
cdrom
char Merge branch 'drm-patches' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6 2006-03-30 14:26:27 -08:00
connector
cpufreq
crypto
dio
edac
eisa
fc4
firmware
hwmon
i2c
ide Merge ../linux-2.6 2006-03-29 13:24:50 +11:00
ieee1394 Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc 2006-03-29 11:28:30 -08:00
infiniband IB/mad: RMPP support for additional classes 2006-03-30 07:19:51 -08:00
input [PARISC] Fix double free when removing HIL drivers 2006-03-30 17:48:59 +00:00
isdn
macintosh Merge ../linux-2.6 2006-03-29 13:24:50 +11:00
mca
md
media Merge ../linux-2.6 2006-03-29 13:24:50 +11:00
message
mfd
misc
mmc
mtd [PATCH] MTD_NAND_SHARPSL and MTD_NAND_NANDSIM should be tristate's 2006-03-31 12:18:48 -08:00
net [PATCH] ixp2000: fix gcc4 breakage 2006-03-29 17:34:02 -05:00
nubus
oprofile
parisc [PARISC] I/O-Space must be ioremap_nocache()'d 2006-03-30 17:48:42 +00:00
parport
pci
pcmcia
pnp
rapidio
rtc
s390
sbus
scsi Merge git://git.kernel.org/pub/scm/linux/kernel/git/kyle/parisc-2.6 2006-03-30 15:04:13 -08:00
serial [PARISC] I/O-Space must be ioremap_nocache()'d 2006-03-30 17:48:42 +00:00
sh
sn
spi
tc
telephony
usb Merge branch 'upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 2006-03-29 17:30:19 -05:00
video [PARISC] Fix stifb with IOREMAP and a 64-bit kernel 2006-03-30 17:48:47 +00:00
w1
zorro
Kconfig
Makefile