diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2011-01-06 20:29:26 -0500 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2011-01-06 20:29:26 -0500 |
| commit | 5e93c6b4ecd78b1bab49bad1dc2f6ed7ec0115ee (patch) | |
| tree | 4f4e321a1ca0baf64d8af528080c71f93495a7d7 /arch/arm/configs | |
| parent | 98d27b8abf413a310df6676f7d2128ada1cccc08 (diff) | |
| parent | 3c0cb7c31c206aaedb967e44b98442bbeb17a6c4 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6 into rmobile-latest
Conflicts:
arch/arm/mach-shmobile/Kconfig
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch/arm/configs')
| -rw-r--r-- | arch/arm/configs/mx3_defconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/configs/mx3_defconfig b/arch/arm/configs/mx3_defconfig index f0c339fd5d21..e648ea3429be 100644 --- a/arch/arm/configs/mx3_defconfig +++ b/arch/arm/configs/mx3_defconfig | |||
| @@ -84,6 +84,7 @@ CONFIG_SERIAL_IMX_CONSOLE=y | |||
| 84 | CONFIG_I2C=y | 84 | CONFIG_I2C=y |
| 85 | CONFIG_I2C_CHARDEV=y | 85 | CONFIG_I2C_CHARDEV=y |
| 86 | CONFIG_I2C_IMX=y | 86 | CONFIG_I2C_IMX=y |
| 87 | CONFIG_SPI=y | ||
| 87 | CONFIG_W1=y | 88 | CONFIG_W1=y |
| 88 | CONFIG_W1_MASTER_MXC=y | 89 | CONFIG_W1_MASTER_MXC=y |
| 89 | CONFIG_W1_SLAVE_THERM=y | 90 | CONFIG_W1_SLAVE_THERM=y |