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. -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.12 (GNU/Linux) iQIcBAABCAAGBQJTCw6tAAoJEOLc3ZEyZpvWWmQQAIF5+++OH6POdwDtnnkZPKbf cLfkshiB+FkyPojFzyzQ7cxcvvDhmT4mvIK4eyW7IQkn8tOIDYm1HQtt6HA+yacT dp8Mdq9pxOVEFE0GvXsSs+xdT/pCMHrIrMGrzXDyfHQxK+9WtuxA5ay7o35Y7UAZ lAFM7RT6DPb+Mw6tmC2GmEnM9+61Nn90lGWtiVc1aqqpPgcsMI5zkV9sI1VIQmaD exfy87+1kS3+7wLIM1Y3+EewJqBzY/IGdufiZtOUFo1dj3PanLS5p6lYvUIqF4tF BRq7HWEMxN+zhqePmVjtjhUFcyOAVGXydBKIwOBMQsZp70i/Fs3M2/Scu98YyBRM bSUTspahDXDmezKV1f0v/qrr37lsBspXRBWRu6hLqmdtJ+CRvJWEi3d+o+D72Edz CYniraHFqMsLVoSl8BiTp/HNaQ4JM/zo84y5fH/rqHJmTBSgiTBs6gMoItGNsTVM HGLNCuCBV/EoQK/FUDkXAsTcP9XDX6KoWIyul3GJw2ZT0/hBmh8auQm3u0bqmerk WxFJYqUkKtJnHFXyFep+uk+ElUEnafRUNcmHvGYHr+DdjHRFaek3RToAKfbgQucI HTh/cwhGBbO/AMMqrRDlYyI6mOJ+Yc7WfaUBevSmuN95deP01mO8seMxzRPq1hHT MGpCeTFRc6wPcIbDeT39 =FW7m -----END PGP SIGNATURE----- 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>
This commit is contained in:
commit
80528e197e
|
@ -421,9 +421,6 @@ config ARCH_EFM32
|
||||||
depends on !MMU
|
depends on !MMU
|
||||||
select ARCH_REQUIRE_GPIOLIB
|
select ARCH_REQUIRE_GPIOLIB
|
||||||
select ARM_NVIC
|
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 CLKSRC_OF
|
||||||
select COMMON_CLK
|
select COMMON_CLK
|
||||||
select CPU_V7M
|
select CPU_V7M
|
||||||
|
|
|
@ -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.
|
|
||||||
*/
|
|
|
@ -1,3 +0,0 @@
|
||||||
/*
|
|
||||||
* Empty file waiting for deletion once <mach/timex.h> isn't needed any more.
|
|
||||||
*/
|
|
Loading…
Reference in New Issue