diff options
author | Michael Lauer <mickey@vanille-media.de> | 2007-09-15 18:46:39 +0000 |
---|---|---|
committer | Michael Lauer <mickey@vanille-media.de> | 2007-09-15 18:46:39 +0000 |
commit | 76c075092edae2d22978580fc9c1cebdd4fefd1a (patch) | |
tree | b5b1c8feae6269633a0b6dd6499ac9da442fa1bd /packages/linux/linux-ezx-2.6.21/a1200/defconfig | |
parent | 7d7fb07b49543bc0f34a25b2c9d543b9304bfd18 (diff) | |
parent | 651a118bdabb0ee8f6838a7f87276e37c9ea60c2 (diff) |
merge of '6b8b18ee5d630cef0d9e1ebea010f36e7bdb083c'
and 'a3ee5d88f6d1100cd285c2fead8e37018bd42a9f'
Diffstat (limited to 'packages/linux/linux-ezx-2.6.21/a1200/defconfig')
-rwxr-xr-x | packages/linux/linux-ezx-2.6.21/a1200/defconfig | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/packages/linux/linux-ezx-2.6.21/a1200/defconfig b/packages/linux/linux-ezx-2.6.21/a1200/defconfig index ea7475ced2..3cf42ac8b1 100755 --- a/packages/linux/linux-ezx-2.6.21/a1200/defconfig +++ b/packages/linux/linux-ezx-2.6.21/a1200/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.21.4 -# Sun Sep 9 16:54:53 2007 +# Sat Sep 15 18:27:06 2007 # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -592,7 +592,9 @@ CONFIG_MTD_PHYSMAP_BANKWIDTH=2 CONFIG_MTD_EZX=y CONFIG_MTD_EZX_A780=y # CONFIG_MTD_EZX_A780_ALTERNATE is not set +# CONFIG_MTD_EZX_A120 is not set # CONFIG_MTD_EZX_E2 is not set +# CONFIG_MTD_EZX_E6 is not set # CONFIG_MTD_PLATRAM is not set # @@ -851,8 +853,8 @@ CONFIG_TS0710_MUX_USB=y # # I2C support # -CONFIG_I2C=m -CONFIG_I2C_CHARDEV=m +CONFIG_I2C=y +CONFIG_I2C_CHARDEV=y # # I2C Algorithms @@ -864,8 +866,8 @@ CONFIG_I2C_CHARDEV=m # # I2C Hardware Bus support # -CONFIG_I2C_PXA=m -# CONFIG_I2C_PXA_SLAVE is not set +CONFIG_I2C_PXA=y +CONFIG_I2C_PXA_SLAVE=y # CONFIG_I2C_OCORES is not set # CONFIG_I2C_PARPORT_LIGHT is not set # CONFIG_I2C_STUB is not set |