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 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm
[sfrench/cifs-2.6.git]
/
arch
/
sh
/
configs
/
lboxre2_defconfig
diff --git
a/arch/sh/configs/lboxre2_defconfig
b/arch/sh/configs/lboxre2_defconfig
index be86414dcc87064d5b5d9a068a0d5b7e3f8b03f9..fa09d68d057a2a23e78afac25f00f438e32d83e1 100644
(file)
--- a/
arch/sh/configs/lboxre2_defconfig
+++ b/
arch/sh/configs/lboxre2_defconfig
@@
-222,7
+222,7
@@
CONFIG_SH_FPU=y
# CONFIG_SH_DSP is not set
# CONFIG_SH_STORE_QUEUES is not set
CONFIG_CPU_HAS_INTEVT=y
-CONFIG_CPU_HAS_I
PR
_IRQ=y
+CONFIG_CPU_HAS_I
NTC
_IRQ=y
CONFIG_CPU_HAS_SR_RB=y
CONFIG_CPU_HAS_PTEA=y