diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2014-02-25 20:22:39 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2014-02-25 20:22:39 +0100 |
| commit | 80528e197e2924ba82c06f30a9928e93c4f16a33 (patch) | |
| tree | e8d285100bfbaf9fd7d5a905c63a35b5773ce9de | |
| parent | dd67f8a05dcaeb818eb6dee4ab4ea0b2490b0efc (diff) | |
| parent | d5d5ce952a66c32abf36a6fdf2a1ba6cb8da9b93 (diff) | |
Merge tag 'efm32-next' of git://git.pengutronix.de/git/ukl/linux into next/cleanup
Merge "efm32 cleanups for next" from Uwe Kleine-König
Just three simple cleanups for efm32 removing two now unused files and a
superflous select by ARCH_EFM32.
As these cleanups have dependencies on both v3.14-rc1 and my timex.h cleanup
(which is based on v3.13-rc1) this pull request also included a merge of my
cleanup tag which is already in armsoc/next/cleanup.
* tag 'efm32-next' of git://git.pengutronix.de/git/ukl/linux:
ARM: efm32: drop unused file <mach/timex.h>
ARM: efm32: drop selecting CLKSRC_MMIO
ARM: efm32: drop unused file entry-macro.S
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
| -rw-r--r-- | arch/arm/Kconfig | 3 | ||||
| -rw-r--r-- | arch/arm/mach-efm32/include/mach/entry-macro.S | 4 | ||||
| -rw-r--r-- | arch/arm/mach-efm32/include/mach/timex.h | 3 |
3 files changed, 0 insertions, 10 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index f093f2030c1c..224793cefa31 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -421,9 +421,6 @@ config ARCH_EFM32 depends on !MMU select ARCH_REQUIRE_GPIOLIB select ARM_NVIC - # CLKSRC_MMIO is wrong here, but needed until a proper fix is merged, - # i.e. CLKSRC_EFM32 selecting CLKSRC_MMIO - select CLKSRC_MMIO select CLKSRC_OF select COMMON_CLK select CPU_V7M diff --git a/arch/arm/mach-efm32/include/mach/entry-macro.S b/arch/arm/mach-efm32/include/mach/entry-macro.S deleted file mode 100644 index 322159d5ed91..000000000000 --- a/arch/arm/mach-efm32/include/mach/entry-macro.S +++ /dev/null @@ -1,4 +0,0 @@ -/* - * Empty file waiting for deletion once <mach/entry-macro.S> isn't needed any - * more. Patch "ARM: v7-M: drop using mach/entry-macro.S" sitting in next. - */ diff --git a/arch/arm/mach-efm32/include/mach/timex.h b/arch/arm/mach-efm32/include/mach/timex.h deleted file mode 100644 index 7a8b26da6599..000000000000 --- a/arch/arm/mach-efm32/include/mach/timex.h +++ /dev/null @@ -1,3 +0,0 @@ -/* - * Empty file waiting for deletion once <mach/timex.h> isn't needed any more. - */ |