diff options
| author | Dave Jones <davej@redhat.com> | 2011-08-27 17:57:25 -0400 |
|---|---|---|
| committer | Dave Jones <davej@redhat.com> | 2011-08-27 17:57:25 -0400 |
| commit | ccdeeb8a3a45f6d0ebac9bfa359b1d9c848cd0d0 (patch) | |
| tree | 997b2cddbdb6025330816ef5a04656e56346fd23 | |
| parent | c62acbf43a28550deac0866008fb33a151801304 (diff) | |
| download | kernel-ccdeeb8a3a45f6d0ebac9bfa359b1d9c848cd0d0.tar.gz kernel-ccdeeb8a3a45f6d0ebac9bfa359b1d9c848cd0d0.tar.xz kernel-ccdeeb8a3a45f6d0ebac9bfa359b1d9c848cd0d0.zip | |
fix up some config warnings
| -rw-r--r-- | config-arm-omap-generic | 1 | ||||
| -rw-r--r-- | config-generic | 6 | ||||
| -rw-r--r-- | config-powerpc-generic | 8 | ||||
| -rw-r--r-- | config-x86-32-generic | 2 |
4 files changed, 9 insertions, 8 deletions
diff --git a/config-arm-omap-generic b/config-arm-omap-generic index 29f6ade6a..19ea52191 100644 --- a/config-arm-omap-generic +++ b/config-arm-omap-generic @@ -705,7 +705,6 @@ CONFIG_FB_CFB_IMAGEBLIT=y # CONFIG_FB_ARMCLCD is not set # CONFIG_FB_VIRTUAL is not set # CONFIG_FB_METRONOME is not set -# CONFIG_FB_MB862XX is not set # CONFIG_FB_OMAP_BOOTLOADER_INIT is not set # CONFIG_FB_OMAP_LCD_VGA is not set CONFIG_OMAP2_VRAM=y diff --git a/config-generic b/config-generic index e37094a4d..91ddd6868 100644 --- a/config-generic +++ b/config-generic @@ -2892,10 +2892,7 @@ CONFIG_FB_VIA=m CONFIG_FB_VIA_X_COMPATIBILITY=y # CONFIG_FB_VIA_DIRECT_PROCFS is not set CONFIG_FB_METRONOME=m -CONFIG_FB_MB862XX=m -CONFIG_FB_MB862XX_PCI_GDC=y -CONFIG_FB_MB862XX_LIME=y -CONFIG_FB_MB862XX_I2C=y +# CONFIG_FB_MB862XX is not set # CONFIG_FB_PRE_INIT_FB is not set # CONFIG_FB_TMIO is not set # CONFIG_FB_BROADSHEET is not set @@ -4617,7 +4614,6 @@ CONFIG_LOCKUP_DETECTOR=y # CONFIG_DEBUG_INFO_REDUCED is not set # CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set # CONFIG_BOOTPARAM_HARDLOCKUP_PANIC is not set -# CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set CONFIG_ATOMIC64_SELFTEST=y CONFIG_MEMORY_FAILURE=y diff --git a/config-powerpc-generic b/config-powerpc-generic index 5e1ddf74d..ee9ab243d 100644 --- a/config-powerpc-generic +++ b/config-powerpc-generic @@ -47,6 +47,12 @@ CONFIG_FB_ATY_BACKLIGHT=y CONFIG_FB_RADEON_BACKLIGHT=y CONFIG_FB_RIVA_BACKLIGHT=y CONFIG_FB_NVIDIA_BACKLIGHT=y +# FIXME: Do we care about this hardware ? +CONFIG_FB_MB862XX=m +CONFIG_FB_MB862XX_PCI_GDC=y +CONFIG_FB_MB862XX_LIME=y +CONFIG_FB_MB862XX_I2C=y + CONFIG_SND_POWERMAC=m CONFIG_SND_POWERMAC_AUTO_DRC=y @@ -192,7 +198,7 @@ CONFIG_USB_EHCI_HCD_PPC_OF=y # CONFIG_MPC5121_ADS is not set # CONFIG_MPC5121_GENERIC is not set -CONFIG_MTD_OF_PARTS=m +CONFIG_MTD_OF_PARTS=y # CONFIG_MTD_NAND_FSL_ELBC is not set CONFIG_THERMAL=y diff --git a/config-x86-32-generic b/config-x86-32-generic index 8b66c9291..f42d60da6 100644 --- a/config-x86-32-generic +++ b/config-x86-32-generic @@ -183,7 +183,7 @@ CONFIG_XO1_RFKILL=m CONFIG_X86_32_IRIS=m -CONFIG_MTD_OF_PARTS=m +CONFIG_MTD_OF_PARTS=y CONFIG_MTD_PHYSMAP_OF=m CONFIG_PROC_DEVICETREE=y CONFIG_SERIAL_OF_PLATFORM=m |