diff options
| author | Grant Likely <grant.likely@secretlab.ca> | 2011-03-12 03:25:53 -0500 |
|---|---|---|
| committer | Grant Likely <grant.likely@secretlab.ca> | 2011-03-12 03:25:53 -0500 |
| commit | 9c3c8afccb6a163fd2be739f511e863eab668702 (patch) | |
| tree | e587a5377ada98fed8cfa6c8ee63125361f2818a /arch/arm/mach-s5pv310/Kconfig | |
| parent | 290293eda2c6dd368476d71433bdef07c39a6829 (diff) | |
| parent | a5abba989deceb731047425812d268daf7536575 (diff) | |
Merge commit 'v2.6.38-rc8' into spi/next
Conflicts:
drivers/spi/pxa2xx_spi_pci.c
Diffstat (limited to 'arch/arm/mach-s5pv310/Kconfig')
| -rw-r--r-- | arch/arm/mach-s5pv310/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-s5pv310/Kconfig b/arch/arm/mach-s5pv310/Kconfig index 09c4c21b70cc..b2a9acc5185f 100644 --- a/arch/arm/mach-s5pv310/Kconfig +++ b/arch/arm/mach-s5pv310/Kconfig | |||
| @@ -122,6 +122,7 @@ config MACH_SMDKV310 | |||
| 122 | select S3C_DEV_HSMMC2 | 122 | select S3C_DEV_HSMMC2 |
| 123 | select S3C_DEV_HSMMC3 | 123 | select S3C_DEV_HSMMC3 |
| 124 | select S5PV310_DEV_PD | 124 | select S5PV310_DEV_PD |
| 125 | select S5PV310_DEV_SYSMMU | ||
| 125 | select S5PV310_SETUP_I2C1 | 126 | select S5PV310_SETUP_I2C1 |
| 126 | select S5PV310_SETUP_SDHCI | 127 | select S5PV310_SETUP_SDHCI |
| 127 | help | 128 | help |