git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6
[pandora-kernel.git]
/
arch
/
arm
/
mach-s5pv210
/
Kconfig
diff --git
a/arch/arm/mach-s5pv210/Kconfig
b/arch/arm/mach-s5pv210/Kconfig
index
d3a3895
..
5315fec
100644
(file)
--- a/
arch/arm/mach-s5pv210/Kconfig
+++ b/
arch/arm/mach-s5pv210/Kconfig
@@
-53,11
+53,6
@@
config S5PV210_SETUP_SDHCI_GPIO
help
Common setup code for SDHCI gpio.
help
Common setup code for SDHCI gpio.
-config S5PC110_DEV_ONENAND
- bool
- help
- Compile in platform device definition for OneNAND1 controller
-
menu "S5PC110 Machines"
config MACH_AQUILA
menu "S5PC110 Machines"
config MACH_AQUILA
@@
-71,7
+66,7
@@
config MACH_AQUILA
select S3C_DEV_HSMMC
select S3C_DEV_HSMMC1
select S3C_DEV_HSMMC2
select S3C_DEV_HSMMC
select S3C_DEV_HSMMC1
select S3C_DEV_HSMMC2
- select S5P
C110
_DEV_ONENAND
+ select S5P_DEV_ONENAND
select S5PV210_SETUP_FB_24BPP
select S5PV210_SETUP_SDHCI
help
select S5PV210_SETUP_FB_24BPP
select S5PV210_SETUP_SDHCI
help
@@
-88,7
+83,7
@@
config MACH_GONI
select S3C_DEV_HSMMC
select S3C_DEV_HSMMC1
select S3C_DEV_HSMMC2
select S3C_DEV_HSMMC
select S3C_DEV_HSMMC1
select S3C_DEV_HSMMC2
- select S5P
C110
_DEV_ONENAND
+ select S5P_DEV_ONENAND
select S5PV210_SETUP_FB_24BPP
select S5PV210_SETUP_SDHCI
help
select S5PV210_SETUP_FB_24BPP
select S5PV210_SETUP_SDHCI
help