diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-05-23 18:18:40 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-05-23 18:18:40 -0400 |
| commit | fc05505b77f7900a1bb74fb3f3a4343dee4265a4 (patch) | |
| tree | 6517919cb60bd9465078512cacbefd8c77f94b76 /arch/arm/mach-ixp4xx/Kconfig | |
| parent | a2ab67fae1ab9226679495a8d260f4e6555efc5f (diff) | |
| parent | 11c79740d3c03cb81f84e98cf2e2dbd8d9bb53cd (diff) | |
Merge branch 'ixp4xx' of git://git.kernel.org/pub/scm/linux/kernel/git/chris/linux-2.6 into devel
Diffstat (limited to 'arch/arm/mach-ixp4xx/Kconfig')
| -rw-r--r-- | arch/arm/mach-ixp4xx/Kconfig | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/arm/mach-ixp4xx/Kconfig b/arch/arm/mach-ixp4xx/Kconfig index 2c5a02b8520e..264f4d59f898 100644 --- a/arch/arm/mach-ixp4xx/Kconfig +++ b/arch/arm/mach-ixp4xx/Kconfig | |||
| @@ -78,6 +78,12 @@ config MACH_IXDP465 | |||
| 78 | IXDP465 Development Platform (Also known as BMP). | 78 | IXDP465 Development Platform (Also known as BMP). |
| 79 | For more information on this platform, see <file:Documentation/arm/IXP4xx>. | 79 | For more information on this platform, see <file:Documentation/arm/IXP4xx>. |
| 80 | 80 | ||
| 81 | config MACH_GORAMO_MLR | ||
| 82 | bool "GORAMO Multi Link Router" | ||
| 83 | help | ||
| 84 | Say 'Y' here if you want your kernel to support GORAMO | ||
| 85 | MultiLink router. | ||
| 86 | |||
| 81 | config MACH_KIXRP435 | 87 | config MACH_KIXRP435 |
| 82 | bool "KIXRP435" | 88 | bool "KIXRP435" |
| 83 | help | 89 | help |