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
/
sh7785lcr_32bit_defconfig
diff --git
a/arch/sh/configs/sh7785lcr_32bit_defconfig
b/arch/sh/configs/sh7785lcr_32bit_defconfig
index 9b885c14c4003bba9e5e684d836ddba399a48ad8..5c725c75fcef723c4081f1257d3a4f15e6f4f6cb 100644
(file)
--- a/
arch/sh/configs/sh7785lcr_32bit_defconfig
+++ b/
arch/sh/configs/sh7785lcr_32bit_defconfig
@@
-66,7
+66,6
@@
CONFIG_INPUT_FF_MEMLESS=m
CONFIG_INPUT_EVDEV=y
CONFIG_INPUT_EVBUG=m
CONFIG_VT_HW_CONSOLE_BINDING=y
-# CONFIG_DEVKMEM is not set
CONFIG_SERIAL_SH_SCI=y
CONFIG_SERIAL_SH_SCI_NR_UARTS=6
CONFIG_SERIAL_SH_SCI_CONSOLE=y