summaryrefslogtreecommitdiff
path: root/recipes/linux/linux-2.6.24
diff options
context:
space:
mode:
authorFrans Meulenbroeks <fransmeulenbroeks@gmail.com>2010-01-21 19:54:05 +0100
committerFrans Meulenbroeks <fransmeulenbroeks@gmail.com>2010-01-21 19:54:05 +0100
commit33762d41c0e68ea1c130e9fd2e283f70e2338592 (patch)
tree04255a24a3c63d6c8a624ebca25db93b5e96f78d /recipes/linux/linux-2.6.24
parent6cd92d1545ccf5d4f1459f70faa81be68adb0794 (diff)
parent21b699c06496cb374dbf05def5c57ff10720392e (diff)
Merge branch 'org.openembedded.dev' of git.openembedded.org:openembedded into org.openembedded.dev
Diffstat (limited to 'recipes/linux/linux-2.6.24')
-rw-r--r--recipes/linux/linux-2.6.24/hipox/defconfig9
1 files changed, 6 insertions, 3 deletions
diff --git a/recipes/linux/linux-2.6.24/hipox/defconfig b/recipes/linux/linux-2.6.24/hipox/defconfig
index 8778456c56..f01741d14f 100644
--- a/recipes/linux/linux-2.6.24/hipox/defconfig
+++ b/recipes/linux/linux-2.6.24/hipox/defconfig
@@ -166,7 +166,10 @@ CONFIG_ARCH_HIPOX_UART2=y
CONFIG_ARCH_HIPOX_UART2_DEBUG=y
CONFIG_ARCH_HIPOX_UART2_BOOTPROGRESS=y
# CONFIG_ARCH_HIPOX_UART2_MODEM is not set
-# CONFIG_ARCH_HIPOX_UART3 is not set
+CONFIG_ARCH_HIPOX_UART3=y
+# CONFIG_ARCH_HIPOX_UART3_DEBUG is not set
+# CONFIG_ARCH_HIPOX_UART3_BOOTPROGRESS is not set
+# CONFIG_ARCH_HIPOX_UART3_MODEM is not set
CONFIG_ARCH_HIPOX_PCI_REQGNT_0=y
# CONFIG_ARCH_HIPOX_PCI_REQGNT_1 is not set
# CONFIG_ARCH_HIPOX_PCI_REQGNT_2 is not set
@@ -212,8 +215,8 @@ CONFIG_TACHO_THERM_AND_FAN=m
# CONFIG_HIPOX_USB_TEST_MODES is not set
# CONFIG_LEDS_TRIGGER_SATA_DISK is not set
# CONFIG_HIPOX_LED_TEST is not set
-CONFIG_HIPOX_I2C_SDA=6
-CONFIG_HIPOX_I2C_SCL=7
+CONFIG_HIPOX_I2C_SDA=26
+CONFIG_HIPOX_I2C_SCL=25
# CONFIG_HIPOX_USB_PORTA_POWER_CONTROL is not set
# CONFIG_HIPOX_USB_PORTB_POWER_CONTROL is not set
# CONFIG_HIPOX_USB_PORTC_POWER_CONTROL is not set