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 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
[pandora-kernel.git]
/
arch
/
sh
/
Kconfig.cpu
diff --git
a/arch/sh/Kconfig.cpu
b/arch/sh/Kconfig.cpu
index
d850184
..
0e27fe3
100644
(file)
--- a/
arch/sh/Kconfig.cpu
+++ b/
arch/sh/Kconfig.cpu
@@
-12,6
+12,7
@@
config CPU_LITTLE_ENDIAN
config CPU_BIG_ENDIAN
bool "Big Endian"
+ depends on !CPU_SH5
endchoice
@@
-87,9
+88,6
@@
config SH64_ID2815_WORKAROUND
config CPU_HAS_INTEVT
bool
-config CPU_HAS_MASKREG_IRQ
- bool
-
config CPU_HAS_IPR_IRQ
bool