git.openpandora.org
/
pandora-kernel.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
[pandora-kernel.git]
/
arch
/
sh
/
configs
/
r7780mp_defconfig
diff --git
a/arch/sh/configs/r7780mp_defconfig
b/arch/sh/configs/r7780mp_defconfig
index
17f7402
..
ac4de49
100644
(file)
--- a/
arch/sh/configs/r7780mp_defconfig
+++ b/
arch/sh/configs/r7780mp_defconfig
@@
-191,7
+191,7
@@
CONFIG_SH_FPU=y
CONFIG_SH_STORE_QUEUES=y
CONFIG_SPECULATIVE_EXECUTION=y
CONFIG_CPU_HAS_INTEVT=y
-CONFIG_CPU_HAS_INTC
2
_IRQ=y
+CONFIG_CPU_HAS_INTC_IRQ=y
CONFIG_CPU_HAS_SR_RB=y
#