diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2012-04-01 23:57:46 -0400 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2012-04-01 23:57:46 -0400 |
| commit | e31c6dfa8eb23ec7b3350b95ffe92f5a962d8c6b (patch) | |
| tree | e897997d1844a712391772444817abc12d2bc3d6 /arch/powerpc/configs/mpc85xx_defconfig | |
| parent | dd775ae2549217d3ae09363e3edb305d0fa19928 (diff) | |
| parent | fa1b42b45a9c96da77f3ddabf715f49525a87209 (diff) | |
Merge remote-tracking branch 'kumar/next' into merge
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 cc87a8441566..d6b6df5e8743 100644 --- a/arch/powerpc/configs/mpc85xx_defconfig +++ b/arch/powerpc/configs/mpc85xx_defconfig | |||
| @@ -117,6 +117,7 @@ CONFIG_SERIAL_8250_RSA=y | |||
| 117 | CONFIG_SERIAL_QE=m | 117 | CONFIG_SERIAL_QE=m |
| 118 | CONFIG_NVRAM=y | 118 | CONFIG_NVRAM=y |
| 119 | CONFIG_I2C=y | 119 | CONFIG_I2C=y |
| 120 | CONFIG_I2C_CHARDEV=y | ||
| 120 | CONFIG_I2C_CPM=m | 121 | CONFIG_I2C_CPM=m |
| 121 | CONFIG_I2C_MPC=y | 122 | CONFIG_I2C_MPC=y |
| 122 | CONFIG_SPI=y | 123 | CONFIG_SPI=y |