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 'for-linus' of ssh://master.kernel.org/pub/scm/linux/kernel/git/ieee1394...
[pandora-kernel.git]
/
arch
/
sh
/
mm
/
Kconfig
diff --git
a/arch/sh/mm/Kconfig
b/arch/sh/mm/Kconfig
index
29f4ee3
..
6b0d28a
100644
(file)
--- a/
arch/sh/mm/Kconfig
+++ b/
arch/sh/mm/Kconfig
@@
-20,7
+20,7
@@
config CPU_SH4
bool
select CPU_HAS_INTEVT
select CPU_HAS_SR_RB
bool
select CPU_HAS_INTEVT
select CPU_HAS_SR_RB
- select CPU_HAS_PTEA if
!CPU_SUBTYPE_ST40
+ select CPU_HAS_PTEA if
(!CPU_SUBTYPE_ST40 && !CPU_SH4A) || CPU_SHX2
config CPU_SH4A
bool
config CPU_SH4A
bool
@@
-72,6
+72,7
@@
config CPU_SUBTYPE_SH7705
config CPU_SUBTYPE_SH7706
bool "Support SH7706 processor"
select CPU_SH3
config CPU_SUBTYPE_SH7706
bool "Support SH7706 processor"
select CPU_SH3
+ select CPU_HAS_IPR_IRQ
help
Select SH7706 if you have a 133 Mhz SH-3 HD6417706 CPU.
help
Select SH7706 if you have a 133 Mhz SH-3 HD6417706 CPU.
@@
-92,6
+93,7
@@
config CPU_SUBTYPE_SH7708
config CPU_SUBTYPE_SH7709
bool "Support SH7709 processor"
select CPU_SH3
config CPU_SUBTYPE_SH7709
bool "Support SH7709 processor"
select CPU_SH3
+ select CPU_HAS_IPR_IRQ
select CPU_HAS_PINT_IRQ
help
Select SH7709 if you have a 80 Mhz SH-3 HD6417709 CPU.
select CPU_HAS_PINT_IRQ
help
Select SH7709 if you have a 80 Mhz SH-3 HD6417709 CPU.
@@
-149,6
+151,7
@@
config CPU_SUBTYPE_SH7760
bool "Support SH7760 processor"
select CPU_SH4
select CPU_HAS_INTC2_IRQ
bool "Support SH7760 processor"
select CPU_SH4
select CPU_HAS_INTC2_IRQ
+ select CPU_HAS_IPR_IRQ
config CPU_SUBTYPE_SH4_202
bool "Support SH4-202 processor"
config CPU_SUBTYPE_SH4_202
bool "Support SH4-202 processor"