diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2010-12-22 12:57:02 -0500 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2010-12-22 12:57:02 -0500 |
| commit | 4b7bd364700d9ac8372eff48832062b936d0793b (patch) | |
| tree | 0dbf78c95456a0b02d07fcd473281f04a87e266d /arch/arm/mach-s3c2440/Kconfig | |
| parent | c0d8768af260e2cbb4bf659ae6094a262c86b085 (diff) | |
| parent | 90a8a73c06cc32b609a880d48449d7083327e11a (diff) | |
Merge branch 'master' into for-next
Conflicts:
MAINTAINERS
arch/arm/mach-omap2/pm24xx.c
drivers/scsi/bfa/bfa_fcpim.c
Needed to update to apply fixes for which the old branch was too
outdated.
Diffstat (limited to 'arch/arm/mach-s3c2440/Kconfig')
| -rw-r--r-- | arch/arm/mach-s3c2440/Kconfig | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/mach-s3c2440/Kconfig b/arch/arm/mach-s3c2440/Kconfig index ff024a6c0f85..a0cb2581894f 100644 --- a/arch/arm/mach-s3c2440/Kconfig +++ b/arch/arm/mach-s3c2440/Kconfig | |||
| @@ -18,6 +18,7 @@ config CPU_S3C2440 | |||
| 18 | config CPU_S3C2442 | 18 | config CPU_S3C2442 |
| 19 | bool | 19 | bool |
| 20 | select CPU_ARM920T | 20 | select CPU_ARM920T |
| 21 | select S3C_GPIO_PULL_DOWN | ||
| 21 | select S3C2410_CLOCK | 22 | select S3C2410_CLOCK |
| 22 | select S3C2410_GPIO | 23 | select S3C2410_GPIO |
| 23 | select S3C2410_PM if PM | 24 | select S3C2410_PM if PM |
| @@ -178,6 +179,9 @@ config MACH_MINI2440 | |||
| 178 | bool "MINI2440 development board" | 179 | bool "MINI2440 development board" |
| 179 | select CPU_S3C2440 | 180 | select CPU_S3C2440 |
| 180 | select EEPROM_AT24 | 181 | select EEPROM_AT24 |
| 182 | select NEW_LEDS | ||
| 183 | select LEDS_CLASS | ||
| 184 | select LEDS_TRIGGER | ||
| 181 | select LEDS_TRIGGER_BACKLIGHT | 185 | select LEDS_TRIGGER_BACKLIGHT |
| 182 | select S3C_DEV_NAND | 186 | select S3C_DEV_NAND |
| 183 | select S3C_DEV_USB_HOST | 187 | select S3C_DEV_USB_HOST |