diff options
| author | Frans Meulenbroeks <fransmeulenbroeks@gmail.com> | 2010-01-21 19:54:05 +0100 |
|---|---|---|
| committer | Frans Meulenbroeks <fransmeulenbroeks@gmail.com> | 2010-01-21 19:54:05 +0100 |
| commit | 33762d41c0e68ea1c130e9fd2e283f70e2338592 (patch) | |
| tree | 04255a24a3c63d6c8a624ebca25db93b5e96f78d /recipes/linux | |
| parent | 6cd92d1545ccf5d4f1459f70faa81be68adb0794 (diff) | |
| parent | 21b699c06496cb374dbf05def5c57ff10720392e (diff) | |
Merge branch 'org.openembedded.dev' of git.openembedded.org:openembedded into org.openembedded.dev
Diffstat (limited to 'recipes/linux')
| -rw-r--r-- | recipes/linux/linux-2.6.24/hipox/defconfig | 9 | ||||
| -rw-r--r-- | recipes/linux/linux-openmoko-2.6.32/om-gta02/defconfig | 2 |
2 files changed, 7 insertions, 4 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 diff --git a/recipes/linux/linux-openmoko-2.6.32/om-gta02/defconfig b/recipes/linux/linux-openmoko-2.6.32/om-gta02/defconfig index c7a32421bb..e63bbd73dc 100644 --- a/recipes/linux/linux-openmoko-2.6.32/om-gta02/defconfig +++ b/recipes/linux/linux-openmoko-2.6.32/om-gta02/defconfig @@ -1332,7 +1332,7 @@ CONFIG_USB_ETH_RNDIS=y # CONFIG_NOP_USB_XCEIV is not set CONFIG_MMC=y # CONFIG_MMC_DEBUG is not set -# CONFIG_MMC_UNSAFE_RESUME is not set +CONFIG_MMC_UNSAFE_RESUME=y # # MMC/SD/SDIO Card Drivers |