diff options
Diffstat (limited to 'arch/arm/Kconfig')
-rw-r--r-- | arch/arm/Kconfig | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 600c5ba1af41..33b00579beff 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig | |||
@@ -377,15 +377,6 @@ config ARCH_FOOTBRIDGE | |||
377 | Support for systems based on the DC21285 companion chip | 377 | Support for systems based on the DC21285 companion chip |
378 | ("FootBridge"), such as the Simtec CATS and the Rebel NetWinder. | 378 | ("FootBridge"), such as the Simtec CATS and the Rebel NetWinder. |
379 | 379 | ||
380 | config ARCH_NETX | ||
381 | bool "Hilscher NetX based" | ||
382 | select ARM_VIC | ||
383 | select CLKSRC_MMIO | ||
384 | select CPU_ARM926T | ||
385 | select GENERIC_CLOCKEVENTS | ||
386 | help | ||
387 | This enables support for systems based on the Hilscher NetX Soc | ||
388 | |||
389 | config ARCH_IOP13XX | 380 | config ARCH_IOP13XX |
390 | bool "IOP13xx-based" | 381 | bool "IOP13xx-based" |
391 | depends on MMU | 382 | depends on MMU |
@@ -531,7 +522,7 @@ config ARCH_RPC | |||
531 | select ARCH_ACORN | 522 | select ARCH_ACORN |
532 | select ARCH_MAY_HAVE_PC_FDC | 523 | select ARCH_MAY_HAVE_PC_FDC |
533 | select ARCH_SPARSEMEM_ENABLE | 524 | select ARCH_SPARSEMEM_ENABLE |
534 | select ARCH_USES_GETTIMEOFFSET | 525 | select ARM_HAS_SG_CHAIN |
535 | select CPU_SA110 | 526 | select CPU_SA110 |
536 | select FIQ | 527 | select FIQ |
537 | select HAVE_IDE | 528 | select HAVE_IDE |
@@ -552,6 +543,7 @@ config ARCH_SA1100 | |||
552 | select CLKSRC_MMIO | 543 | select CLKSRC_MMIO |
553 | select CLKSRC_PXA | 544 | select CLKSRC_PXA |
554 | select TIMER_OF if OF | 545 | select TIMER_OF if OF |
546 | select COMMON_CLK | ||
555 | select CPU_FREQ | 547 | select CPU_FREQ |
556 | select CPU_SA1100 | 548 | select CPU_SA1100 |
557 | select GENERIC_CLOCKEVENTS | 549 | select GENERIC_CLOCKEVENTS |
@@ -770,8 +762,6 @@ source "arch/arm/mach-mvebu/Kconfig" | |||
770 | 762 | ||
771 | source "arch/arm/mach-mxs/Kconfig" | 763 | source "arch/arm/mach-mxs/Kconfig" |
772 | 764 | ||
773 | source "arch/arm/mach-netx/Kconfig" | ||
774 | |||
775 | source "arch/arm/mach-nomadik/Kconfig" | 765 | source "arch/arm/mach-nomadik/Kconfig" |
776 | 766 | ||
777 | source "arch/arm/mach-npcm/Kconfig" | 767 | source "arch/arm/mach-npcm/Kconfig" |