diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2011-08-08 03:41:23 -0400 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2011-08-08 03:41:23 -0400 |
| commit | 4791d63bd40ec63c533060707dae0232b9969dc0 (patch) | |
| tree | 8e10fe91cea556c10f7d211b65c5f6bdd7ffeb55 /arch/arm/mach-mxs/Kconfig | |
| parent | b3623080ff6974e696710b6c6eb4cdbf2bbab347 (diff) | |
| parent | 322a8b034003c0d46d39af85bf24fee27b902f48 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into rmobile-latest
Diffstat (limited to 'arch/arm/mach-mxs/Kconfig')
| -rw-r--r-- | arch/arm/mach-mxs/Kconfig | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/mach-mxs/Kconfig b/arch/arm/mach-mxs/Kconfig index f114960622e0..4cd0231ee539 100644 --- a/arch/arm/mach-mxs/Kconfig +++ b/arch/arm/mach-mxs/Kconfig | |||
| @@ -41,6 +41,7 @@ config MACH_MX23EVK | |||
| 41 | config MACH_MX28EVK | 41 | config MACH_MX28EVK |
| 42 | bool "Support MX28EVK Platform" | 42 | bool "Support MX28EVK Platform" |
| 43 | select SOC_IMX28 | 43 | select SOC_IMX28 |
| 44 | select LEDS_GPIO_REGISTER | ||
| 44 | select MXS_HAVE_AMBA_DUART | 45 | select MXS_HAVE_AMBA_DUART |
| 45 | select MXS_HAVE_PLATFORM_AUART | 46 | select MXS_HAVE_PLATFORM_AUART |
| 46 | select MXS_HAVE_PLATFORM_FEC | 47 | select MXS_HAVE_PLATFORM_FEC |
| @@ -55,10 +56,12 @@ config MACH_MX28EVK | |||
| 55 | config MODULE_TX28 | 56 | config MODULE_TX28 |
| 56 | bool | 57 | bool |
| 57 | select SOC_IMX28 | 58 | select SOC_IMX28 |
| 59 | select LEDS_GPIO_REGISTER | ||
| 58 | select MXS_HAVE_AMBA_DUART | 60 | select MXS_HAVE_AMBA_DUART |
| 59 | select MXS_HAVE_PLATFORM_AUART | 61 | select MXS_HAVE_PLATFORM_AUART |
| 60 | select MXS_HAVE_PLATFORM_FEC | 62 | select MXS_HAVE_PLATFORM_FEC |
| 61 | select MXS_HAVE_PLATFORM_MXS_I2C | 63 | select MXS_HAVE_PLATFORM_MXS_I2C |
| 64 | select MXS_HAVE_PLATFORM_MXS_MMC | ||
| 62 | select MXS_HAVE_PLATFORM_MXS_PWM | 65 | select MXS_HAVE_PLATFORM_MXS_PWM |
| 63 | 66 | ||
| 64 | config MACH_TX28 | 67 | config MACH_TX28 |