diff options
| -rw-r--r-- | arch/arm/Kconfig | 4 | ||||
| -rw-r--r-- | arch/mn10300/Kconfig | 3 | ||||
| -rw-r--r-- | arch/tile/Kconfig | 3 | ||||
| -rw-r--r-- | arch/tile/configs/tilegx_defconfig | 1 | ||||
| -rw-r--r-- | arch/tile/configs/tilepro_defconfig | 1 | ||||
| -rw-r--r-- | arch/um/defconfig | 1 | ||||
| -rw-r--r-- | arch/xtensa/configs/iss_defconfig | 1 | ||||
| -rw-r--r-- | arch/xtensa/configs/s6105_defconfig | 1 |
8 files changed, 0 insertions, 15 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 2c71a8f3535a..37cc7227732e 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig | |||
| @@ -347,7 +347,6 @@ config ARCH_GEMINI | |||
| 347 | config ARCH_PRIMA2 | 347 | config ARCH_PRIMA2 |
| 348 | bool "CSR SiRFSoC PRIMA2 ARM Cortex A9 Platform" | 348 | bool "CSR SiRFSoC PRIMA2 ARM Cortex A9 Platform" |
| 349 | select CPU_V7 | 349 | select CPU_V7 |
| 350 | select GENERIC_TIME | ||
| 351 | select NO_IOPORT | 350 | select NO_IOPORT |
| 352 | select GENERIC_CLOCKEVENTS | 351 | select GENERIC_CLOCKEVENTS |
| 353 | select CLKDEV_LOOKUP | 352 | select CLKDEV_LOOKUP |
| @@ -520,7 +519,6 @@ config ARCH_LPC32XX | |||
| 520 | select ARM_AMBA | 519 | select ARM_AMBA |
| 521 | select USB_ARCH_HAS_OHCI | 520 | select USB_ARCH_HAS_OHCI |
| 522 | select CLKDEV_LOOKUP | 521 | select CLKDEV_LOOKUP |
| 523 | select GENERIC_TIME | ||
| 524 | select GENERIC_CLOCKEVENTS | 522 | select GENERIC_CLOCKEVENTS |
| 525 | help | 523 | help |
| 526 | Support for the NXP LPC32XX family of processors | 524 | Support for the NXP LPC32XX family of processors |
| @@ -599,7 +597,6 @@ config ARCH_TEGRA | |||
| 599 | bool "NVIDIA Tegra" | 597 | bool "NVIDIA Tegra" |
| 600 | select CLKDEV_LOOKUP | 598 | select CLKDEV_LOOKUP |
| 601 | select CLKSRC_MMIO | 599 | select CLKSRC_MMIO |
| 602 | select GENERIC_TIME | ||
| 603 | select GENERIC_CLOCKEVENTS | 600 | select GENERIC_CLOCKEVENTS |
| 604 | select GENERIC_GPIO | 601 | select GENERIC_GPIO |
| 605 | select HAVE_CLK | 602 | select HAVE_CLK |
| @@ -911,7 +908,6 @@ config ARCH_VT8500 | |||
| 911 | config ARCH_ZYNQ | 908 | config ARCH_ZYNQ |
| 912 | bool "Xilinx Zynq ARM Cortex A9 Platform" | 909 | bool "Xilinx Zynq ARM Cortex A9 Platform" |
| 913 | select CPU_V7 | 910 | select CPU_V7 |
| 914 | select GENERIC_TIME | ||
| 915 | select GENERIC_CLOCKEVENTS | 911 | select GENERIC_CLOCKEVENTS |
| 916 | select CLKDEV_LOOKUP | 912 | select CLKDEV_LOOKUP |
| 917 | select ARM_GIC | 913 | select ARM_GIC |
diff --git a/arch/mn10300/Kconfig b/arch/mn10300/Kconfig index 1f870340ebdd..5f7f2f8deb89 100644 --- a/arch/mn10300/Kconfig +++ b/arch/mn10300/Kconfig | |||
| @@ -47,9 +47,6 @@ config GENERIC_CMOS_UPDATE | |||
| 47 | config GENERIC_HWEIGHT | 47 | config GENERIC_HWEIGHT |
| 48 | def_bool y | 48 | def_bool y |
| 49 | 49 | ||
| 50 | config GENERIC_TIME | ||
| 51 | def_bool y | ||
| 52 | |||
| 53 | config GENERIC_CLOCKEVENTS | 50 | config GENERIC_CLOCKEVENTS |
| 54 | def_bool y | 51 | def_bool y |
| 55 | 52 | ||
diff --git a/arch/tile/Kconfig b/arch/tile/Kconfig index b30f71ac0d06..70a0de46cd1b 100644 --- a/arch/tile/Kconfig +++ b/arch/tile/Kconfig | |||
| @@ -46,9 +46,6 @@ config NEED_PER_CPU_PAGE_FIRST_CHUNK | |||
| 46 | config SYS_SUPPORTS_HUGETLBFS | 46 | config SYS_SUPPORTS_HUGETLBFS |
| 47 | def_bool y | 47 | def_bool y |
| 48 | 48 | ||
| 49 | config GENERIC_TIME | ||
| 50 | def_bool y | ||
| 51 | |||
| 52 | config GENERIC_CLOCKEVENTS | 49 | config GENERIC_CLOCKEVENTS |
| 53 | def_bool y | 50 | def_bool y |
| 54 | 51 | ||
diff --git a/arch/tile/configs/tilegx_defconfig b/arch/tile/configs/tilegx_defconfig index 2ad73fb707b9..dafdbbae1124 100644 --- a/arch/tile/configs/tilegx_defconfig +++ b/arch/tile/configs/tilegx_defconfig | |||
| @@ -11,7 +11,6 @@ CONFIG_HAVE_ARCH_ALLOC_REMAP=y | |||
| 11 | CONFIG_HAVE_SETUP_PER_CPU_AREA=y | 11 | CONFIG_HAVE_SETUP_PER_CPU_AREA=y |
| 12 | CONFIG_NEED_PER_CPU_PAGE_FIRST_CHUNK=y | 12 | CONFIG_NEED_PER_CPU_PAGE_FIRST_CHUNK=y |
| 13 | CONFIG_SYS_SUPPORTS_HUGETLBFS=y | 13 | CONFIG_SYS_SUPPORTS_HUGETLBFS=y |
| 14 | CONFIG_GENERIC_TIME=y | ||
| 15 | CONFIG_GENERIC_CLOCKEVENTS=y | 14 | CONFIG_GENERIC_CLOCKEVENTS=y |
| 16 | CONFIG_RWSEM_GENERIC_SPINLOCK=y | 15 | CONFIG_RWSEM_GENERIC_SPINLOCK=y |
| 17 | CONFIG_DEFAULT_MIGRATION_COST=10000000 | 16 | CONFIG_DEFAULT_MIGRATION_COST=10000000 |
diff --git a/arch/tile/configs/tilepro_defconfig b/arch/tile/configs/tilepro_defconfig index f58dc362b944..6f05f969b564 100644 --- a/arch/tile/configs/tilepro_defconfig +++ b/arch/tile/configs/tilepro_defconfig | |||
| @@ -11,7 +11,6 @@ CONFIG_HAVE_ARCH_ALLOC_REMAP=y | |||
| 11 | CONFIG_HAVE_SETUP_PER_CPU_AREA=y | 11 | CONFIG_HAVE_SETUP_PER_CPU_AREA=y |
| 12 | CONFIG_NEED_PER_CPU_PAGE_FIRST_CHUNK=y | 12 | CONFIG_NEED_PER_CPU_PAGE_FIRST_CHUNK=y |
| 13 | CONFIG_SYS_SUPPORTS_HUGETLBFS=y | 13 | CONFIG_SYS_SUPPORTS_HUGETLBFS=y |
| 14 | CONFIG_GENERIC_TIME=y | ||
| 15 | CONFIG_GENERIC_CLOCKEVENTS=y | 14 | CONFIG_GENERIC_CLOCKEVENTS=y |
| 16 | CONFIG_RWSEM_GENERIC_SPINLOCK=y | 15 | CONFIG_RWSEM_GENERIC_SPINLOCK=y |
| 17 | CONFIG_DEFAULT_MIGRATION_COST=10000000 | 16 | CONFIG_DEFAULT_MIGRATION_COST=10000000 |
diff --git a/arch/um/defconfig b/arch/um/defconfig index 9f7634f08cf3..761f5e1a657e 100644 --- a/arch/um/defconfig +++ b/arch/um/defconfig | |||
| @@ -13,7 +13,6 @@ CONFIG_LOCKDEP_SUPPORT=y | |||
| 13 | # CONFIG_STACKTRACE_SUPPORT is not set | 13 | # CONFIG_STACKTRACE_SUPPORT is not set |
| 14 | CONFIG_GENERIC_CALIBRATE_DELAY=y | 14 | CONFIG_GENERIC_CALIBRATE_DELAY=y |
| 15 | CONFIG_GENERIC_BUG=y | 15 | CONFIG_GENERIC_BUG=y |
| 16 | CONFIG_GENERIC_TIME=y | ||
| 17 | CONFIG_GENERIC_CLOCKEVENTS=y | 16 | CONFIG_GENERIC_CLOCKEVENTS=y |
| 18 | CONFIG_IRQ_RELEASE_METHOD=y | 17 | CONFIG_IRQ_RELEASE_METHOD=y |
| 19 | CONFIG_HZ=100 | 18 | CONFIG_HZ=100 |
diff --git a/arch/xtensa/configs/iss_defconfig b/arch/xtensa/configs/iss_defconfig index 0234cd198c54..f932b30b47fb 100644 --- a/arch/xtensa/configs/iss_defconfig +++ b/arch/xtensa/configs/iss_defconfig | |||
| @@ -15,7 +15,6 @@ CONFIG_GENERIC_GPIO=y | |||
| 15 | # CONFIG_ARCH_HAS_ILOG2_U64 is not set | 15 | # CONFIG_ARCH_HAS_ILOG2_U64 is not set |
| 16 | CONFIG_NO_IOPORT=y | 16 | CONFIG_NO_IOPORT=y |
| 17 | CONFIG_HZ=100 | 17 | CONFIG_HZ=100 |
| 18 | CONFIG_GENERIC_TIME=y | ||
| 19 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 18 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" |
| 20 | CONFIG_CONSTRUCTORS=y | 19 | CONFIG_CONSTRUCTORS=y |
| 21 | 20 | ||
diff --git a/arch/xtensa/configs/s6105_defconfig b/arch/xtensa/configs/s6105_defconfig index 4891abbf16bc..550e8ed5b5c6 100644 --- a/arch/xtensa/configs/s6105_defconfig +++ b/arch/xtensa/configs/s6105_defconfig | |||
| @@ -15,7 +15,6 @@ CONFIG_GENERIC_GPIO=y | |||
| 15 | # CONFIG_ARCH_HAS_ILOG2_U64 is not set | 15 | # CONFIG_ARCH_HAS_ILOG2_U64 is not set |
| 16 | CONFIG_NO_IOPORT=y | 16 | CONFIG_NO_IOPORT=y |
| 17 | CONFIG_HZ=100 | 17 | CONFIG_HZ=100 |
| 18 | CONFIG_GENERIC_TIME=y | ||
| 19 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 18 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" |
| 20 | 19 | ||
| 21 | # | 20 | # |
