diff options
| author | David S. Miller <davem@davemloft.net> | 2009-11-19 01:19:03 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-11-19 01:19:03 -0500 |
| commit | 3505d1a9fd65e2d3e00827857b6795d9d8983658 (patch) | |
| tree | 941cfafdb57c427bb6b7ebf6354ee93b2a3693b5 /arch/arm/mach-s3c6410/Kconfig | |
| parent | dfef948ed2ba69cf041840b5e860d6b4e16fa0b1 (diff) | |
| parent | 66b00a7c93ec782d118d2c03bd599cfd041e80a1 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/sfc/sfe4001.c
drivers/net/wireless/libertas/cmd.c
drivers/staging/Kconfig
drivers/staging/Makefile
drivers/staging/rtl8187se/Kconfig
drivers/staging/rtl8192e/Kconfig
Diffstat (limited to 'arch/arm/mach-s3c6410/Kconfig')
| -rw-r--r-- | arch/arm/mach-s3c6410/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-s3c6410/Kconfig b/arch/arm/mach-s3c6410/Kconfig index 53fc3ff657f7..72d4b11b2077 100644 --- a/arch/arm/mach-s3c6410/Kconfig +++ b/arch/arm/mach-s3c6410/Kconfig | |||
| @@ -77,6 +77,7 @@ config SMDK6410_WM1190_EV1 | |||
| 77 | depends on MACH_SMDK6410 | 77 | depends on MACH_SMDK6410 |
| 78 | select REGULATOR | 78 | select REGULATOR |
| 79 | select REGULATOR_WM8350 | 79 | select REGULATOR_WM8350 |
| 80 | select S3C24XX_GPIO_EXTRA64 | ||
| 80 | select MFD_WM8350_I2C | 81 | select MFD_WM8350_I2C |
| 81 | select MFD_WM8350_CONFIG_MODE_0 | 82 | select MFD_WM8350_CONFIG_MODE_0 |
| 82 | select MFD_WM8350_CONFIG_MODE_3 | 83 | select MFD_WM8350_CONFIG_MODE_3 |