git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge remote-tracking branch 'iwlwifi-fixes/master' into NEXT
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
mach-vexpress
/
Kconfig
diff --git
a/arch/arm/mach-vexpress/Kconfig
b/arch/arm/mach-vexpress/Kconfig
index 1af70329b88d069ef8c3278e450d4a46bf54b45c..b2cfba16c4e8ffcdcb1c649fc287fcaaab01573e 100644
(file)
--- a/
arch/arm/mach-vexpress/Kconfig
+++ b/
arch/arm/mach-vexpress/Kconfig
@@
-13,7
+13,6
@@
menuconfig ARCH_VEXPRESS
select ICST
select NO_IOPORT_MAP
select PLAT_VERSATILE
- select PLAT_VERSATILE_CLCD
select POWER_RESET
select POWER_RESET_VEXPRESS
select POWER_SUPPLY