diff options
| author | Mark Brown | 2012-04-09 12:53:45 +0200 |
|---|---|---|
| committer | Mark Brown | 2012-04-09 12:53:45 +0200 |
| commit | 1eecb8280b038019f2f914abc01b28caf5d0a168 (patch) | |
| tree | 7efa7cfc60b64ce50d437342d6457211effbb0ea /arch/powerpc/configs/mpc85xx_defconfig | |
| parent | ASoC: tegra: utils: add support for Tegra30 devices (diff) | |
| parent | Linux 3.4-rc2 (diff) | |
| download | kernel-qcow2-linux-1eecb8280b038019f2f914abc01b28caf5d0a168.tar.gz kernel-qcow2-linux-1eecb8280b038019f2f914abc01b28caf5d0a168.tar.xz kernel-qcow2-linux-1eecb8280b038019f2f914abc01b28caf5d0a168.zip | |
Merge tag 'v3.4-rc2' into for-3.5
Linux 3.4-rc2 contains some bug fixes we need, including the addition of
an export for regcache_sync_region().
Diffstat (limited to 'arch/powerpc/configs/mpc85xx_defconfig')
| -rw-r--r-- | arch/powerpc/configs/mpc85xx_defconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/powerpc/configs/mpc85xx_defconfig b/arch/powerpc/configs/mpc85xx_defconfig index b7ac92a8b28f..62bb723c5b54 100644 --- a/arch/powerpc/configs/mpc85xx_defconfig +++ b/arch/powerpc/configs/mpc85xx_defconfig @@ -117,6 +117,7 @@ CONFIG_SERIAL_8250_RSA=y CONFIG_SERIAL_QE=m CONFIG_NVRAM=y CONFIG_I2C=y +CONFIG_I2C_CHARDEV=y CONFIG_I2C_CPM=m CONFIG_I2C_MPC=y CONFIG_SPI=y |