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...
[pandora-kernel.git]
/
arch
/
sh
/
Kconfig
diff --git
a/arch/sh/Kconfig
b/arch/sh/Kconfig
index
74495a5
..
f03338c
100644
(file)
--- a/
arch/sh/Kconfig
+++ b/
arch/sh/Kconfig
@@
-161,7
+161,7
@@
config ARCH_HAS_CPU_IDLE_WAIT
config NO_IOPORT
def_bool !PCI
- depends on !SH_CAYMAN && !SH_SH4202_MICRODEV
+ depends on !SH_CAYMAN && !SH_SH4202_MICRODEV
&& !SH_SHMIN
config IO_TRAPPED
bool