diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-23 18:15:27 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-23 18:15:27 -0400 |
| commit | 42cd71bf1e3a081b3150018bbf448cb6c8a844a5 (patch) | |
| tree | 4a5d2eb0444255e4ad827a76dbd1417dd3876db6 /arch/arm/plat-mxc/devices/Kconfig | |
| parent | f5039935ac685b3b9b8c13fbc33cac8643dee32e (diff) | |
| parent | 9a55d9752d8abfc62f1ab05ccc790d22a0c8e7c0 (diff) | |
Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm
* 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm: (137 commits)
ARM: bcmring: convert to use sp804 clockevents
ARM: bcmring: convert to sp804 clocksource
ARM: 6912/1: bcmring: Add clkdev table in init_early
clockevents: ARM sp804: obtain sp804 timer rate via clks
clockevents: ARM sp804: allow clockevent name to be specified
clocksource: ARM sp804: obtain sp804 timer rate via clks
clocksource: ARM sp804: allow clocksource name to be specified
clocksource: convert OMAP1 to 32-bit down counting clocksource
clocksource: convert MXS timrotv2 to 32-bit down counting clocksource
clocksource: convert SPEAr platforms 16-bit up counting clocksource
clocksource: convert Integrator/AP 16-bit down counting clocksource
clocksource: convert W90x900 24-bit down counting clocksource
clocksource: convert ARM 32-bit down counting clocksources
clocksource: convert ARM 32-bit up counting clocksources
clocksource: add common mmio clocksource
ARM: update sa1100 to reflect PXA updates
ARM: omap1: convert to using readl/writel instead of volatile struct
ARM: omap1: delete useless interrupt handler
ARM: s5p: consolidate selection of timer register
ARM: 6939/1: fix missing 'cpu_relax()' declaration
...
Diffstat (limited to 'arch/arm/plat-mxc/devices/Kconfig')
| -rw-r--r-- | arch/arm/plat-mxc/devices/Kconfig | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/arch/arm/plat-mxc/devices/Kconfig b/arch/arm/plat-mxc/devices/Kconfig index b9ab1d58b5e7..bd294add932c 100644 --- a/arch/arm/plat-mxc/devices/Kconfig +++ b/arch/arm/plat-mxc/devices/Kconfig | |||
| @@ -24,7 +24,6 @@ config IMX_HAVE_PLATFORM_IMXDI_RTC | |||
| 24 | 24 | ||
| 25 | config IMX_HAVE_PLATFORM_IMX_FB | 25 | config IMX_HAVE_PLATFORM_IMX_FB |
| 26 | bool | 26 | bool |
| 27 | select HAVE_FB_IMX | ||
| 28 | 27 | ||
| 29 | config IMX_HAVE_PLATFORM_IMX_I2C | 28 | config IMX_HAVE_PLATFORM_IMX_I2C |
| 30 | bool | 29 | bool |
| @@ -41,6 +40,9 @@ config IMX_HAVE_PLATFORM_IMX_UART | |||
| 41 | config IMX_HAVE_PLATFORM_IMX_UDC | 40 | config IMX_HAVE_PLATFORM_IMX_UDC |
| 42 | bool | 41 | bool |
| 43 | 42 | ||
| 43 | config IMX_HAVE_PLATFORM_IPU_CORE | ||
| 44 | bool | ||
| 45 | |||
| 44 | config IMX_HAVE_PLATFORM_MX1_CAMERA | 46 | config IMX_HAVE_PLATFORM_MX1_CAMERA |
| 45 | bool | 47 | bool |
| 46 | 48 | ||
| @@ -63,6 +65,9 @@ config IMX_HAVE_PLATFORM_MXC_RNGA | |||
| 63 | bool | 65 | bool |
| 64 | select ARCH_HAS_RNGA | 66 | select ARCH_HAS_RNGA |
| 65 | 67 | ||
| 68 | config IMX_HAVE_PLATFORM_MXC_RTC | ||
| 69 | bool | ||
| 70 | |||
| 66 | config IMX_HAVE_PLATFORM_MXC_W1 | 71 | config IMX_HAVE_PLATFORM_MXC_W1 |
| 67 | bool | 72 | bool |
| 68 | 73 | ||