Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dd045445 authored by Philipp Zabel's avatar Philipp Zabel Committed by Eric Miao
Browse files

[ARM] pxa: magician_defconfig enable hx4700, asic3 and w100fb 



I'm not going to maintain separate defconfigs for magician and hx4700.
This should probably be renamed to htcpxa_defconfig.

Signed-off-by: default avatarPhilipp Zabel <philipp.zabel@gmail.com>
Signed-off-by: default avatarEric Miao <eric.miao@marvell.com>
parent d3ca1952

arch/arm/configs/magician_defconfig

+3 −2
Original line number Diff line number Diff line
@@ -190,6 +190,7 @@ CONFIG_ARCH_PXA=y 
# CONFIG_MACH_SAAR is not set

# CONFIG_MACH_ARMCORE is not set

# CONFIG_MACH_CM_X300 is not set

CONFIG_MACH_H4700=y

CONFIG_MACH_MAGICIAN=y

# CONFIG_MACH_MIOA701 is not set

# CONFIG_MACH_PCM027 is not set
@@ -828,7 +829,7 @@ CONFIG_SSB_POSSIBLE=y 
#

# CONFIG_MFD_CORE is not set

# CONFIG_MFD_SM501 is not set

# CONFIG_MFD_ASIC3 is not set

CONFIG_MFD_ASIC3=y

CONFIG_HTC_EGPIO=y

CONFIG_HTC_PASIC3=y

# CONFIG_TPS65010 is not set
@@ -891,7 +892,7 @@ CONFIG_FB_PXA_OVERLAY=y 
# CONFIG_FB_PXA_SMARTPANEL is not set

# CONFIG_FB_PXA_PARAMETERS is not set

# CONFIG_FB_MBX is not set

# CONFIG_FB_W100 is not set

CONFIG_FB_W100=y

# CONFIG_FB_VIRTUAL is not set

# CONFIG_FB_METRONOME is not set

# CONFIG_FB_MB862XX is not set