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 branch 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
configs
/
vexpress_defconfig
diff --git
a/arch/arm/configs/vexpress_defconfig
b/arch/arm/configs/vexpress_defconfig
index 0fa0ed577b1551b5776b5b3599c6d1ed24cc9eee..edae1c58fe804b10d9c5778a42e8eb3df4a22e60 100644
(file)
--- a/
arch/arm/configs/vexpress_defconfig
+++ b/
arch/arm/configs/vexpress_defconfig
@@
-19,7
+19,6
@@
CONFIG_MODULE_UNLOAD=y
# CONFIG_IOSCHED_DEADLINE is not set
# CONFIG_IOSCHED_CFQ is not set
CONFIG_ARCH_VEXPRESS=y
-CONFIG_ARCH_VEXPRESS_CA9X4=y
CONFIG_ARCH_VEXPRESS_DCSCB=y
CONFIG_ARCH_VEXPRESS_TC2_PM=y
# CONFIG_SWP_EMULATE is not set