aboutsummaryrefslogtreecommitdiffstats
path: root/arch/powerpc/configs/mpc86xx_defconfig
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2011-03-25 17:11:29 -0400
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>2011-03-29 19:36:23 -0400
commitff56535d294245b75fd8f79633b935a3b85993c8 (patch)
tree02d15e646b8436309f80088e1c7c2d5cc4715de7 /arch/powerpc/configs/mpc86xx_defconfig
parent0ce790e7d736cedc563e1fb4e998babf5a4dbc3d (diff)
powerpc: Restore some misc devices to our configs
Uwe Kleine-König reported: while working on an defconfig (arm/mx27) I noticed that just updating it[1] results in removing CONFIG_EEPROM_AT24=y. The reason is that since commit v2.6.36-5965-g5f2365d (misc devices: do not enable by default) MISC_DEVICES isn't enabled anymore by default. So all defconfigs that have CONFIG_SOME_SYMBOL=y (or =m) (with SOME_SYMBOL depending on MISC_DEVICES) but not CONFIG_MISC_DEVICES=y suffer from the same problem. This restores those misc devices to the powerpc defconfigs. Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> Cc: Uwe Kleine-König <u.kleine-koenig@pengutronix.de Acked-by: Josh Boyer <jwboyer@linux.vnet.ibm.com> Acked-by: Uwe Kleine-König Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Diffstat (limited to 'arch/powerpc/configs/mpc86xx_defconfig')
-rw-r--r--arch/powerpc/configs/mpc86xx_defconfig1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/powerpc/configs/mpc86xx_defconfig b/arch/powerpc/configs/mpc86xx_defconfig
index 55b54318fef6..038a308cbfc4 100644
--- a/arch/powerpc/configs/mpc86xx_defconfig
+++ b/arch/powerpc/configs/mpc86xx_defconfig
@@ -66,6 +66,7 @@ CONFIG_BLK_DEV_LOOP=y
66CONFIG_BLK_DEV_NBD=y 66CONFIG_BLK_DEV_NBD=y
67CONFIG_BLK_DEV_RAM=y 67CONFIG_BLK_DEV_RAM=y
68CONFIG_BLK_DEV_RAM_SIZE=131072 68CONFIG_BLK_DEV_RAM_SIZE=131072
69CONFIG_MISC_DEVICES=y
69CONFIG_EEPROM_LEGACY=y 70CONFIG_EEPROM_LEGACY=y
70CONFIG_BLK_DEV_SD=y 71CONFIG_BLK_DEV_SD=y
71CONFIG_CHR_DEV_ST=y 72CONFIG_CHR_DEV_ST=y