diff options
author | John Lee <john_lee@openmoko.org> | 2008-03-07 13:05:07 +0000 |
---|---|---|
committer | John Lee <john_lee@openmoko.org> | 2008-03-07 13:05:07 +0000 |
commit | 0b098d35b319ed6c00f363cb0d4fd447d7fb8d57 (patch) | |
tree | a830bf983a66688f5648cd83e362c4fea2f48f6b /packages/linux/gumstix-kernel-2.6.21/gumstix-custom-connex/defconfig | |
parent | 06fb90eb31b0b85a5c5c7adf185ce2515c5b1220 (diff) | |
parent | d3bbd28f22fbd8e9d097081fa128ae18197f36e1 (diff) |
merge of '26501141207c84e31e0f43c5795a15c0f16dbce5'
and '86618f966282489d43b51fbf0ee93b954ac615ae'
Diffstat (limited to 'packages/linux/gumstix-kernel-2.6.21/gumstix-custom-connex/defconfig')
-rw-r--r-- | packages/linux/gumstix-kernel-2.6.21/gumstix-custom-connex/defconfig | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/packages/linux/gumstix-kernel-2.6.21/gumstix-custom-connex/defconfig b/packages/linux/gumstix-kernel-2.6.21/gumstix-custom-connex/defconfig index 418a1b4402..cfc7babcef 100644 --- a/packages/linux/gumstix-kernel-2.6.21/gumstix-custom-connex/defconfig +++ b/packages/linux/gumstix-kernel-2.6.21/gumstix-custom-connex/defconfig @@ -1031,14 +1031,15 @@ CONFIG_I2C_PXA=m # # Miscellaneous I2C Chip support # -# CONFIG_SENSORS_DS1337 is not set -# CONFIG_SENSORS_DS1374 is not set -# CONFIG_SENSORS_EEPROM is not set -# CONFIG_SENSORS_PCF8574 is not set -# CONFIG_SENSORS_PCA9539 is not set -# CONFIG_SENSORS_PCF8591 is not set -# CONFIG_SENSORS_MAX6875 is not set -# CONFIG_SENSORS_TSC2003 is not set +CONFIG_SENSORS_DS1337=m +CONFIG_SENSORS_DS1374=m +CONFIG_SENSORS_EEPROM=m +CONFIG_SENSORS_PCF8574=m +CONFIG_SENSORS_PCA9539=m +CONFIG_SENSORS_PCF8591=m +CONFIG_SENSORS_MAX6875=m +CONFIG_SENSORS_TSC2003=m +CONFIG_SENSORS_TSC2003_SYSFS=m # CONFIG_I2C_DEBUG_CORE is not set # CONFIG_I2C_DEBUG_ALGO is not set # CONFIG_I2C_DEBUG_BUS is not set @@ -1157,8 +1158,8 @@ CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y CONFIG_FONTS=y # CONFIG_FONT_8x8 is not set # CONFIG_FONT_8x16 is not set -# CONFIG_FONT_6x11 is not set -CONFIG_FONT_7x14=y +CONFIG_FONT_6x11=y +# CONFIG_FONT_7x14 is not set # CONFIG_FONT_PEARL_8x8 is not set # CONFIG_FONT_ACORN_8x8 is not set # CONFIG_FONT_MINI_4x6 is not set |