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 'for-2.6.25' of master.kernel.org:/pub/scm/linux/kernel/git/galak/powerp...
[sfrench/cifs-2.6.git]
/
arch
/
m32r
/
Kconfig
diff --git
a/arch/m32r/Kconfig
b/arch/m32r/Kconfig
index 8ccf3e47bff8a1a79254a7d9a430514d818322ef..ab9a264cb1947cb6a938c523e677f4c64873b72e 100644
(file)
--- a/
arch/m32r/Kconfig
+++ b/
arch/m32r/Kconfig
@@
-57,9
+57,13
@@
config PLAT_MAPPI
config PLAT_USRV
bool "uServer"
config PLAT_USRV
bool "uServer"
+ select PLAT_HAS_INT1ICU
config PLAT_M32700UT
bool "M32700UT"
config PLAT_M32700UT
bool "M32700UT"
+ select PLAT_HAS_INT0ICU
+ select PLAT_HAS_INT1ICU
+ select PLAT_HAS_INT2ICU
help
The M3T-M32700UT is an evaluation board based on uT-Engine
specification. This board has an M32700 (Chaos) evaluation chip.
help
The M3T-M32700UT is an evaluation board based on uT-Engine
specification. This board has an M32700 (Chaos) evaluation chip.
@@
-68,6
+72,9
@@
config PLAT_M32700UT
config PLAT_OPSPUT
bool "OPSPUT"
config PLAT_OPSPUT
bool "OPSPUT"
+ select PLAT_HAS_INT0ICU
+ select PLAT_HAS_INT1ICU
+ select PLAT_HAS_INT2ICU
help
The OPSPUT is an evaluation board based on uT-Engine
specification. This board has a OPSP-REP chip.
help
The OPSPUT is an evaluation board based on uT-Engine
specification. This board has a OPSP-REP chip.
@@
-89,6
+96,7
@@
config PLAT_MAPPI3
config PLAT_M32104UT
bool "M32104UT"
config PLAT_M32104UT
bool "M32104UT"
+ select PLAT_HAS_INT1ICU
help
The M3T-M32104UT is an reference board based on uT-Engine
specification. This board has a M32104 chip.
help
The M3T-M32104UT is an reference board based on uT-Engine
specification. This board has a M32104 chip.
@@
-149,6
+157,18
@@
config ISA_DUAL_ISSUE
depends on CHIP_M32700 || CHIP_OPSP
default y
depends on CHIP_M32700 || CHIP_OPSP
default y
+config PLAT_HAS_INT0ICU
+ bool
+ default n
+
+config PLAT_HAS_INT1ICU
+ bool
+ default n
+
+config PLAT_HAS_INT2ICU
+ bool
+ default n
+
config BUS_CLOCK
int "Bus Clock [Hz] (integer)"
default "70000000" if PLAT_MAPPI
config BUS_CLOCK
int "Bus Clock [Hz] (integer)"
default "70000000" if PLAT_MAPPI
@@
-406,7
+426,7
@@
source "drivers/Kconfig"
source "fs/Kconfig"
source "fs/Kconfig"
-source "
arch/m32r/oprofile/Kconfig
"
+source "
kernel/Kconfig.instrumentation
"
source "arch/m32r/Kconfig.debug"
source "arch/m32r/Kconfig.debug"