diff options
author | Olof Johansson <olof@lixom.net> | 2012-04-15 01:17:47 -0400 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2012-04-15 01:17:47 -0400 |
commit | 17d2f847e6aa1181024cb881fdc6cbad18f11b04 (patch) | |
tree | d6a1c35140a566a3b4bdf032b597cf96f5758e95 /arch/arm/Kconfig | |
parent | 0034102808e0dbbf3a2394b82b1bb40b5778de9e (diff) | |
parent | c65f2abf54a6d07260f1fa64773154e1d7047961 (diff) |
Merge branch 'ixp2xxx/removal' into next/cleanup
* ixp2xxx/removal:
ARM: remove ixp23xx and ixp2000 platforms
Diffstat (limited to 'arch/arm/Kconfig')
-rw-r--r-- | arch/arm/Kconfig | 26 |
1 files changed, 0 insertions, 26 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index cf006d40342c..80787f77fe88 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig | |||
@@ -528,28 +528,6 @@ config ARCH_IOP33X | |||
528 | help | 528 | help |
529 | Support for Intel's IOP33X (XScale) family of processors. | 529 | Support for Intel's IOP33X (XScale) family of processors. |
530 | 530 | ||
531 | config ARCH_IXP23XX | ||
532 | bool "IXP23XX-based" | ||
533 | depends on MMU | ||
534 | select CPU_XSC3 | ||
535 | select PCI | ||
536 | select ARCH_USES_GETTIMEOFFSET | ||
537 | select NEED_MACH_IO_H | ||
538 | select NEED_MACH_MEMORY_H | ||
539 | help | ||
540 | Support for Intel's IXP23xx (XScale) family of processors. | ||
541 | |||
542 | config ARCH_IXP2000 | ||
543 | bool "IXP2400/2800-based" | ||
544 | depends on MMU | ||
545 | select CPU_XSCALE | ||
546 | select PCI | ||
547 | select ARCH_USES_GETTIMEOFFSET | ||
548 | select NEED_MACH_IO_H | ||
549 | select NEED_MACH_MEMORY_H | ||
550 | help | ||
551 | Support for Intel's IXP2400/2800 (XScale) family of processors. | ||
552 | |||
553 | config ARCH_IXP4XX | 531 | config ARCH_IXP4XX |
554 | bool "IXP4xx-based" | 532 | bool "IXP4xx-based" |
555 | depends on MMU | 533 | depends on MMU |
@@ -1046,10 +1024,6 @@ source "arch/arm/mach-iop13xx/Kconfig" | |||
1046 | 1024 | ||
1047 | source "arch/arm/mach-ixp4xx/Kconfig" | 1025 | source "arch/arm/mach-ixp4xx/Kconfig" |
1048 | 1026 | ||
1049 | source "arch/arm/mach-ixp2000/Kconfig" | ||
1050 | |||
1051 | source "arch/arm/mach-ixp23xx/Kconfig" | ||
1052 | |||
1053 | source "arch/arm/mach-kirkwood/Kconfig" | 1027 | source "arch/arm/mach-kirkwood/Kconfig" |
1054 | 1028 | ||
1055 | source "arch/arm/mach-ks8695/Kconfig" | 1029 | source "arch/arm/mach-ks8695/Kconfig" |