tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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>

authored by

Stephen Rothwell and committed by
Benjamin Herrenschmidt ff56535d 0ce790e7

+15
+1
arch/powerpc/configs/44x/warp_defconfig
··· 47 47 CONFIG_MTD_UBI=y 48 48 CONFIG_PROC_DEVICETREE=y 49 49 CONFIG_BLK_DEV_RAM=y 50 + CONFIG_MISC_DEVICES=y 50 51 CONFIG_EEPROM_AT24=y 51 52 CONFIG_SCSI=y 52 53 CONFIG_BLK_DEV_SD=y
+1
arch/powerpc/configs/52xx/motionpro_defconfig
··· 43 43 CONFIG_BLK_DEV_LOOP=y 44 44 CONFIG_BLK_DEV_RAM=y 45 45 CONFIG_BLK_DEV_RAM_SIZE=32768 46 + CONFIG_MISC_DEVICES=y 46 47 CONFIG_EEPROM_LEGACY=y 47 48 CONFIG_SCSI_TGT=y 48 49 CONFIG_BLK_DEV_SD=y
+1
arch/powerpc/configs/86xx/gef_ppc9a_defconfig
··· 85 85 CONFIG_BLK_DEV_NBD=m 86 86 CONFIG_BLK_DEV_RAM=y 87 87 CONFIG_BLK_DEV_RAM_SIZE=131072 88 + CONFIG_MISC_DEVICES=y 88 89 CONFIG_DS1682=y 89 90 CONFIG_IDE=y 90 91 CONFIG_BLK_DEV_IDECS=y
+1
arch/powerpc/configs/86xx/gef_sbc310_defconfig
··· 85 85 CONFIG_BLK_DEV_NBD=m 86 86 CONFIG_BLK_DEV_RAM=y 87 87 CONFIG_BLK_DEV_RAM_SIZE=131072 88 + CONFIG_MISC_DEVICES=y 88 89 CONFIG_DS1682=y 89 90 CONFIG_IDE=y 90 91 CONFIG_BLK_DEV_IDECS=y
+1
arch/powerpc/configs/86xx/gef_sbc610_defconfig
··· 138 138 CONFIG_BLK_DEV_NBD=m 139 139 CONFIG_BLK_DEV_RAM=y 140 140 CONFIG_BLK_DEV_RAM_SIZE=131072 141 + CONFIG_MISC_DEVICES=y 141 142 CONFIG_DS1682=y 142 143 CONFIG_BLK_DEV_SD=y 143 144 CONFIG_CHR_DEV_ST=y
+1
arch/powerpc/configs/86xx/mpc8641_hpcn_defconfig
··· 63 63 CONFIG_BLK_DEV_NBD=y 64 64 CONFIG_BLK_DEV_RAM=y 65 65 CONFIG_BLK_DEV_RAM_SIZE=131072 66 + CONFIG_MISC_DEVICES=y 66 67 CONFIG_EEPROM_LEGACY=y 67 68 CONFIG_BLK_DEV_SD=y 68 69 CONFIG_CHR_DEV_ST=y
+1
arch/powerpc/configs/e55xx_smp_defconfig
··· 32 32 CONFIG_BLK_DEV_LOOP=y 33 33 CONFIG_BLK_DEV_RAM=y 34 34 CONFIG_BLK_DEV_RAM_SIZE=131072 35 + CONFIG_MISC_DEVICES=y 35 36 CONFIG_EEPROM_LEGACY=y 36 37 CONFIG_INPUT_FF_MEMLESS=m 37 38 # CONFIG_INPUT_MOUSEDEV is not set
+1
arch/powerpc/configs/linkstation_defconfig
··· 78 78 CONFIG_BLK_DEV_RAM=y 79 79 CONFIG_BLK_DEV_RAM_COUNT=2 80 80 CONFIG_BLK_DEV_RAM_SIZE=8192 81 + CONFIG_MISC_DEVICES=y 81 82 CONFIG_EEPROM_LEGACY=m 82 83 CONFIG_BLK_DEV_SD=y 83 84 CONFIG_CHR_DEV_SG=y
+1
arch/powerpc/configs/mpc512x_defconfig
··· 61 61 CONFIG_BLK_DEV_RAM_COUNT=1 62 62 CONFIG_BLK_DEV_RAM_SIZE=8192 63 63 CONFIG_BLK_DEV_XIP=y 64 + CONFIG_MISC_DEVICES=y 64 65 CONFIG_EEPROM_AT24=y 65 66 CONFIG_SCSI=y 66 67 # CONFIG_SCSI_PROC_FS is not set
+1
arch/powerpc/configs/mpc5200_defconfig
··· 52 52 CONFIG_BLK_DEV_LOOP=y 53 53 CONFIG_BLK_DEV_RAM=y 54 54 CONFIG_BLK_DEV_RAM_SIZE=32768 55 + CONFIG_MISC_DEVICES=y 55 56 CONFIG_EEPROM_AT24=y 56 57 CONFIG_SCSI_TGT=y 57 58 CONFIG_BLK_DEV_SD=y
+1
arch/powerpc/configs/mpc85xx_defconfig
··· 82 82 CONFIG_BLK_DEV_NBD=y 83 83 CONFIG_BLK_DEV_RAM=y 84 84 CONFIG_BLK_DEV_RAM_SIZE=131072 85 + CONFIG_MISC_DEVICES=y 85 86 CONFIG_EEPROM_LEGACY=y 86 87 CONFIG_BLK_DEV_SD=y 87 88 CONFIG_CHR_DEV_ST=y
+1
arch/powerpc/configs/mpc85xx_smp_defconfig
··· 84 84 CONFIG_BLK_DEV_NBD=y 85 85 CONFIG_BLK_DEV_RAM=y 86 86 CONFIG_BLK_DEV_RAM_SIZE=131072 87 + CONFIG_MISC_DEVICES=y 87 88 CONFIG_EEPROM_LEGACY=y 88 89 CONFIG_BLK_DEV_SD=y 89 90 CONFIG_CHR_DEV_ST=y
+1
arch/powerpc/configs/mpc86xx_defconfig
··· 66 66 CONFIG_BLK_DEV_NBD=y 67 67 CONFIG_BLK_DEV_RAM=y 68 68 CONFIG_BLK_DEV_RAM_SIZE=131072 69 + CONFIG_MISC_DEVICES=y 69 70 CONFIG_EEPROM_LEGACY=y 70 71 CONFIG_BLK_DEV_SD=y 71 72 CONFIG_CHR_DEV_ST=y
+1
arch/powerpc/configs/pasemi_defconfig
··· 59 59 CONFIG_BLK_DEV_LOOP=y 60 60 CONFIG_BLK_DEV_RAM=y 61 61 CONFIG_BLK_DEV_RAM_SIZE=16384 62 + CONFIG_MISC_DEVICES=y 62 63 CONFIG_EEPROM_LEGACY=y 63 64 CONFIG_IDE=y 64 65 CONFIG_BLK_DEV_IDECD=y
+1
arch/powerpc/configs/ppc6xx_defconfig
··· 398 398 CONFIG_CDROM_PKTCDVD=m 399 399 CONFIG_VIRTIO_BLK=m 400 400 CONFIG_BLK_DEV_HD=y 401 + CONFIG_MISC_DEVICES=y 401 402 CONFIG_ENCLOSURE_SERVICES=m 402 403 CONFIG_SENSORS_TSL2550=m 403 404 CONFIG_EEPROM_AT24=m