diff options
| author | Thomas White <taw@bitwiz.org.uk> | 2009-09-11 12:49:39 +0100 |
|---|---|---|
| committer | Thomas White <taw@bitwiz.org.uk> | 2009-09-11 12:49:39 +0100 |
| commit | cd38bcdac64aec45575ed58de66db4a2fbf1914d (patch) | |
| tree | 450333c7a1c67685db627edda3e1376a5bd46a2e /arch/arm/configs/gta02_packaging_defconfig | |
| parent | 166226209d59b1210cadfdec6b31e7d633100d9d (diff) | |
| parent | a3587e4ed77974adfb057af261aaeea4022018e8 (diff) | |
Merge commit 'remotes/openmoko/andy-tracking' into drm-tracking
Diffstat (limited to 'arch/arm/configs/gta02_packaging_defconfig')
| -rw-r--r-- | arch/arm/configs/gta02_packaging_defconfig | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/configs/gta02_packaging_defconfig b/arch/arm/configs/gta02_packaging_defconfig index dfdfb19a2f1..15defd28841 100644 --- a/arch/arm/configs/gta02_packaging_defconfig +++ b/arch/arm/configs/gta02_packaging_defconfig @@ -1180,7 +1180,7 @@ CONFIG_APM_POWER=y CONFIG_CHARGER_PCF50633=y CONFIG_BATTERY_BQ27000_HDQ=y CONFIG_HDQ_GPIO_BITBANG=y -# CONFIG_BATTERY_GTA01 is not set +CONFIG_BATTERY_GTA01=m CONFIG_HWMON=y # CONFIG_HWMON_VID is not set # CONFIG_SENSORS_AD7414 is not set @@ -1953,7 +1953,7 @@ CONFIG_NLS_CODEPAGE_850=m # CONFIG_NLS_CODEPAGE_863 is not set # CONFIG_NLS_CODEPAGE_864 is not set # CONFIG_NLS_CODEPAGE_865 is not set -# CONFIG_NLS_CODEPAGE_866 is not set +CONFIG_NLS_CODEPAGE_866=m # CONFIG_NLS_CODEPAGE_869 is not set CONFIG_NLS_CODEPAGE_936=m CONFIG_NLS_CODEPAGE_950=m @@ -1962,7 +1962,7 @@ CONFIG_NLS_CODEPAGE_950=m # CONFIG_NLS_CODEPAGE_874 is not set # CONFIG_NLS_ISO8859_8 is not set # CONFIG_NLS_CODEPAGE_1250 is not set -# CONFIG_NLS_CODEPAGE_1251 is not set +CONFIG_NLS_CODEPAGE_1251=m # CONFIG_NLS_ASCII is not set CONFIG_NLS_ISO8859_1=y # CONFIG_NLS_ISO8859_2 is not set |