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 'akpm' (patches from Andrew)
[sfrench/cifs-2.6.git]
/
arch
/
sh
/
configs
/
sh7770_generic_defconfig
diff --git
a/arch/sh/configs/sh7770_generic_defconfig
b/arch/sh/configs/sh7770_generic_defconfig
index 88193153e51bfd809c57e44863bf4dabdf82a0a4..ee2357deba0f1ca7ae62362b1a54472f4e852c1a 100644
(file)
--- a/
arch/sh/configs/sh7770_generic_defconfig
+++ b/
arch/sh/configs/sh7770_generic_defconfig
@@
-20,7
+20,6
@@
CONFIG_CPU_IDLE=y
# CONFIG_INPUT is not set
# CONFIG_SERIO is not set
# CONFIG_VT is not set
-# CONFIG_DEVKMEM is not set
CONFIG_SERIAL_SH_SCI=y
CONFIG_SERIAL_SH_SCI_NR_UARTS=6
CONFIG_SERIAL_SH_SCI_CONSOLE=y