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 tag 'trace-ipi-tracepoints' of git://git.kernel.org/pub/scm/linux/kernel/git...
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
mach-integrator
/
Kconfig
diff --git
a/arch/arm/mach-integrator/Kconfig
b/arch/arm/mach-integrator/Kconfig
index 64f8e2564a376837e11bb59a4c9caad7d7041acc..c455e974bbfe4f2c05bc4451f1e50ae317482019 100644
(file)
--- a/
arch/arm/mach-integrator/Kconfig
+++ b/
arch/arm/mach-integrator/Kconfig
@@
-17,7
+17,6
@@
config ARCH_INTEGRATOR_CP
bool "Support Integrator/CP platform"
select ARCH_CINTEGRATOR
select ARM_TIMER_SP804
- select PLAT_VERSATILE_CLCD
select SERIAL_AMBA_PL011 if TTY
select SERIAL_AMBA_PL011_CONSOLE if TTY
select SOC_BUS