diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-21 19:42:32 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-21 19:42:32 -0400 |
| commit | b5153163ed580e00c67bdfecb02b2e3843817b3e (patch) | |
| tree | b8c878601f07f5df8f694435857a5f3dcfd75482 /arch/arm/mach-s5pv210/Kconfig | |
| parent | a8cbf22559ceefdcdfac00701e8e6da7518b7e8e (diff) | |
| parent | 6451d7783ba5ff24eb1a544eaa6665b890f30466 (diff) | |
Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm
* 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm: (278 commits)
arm: remove machine_desc.io_pg_offst and .phys_io
arm: use addruart macro to establish debug mappings
arm: return both physical and virtual addresses from addruart
arm/debug: consolidate addruart macros for CONFIG_DEBUG_ICEDCC
ARM: make struct machine_desc definition coherent with its comment
eukrea_mbimxsd-baseboard: Pass the correct GPIO to gpio_free
cpuimx27: fix compile when ULPI is selected
mach-pcm037_eet: fix compile errors
Fixing ethernet driver compilation error for i.MX31 ADS board
cpuimx51: update board support
mx5: add cpuimx51sd module and its baseboard
iomux-mx51: fix GPIO_1_xx 's IOMUX configuration
imx-esdhc: update devices registration
mx51: add resources for SD/MMC on i.MX51
iomux-mx51: fix SD1 and SD2's iomux configuration
clock-mx51: rename CLOCK1 to CLOCK_CCGR for better readability
clock-mx51: factorize clk_set_parent and clk_get_rate
eukrea_mbimxsd: add support for DVI displays
cpuimx25 & cpuimx35: fix OTG port registration in host mode
i.MX31 and i.MX35 : fix errate TLSbo65953 and ENGcm09472
...
Diffstat (limited to 'arch/arm/mach-s5pv210/Kconfig')
| -rw-r--r-- | arch/arm/mach-s5pv210/Kconfig | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/arch/arm/mach-s5pv210/Kconfig b/arch/arm/mach-s5pv210/Kconfig index d3a38955c741..5315fec3db86 100644 --- a/arch/arm/mach-s5pv210/Kconfig +++ b/arch/arm/mach-s5pv210/Kconfig | |||
| @@ -53,11 +53,6 @@ config S5PV210_SETUP_SDHCI_GPIO | |||
| 53 | help | 53 | help |
| 54 | Common setup code for SDHCI gpio. | 54 | Common setup code for SDHCI gpio. |
| 55 | 55 | ||
| 56 | config S5PC110_DEV_ONENAND | ||
| 57 | bool | ||
| 58 | help | ||
| 59 | Compile in platform device definition for OneNAND1 controller | ||
| 60 | |||
| 61 | menu "S5PC110 Machines" | 56 | menu "S5PC110 Machines" |
| 62 | 57 | ||
| 63 | config MACH_AQUILA | 58 | config MACH_AQUILA |
| @@ -71,7 +66,7 @@ config MACH_AQUILA | |||
| 71 | select S3C_DEV_HSMMC | 66 | select S3C_DEV_HSMMC |
| 72 | select S3C_DEV_HSMMC1 | 67 | select S3C_DEV_HSMMC1 |
| 73 | select S3C_DEV_HSMMC2 | 68 | select S3C_DEV_HSMMC2 |
| 74 | select S5PC110_DEV_ONENAND | 69 | select S5P_DEV_ONENAND |
| 75 | select S5PV210_SETUP_FB_24BPP | 70 | select S5PV210_SETUP_FB_24BPP |
| 76 | select S5PV210_SETUP_SDHCI | 71 | select S5PV210_SETUP_SDHCI |
| 77 | help | 72 | help |
| @@ -88,7 +83,7 @@ config MACH_GONI | |||
| 88 | select S3C_DEV_HSMMC | 83 | select S3C_DEV_HSMMC |
| 89 | select S3C_DEV_HSMMC1 | 84 | select S3C_DEV_HSMMC1 |
| 90 | select S3C_DEV_HSMMC2 | 85 | select S3C_DEV_HSMMC2 |
| 91 | select S5PC110_DEV_ONENAND | 86 | select S5P_DEV_ONENAND |
| 92 | select S5PV210_SETUP_FB_24BPP | 87 | select S5PV210_SETUP_FB_24BPP |
| 93 | select S5PV210_SETUP_SDHCI | 88 | select S5PV210_SETUP_SDHCI |
| 94 | help | 89 | help |