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 'agp-next' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied...
[pandora-kernel.git]
/
arch
/
arm
/
plat-mxc
/
Kconfig
diff --git
a/arch/arm/plat-mxc/Kconfig
b/arch/arm/plat-mxc/Kconfig
index
8986b74
..
ca5c7c2
100644
(file)
--- a/
arch/arm/plat-mxc/Kconfig
+++ b/
arch/arm/plat-mxc/Kconfig
@@
-9,6
+9,7
@@
choice
config ARCH_MX1
bool "MX1-based"
select CPU_ARM920T
config ARCH_MX1
bool "MX1-based"
select CPU_ARM920T
+ select COMMON_CLKDEV
help
This enables support for systems based on the Freescale i.MX1 family
help
This enables support for systems based on the Freescale i.MX1 family
@@
-19,6
+20,13
@@
config ARCH_MX2
help
This enables support for systems based on the Freescale i.MX2 family
help
This enables support for systems based on the Freescale i.MX2 family
+config ARCH_MX25
+ bool "MX25-based"
+ select CPU_ARM926T
+ select COMMON_CLKDEV
+ help
+ This enables support for systems based on the Freescale i.MX25 family
+
config ARCH_MX3
bool "MX3-based"
select CPU_V6
config ARCH_MX3
bool "MX3-based"
select CPU_V6
@@
-26,11
+34,20
@@
config ARCH_MX3
help
This enables support for systems based on the Freescale i.MX3 family
help
This enables support for systems based on the Freescale i.MX3 family
+config ARCH_MXC91231
+ bool "MXC91231-based"
+ select CPU_V6
+ select COMMON_CLKDEV
+ help
+ This enables support for systems based on the Freescale MXC91231 family
+
endchoice
source "arch/arm/mach-mx1/Kconfig"
source "arch/arm/mach-mx2/Kconfig"
source "arch/arm/mach-mx3/Kconfig"
endchoice
source "arch/arm/mach-mx1/Kconfig"
source "arch/arm/mach-mx2/Kconfig"
source "arch/arm/mach-mx3/Kconfig"
+source "arch/arm/mach-mx25/Kconfig"
+source "arch/arm/mach-mxc91231/Kconfig"
endmenu
endmenu