From 60f31132e7fc6ad3eb8c7cb770c9351b9a8dea2f Mon Sep 17 00:00:00 2001 From: Ben Dooks Date: Thu, 3 Jul 2008 11:32:22 +0100 Subject: [PATCH] --- yaml --- r: 100821 b: refs/heads/master c: d951f55d6aface8dbeaed2e8d8d35d29afa37921 h: refs/heads/master i: 100819: 1a4dd77ea72cbfc3619b90fdd2edf81490eb1d2d v: v3 --- [refs] | 2 +- trunk/arch/arm/configs/s3c2410_defconfig | 20 +++++++++++++------- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/[refs] b/[refs] index 8ebd242881a1..250d3fcdcb5e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0acaff300fbdc7752b80b9cd8181bfdcedef012f +refs/heads/master: d951f55d6aface8dbeaed2e8d8d35d29afa37921 diff --git a/trunk/arch/arm/configs/s3c2410_defconfig b/trunk/arch/arm/configs/s3c2410_defconfig index 4b5e7f72cfc3..187eb263ca81 100644 --- a/trunk/arch/arm/configs/s3c2410_defconfig +++ b/trunk/arch/arm/configs/s3c2410_defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.26-rc8 -# Wed Jun 25 12:13:10 2008 +# Wed Jun 25 12:18:45 2008 # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -319,7 +319,7 @@ CONFIG_CMDLINE="root=/dev/hda1 ro init=/bin/bash console=ttySAC0" # At least one emulation must be selected # CONFIG_FPE_NWFPE=y -# CONFIG_FPE_NWFPE_XP is not set +CONFIG_FPE_NWFPE_XP=y # CONFIG_FPE_FASTFPE is not set # CONFIG_VFP is not set @@ -339,7 +339,7 @@ CONFIG_PM=y CONFIG_PM_SLEEP=y CONFIG_SUSPEND=y CONFIG_SUSPEND_FREEZER=y -# CONFIG_APM_EMULATION is not set +CONFIG_APM_EMULATION=m CONFIG_ARCH_SUSPEND_POSSIBLE=y # @@ -536,12 +536,16 @@ CONFIG_MTD_NAND_S3C2410=y # # CONFIG_MTD_UBI is not set CONFIG_PARPORT=y -# CONFIG_PARPORT_PC is not set +CONFIG_PARPORT_PC=m +# CONFIG_PARPORT_PC_FIFO is not set +# CONFIG_PARPORT_PC_SUPERIO is not set # CONFIG_PARPORT_GSC is not set -# CONFIG_PARPORT_AX88796 is not set +CONFIG_PARPORT_AX88796=m CONFIG_PARPORT_1284=y +CONFIG_PARPORT_NOT_PC=y # CONFIG_PNP is not set CONFIG_BLK_DEV=y +# CONFIG_PARIDE is not set # CONFIG_BLK_DEV_COW_COMMON is not set CONFIG_BLK_DEV_LOOP=y # CONFIG_BLK_DEV_CRYPTOLOOP is not set @@ -772,6 +776,7 @@ CONFIG_DEVPORT=y CONFIG_I2C=y CONFIG_I2C_BOARDINFO=y CONFIG_I2C_CHARDEV=m +CONFIG_I2C_ALGOBIT=y # # I2C Hardware Bus support @@ -782,7 +787,7 @@ CONFIG_I2C_CHARDEV=m # CONFIG_I2C_PARPORT is not set # CONFIG_I2C_PARPORT_LIGHT is not set CONFIG_I2C_S3C2410=y -# CONFIG_I2C_SIMTEC is not set +CONFIG_I2C_SIMTEC=y # CONFIG_I2C_TAOS_EVM is not set # CONFIG_I2C_STUB is not set # CONFIG_I2C_TINY_USB is not set @@ -905,7 +910,7 @@ CONFIG_SSB_POSSIBLE=y # # Multifunction device drivers # -# CONFIG_MFD_SM501 is not set +CONFIG_MFD_SM501=y # CONFIG_MFD_ASIC3 is not set # CONFIG_HTC_PASIC3 is not set @@ -954,6 +959,7 @@ CONFIG_FB_MODE_HELPERS=y # CONFIG_FB_S1D13XXX is not set CONFIG_FB_S3C2410=y # CONFIG_FB_S3C2410_DEBUG is not set +CONFIG_FB_SM501=y # CONFIG_FB_VIRTUAL is not set # CONFIG_BACKLIGHT_LCD_SUPPORT is not set