diff options
| author |   Olof Johansson <olof@lixom.net> | 2013-01-29 10:36:43 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2013-01-29 10:36:43 -0800 |
| commit | 89e19ffac19498c7de295876fecfd4c8c931bab1 (patch) | |
| tree | efeb8f5caaeac80a21e655d1deaee4edce712147 /arch/arm/configs | |
| parent | Merge branch 'v3.8-samsung-fixes-4' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into fixes (diff) | |
| parent | arm: mvebu: i2c come back in defconfig (diff) | |
| download | linux-dev-89e19ffac19498c7de295876fecfd4c8c931bab1.tar.xz linux-dev-89e19ffac19498c7de295876fecfd4c8c931bab1.zip | |
Merge tag 'mvebu_fixes_for_v3.8-rc6' of git://git.infradead.org/users/jcooper/linux into fixes
From Jason Cooper:
fixes for v3.8-rc6
- add missing gpio interrupt lines to dove dt
- fix bad logic for printing MPP error message on orion boards
- build proper serial port driver after changing mvebu DT compatible property
- This is a change to mvebu_defconfig that I wouldn't usually push out as a
fix. However, the commit
b24212f arm: mvebu: Use dw-apb-uart instead of ns16650 as UART driver
changed the serial driver for the board in the dts file. without the patch
I've included in this pull, users won't see any log messages.
* tag 'mvebu_fixes_for_v3.8-rc6' of git://git.infradead.org/users/jcooper/linux:
arm: mvebu: i2c come back in defconfig
arm: plat-orion: fix printing of "MPP config unavailable on this hardware"
Dove: activate GPIO interrupts in DT
Diffstat (limited to 'arch/arm/configs')
| -rw-r--r-- | arch/arm/configs/mvebu_defconfig | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/configs/mvebu_defconfig b/arch/arm/configs/mvebu_defconfig index b5bc96cb65a7..cbd91bce1ca9 100644 --- a/arch/arm/configs/mvebu_defconfig +++ b/arch/arm/configs/mvebu_defconfig @@ -33,6 +33,8 @@ CONFIG_MVNETA=y CONFIG_MARVELL_PHY=y CONFIG_SERIAL_8250=y CONFIG_SERIAL_8250_CONSOLE=y +CONFIG_I2C=y +CONFIG_I2C_MV64XXX=y CONFIG_SERIAL_8250_DW=y CONFIG_GPIOLIB=y CONFIG_GPIO_SYSFS=y |