diff options
Diffstat (limited to 'arch/arm/configs/magician_defconfig')
-rw-r--r-- | arch/arm/configs/magician_defconfig | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/arm/configs/magician_defconfig b/arch/arm/configs/magician_defconfig index f56837f69ca7..957fd5fa27ca 100644 --- a/arch/arm/configs/magician_defconfig +++ b/arch/arm/configs/magician_defconfig | |||
@@ -190,6 +190,7 @@ CONFIG_ARCH_PXA=y | |||
190 | # CONFIG_MACH_SAAR is not set | 190 | # CONFIG_MACH_SAAR is not set |
191 | # CONFIG_MACH_ARMCORE is not set | 191 | # CONFIG_MACH_ARMCORE is not set |
192 | # CONFIG_MACH_CM_X300 is not set | 192 | # CONFIG_MACH_CM_X300 is not set |
193 | CONFIG_MACH_H4700=y | ||
193 | CONFIG_MACH_MAGICIAN=y | 194 | CONFIG_MACH_MAGICIAN=y |
194 | # CONFIG_MACH_MIOA701 is not set | 195 | # CONFIG_MACH_MIOA701 is not set |
195 | # CONFIG_MACH_PCM027 is not set | 196 | # CONFIG_MACH_PCM027 is not set |
@@ -828,7 +829,7 @@ CONFIG_SSB_POSSIBLE=y | |||
828 | # | 829 | # |
829 | # CONFIG_MFD_CORE is not set | 830 | # CONFIG_MFD_CORE is not set |
830 | # CONFIG_MFD_SM501 is not set | 831 | # CONFIG_MFD_SM501 is not set |
831 | # CONFIG_MFD_ASIC3 is not set | 832 | CONFIG_MFD_ASIC3=y |
832 | CONFIG_HTC_EGPIO=y | 833 | CONFIG_HTC_EGPIO=y |
833 | CONFIG_HTC_PASIC3=y | 834 | CONFIG_HTC_PASIC3=y |
834 | # CONFIG_TPS65010 is not set | 835 | # CONFIG_TPS65010 is not set |
@@ -891,7 +892,7 @@ CONFIG_FB_PXA_OVERLAY=y | |||
891 | # CONFIG_FB_PXA_SMARTPANEL is not set | 892 | # CONFIG_FB_PXA_SMARTPANEL is not set |
892 | # CONFIG_FB_PXA_PARAMETERS is not set | 893 | # CONFIG_FB_PXA_PARAMETERS is not set |
893 | # CONFIG_FB_MBX is not set | 894 | # CONFIG_FB_MBX is not set |
894 | # CONFIG_FB_W100 is not set | 895 | CONFIG_FB_W100=y |
895 | # CONFIG_FB_VIRTUAL is not set | 896 | # CONFIG_FB_VIRTUAL is not set |
896 | # CONFIG_FB_METRONOME is not set | 897 | # CONFIG_FB_METRONOME is not set |
897 | # CONFIG_FB_MB862XX is not set | 898 | # CONFIG_FB_MB862XX is not set |