Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-06 20:21:57 +00:00
Code Issues Packages Projects Releases Wiki Activity
2755e18748
linux/arch/arm/mach-sa1100
History
Uwe Kleine-König 51bcb6aae8 This cleanup series gets rid of <mach/timex.h> for platforms not using 
ARCH_MULTIPLATFORM. (For multi-platform code it's already unused since
 387798b (ARM: initial multiplatform support).)
 
 To make this work some code out of arch/arm needed to be adapted. The
 respective changes got acks by their maintainers to be taken via armsoc
 (with Andrew Morton substituting for Alessandro Zummo as rtc maintainer).
 
 Compared to the previous pull request there was another patch added that
 fixes a (non-critical) regression on ixp4xx. Olof Johansson asked to not
 squash this fix into the original commit to save him from the need to
 reverify the series.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.12 (GNU/Linux)
 
 iQIcBAABCAAGBQJTA8PeAAoJEOLc3ZEyZpvW5GEP/iz+HIx8Rkf3exUOorZB0Kef
 dPC1Bmc4SThffhgmmXTjSapTzjfnuC8xq8dni008L7QR0LFJsC/rw8bR9GqYhTDs
 EP7Sk0vDJcTUw9dvlIG0jpBioxdsPY7isU8K85tr2a+dzi4JA2h8iv6gE7bsOf1c
 b18hIWp2ZZdeYQX3OcuzPeVfvXuMaayBJChq0akoW7zqxG2nHG9j1vCSOhBtrgpc
 xCTuEqPoaDOdXjdhyda//3SKkIYh1eMf+RWMgW38vz2uHEI3AsMn/EWe6pNRKzRt
 JdVC6LWFl5tl1Dz73NoGFQO+ztTBb2pTrmqggc+Hi4iTekJSmJSFU51D/E0hdJFj
 KmWDWPLiUdAItjPuRz/HyeZxoIZQjg9PJ8MkjwVNAz4f4Vmw2xNnAV1Eur3k9JyV
 fo55eaBvy2KIGzBB+/ksMUvs4HzMJ7Z/dVPzZYRF8VxlYFJXExT0O42oeJ8KsfH7
 dJ1bjk+3VIWPLH3DHyyiIfBL1oxe4MemqrAREFnN2QxYHyCipXLwH35uNZXAqvcU
 jverroWnCdrpOn9KI+vpnp/kuE7Qc1IH/AwAZngPj2xhaFapiH6h1JK/xWcWjijR
 AKv1DhFJMqSp9fvclr/ZAb7o35V/LG0rpCs+oZumCCARwpxkbo8xXgG0CfPsYFrG
 KwLWPz5zwySGwvDZ2wub
 =g6PN
 -----END PGP SIGNATURE-----

Merge tag 'dropmachtimexh-v2' of git://git.pengutronix.de/git/ukl/linux

This cleanup series gets rid of <mach/timex.h> for platforms not using
ARCH_MULTIPLATFORM. (For multi-platform code it's already unused since
387798b (ARM: initial multiplatform support).)

To make this work some code out of arch/arm needed to be adapted. The
respective changes got acks by their maintainers to be taken via armsoc
(with Andrew Morton substituting for Alessandro Zummo as rtc maintainer).

Compared to the previous pull request there was another patch added that
fixes a (non-critical) regression on ixp4xx. Olof Johansson asked to not
squash this fix into the original commit to save him from the need to
reverify the series.

Conflicts:
	arch/arm/mach-at91/at91sam9260.c
	arch/arm/mach-at91/at91sam9261.c
	arch/arm/mach-at91/at91sam9263.c
	arch/arm/mach-at91/at91sam9rl.c
	arch/arm/mach-mmp/time.c
	arch/arm/mach-sa1100/time.c
2014-02-24 10:06:56 +01:00
..
include/mach This cleanup series gets rid of <mach/timex.h> for platforms not using 2014-02-24 10:06:56 +01:00
assabet.c ARM: sa11x0: assabet: clean up IrDA power setting 2013-12-12 22:59:19 +00:00
badge4.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
cerf.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
clock.c ARM: SA1100: Create dummy clk_get_rate() to avoid build failures 2014-01-17 02:00:44 +01:00
collie.c ARM: 7935/1: sa1100: collie: add gpio-keys configuration 2014-01-11 15:34:32 +00:00
generic.c cpufreq: Implement light weight ->target_index() routine 2013-10-25 22:42:24 +02:00
generic.h cpufreq: Implement light weight ->target_index() routine 2013-10-25 22:42:24 +02:00
h3xxx.c ARM: move serial_sa1100.h header file to linux/platform_data 2012-11-16 11:35:29 +00:00
h3100.c ARM: 7900/1: sa1100: h3100: refactor IrDA GPIO handling 2013-12-12 23:00:56 +00:00
h3600.c ARM: 7901/1: sa1100: h3600: refactor IrDA GPIO handling 2013-12-12 23:00:56 +00:00
hackkit.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
irq.c ARM: sa11x0/pxa: convert OS timer registers to IOMEM 2012-07-09 17:37:35 +01:00
jornada720_ssp.c ARM: drivers: remove __dev* attributes. 2013-01-03 15:57:04 -08:00
jornada720.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
Kconfig cpufreq: sa11x0: move cpufreq driver to drivers/cpufreq 2013-04-10 13:19:24 +02:00
lart.c arm-soc: cleanups 2013-02-21 14:58:40 -08:00
Makefile cpufreq: sa11x0: move cpufreq driver to drivers/cpufreq 2013-04-10 13:19:24 +02:00
Makefile.boot ARM: sa1100: fix build error 2011-12-08 14:55:57 +08:00
nanoengine.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
neponset.c ARM: drivers: remove __dev* attributes. 2013-01-03 15:57:04 -08:00
pci-nanoengine.c ARM: PCI: provide a default bus scan implementation 2012-05-13 17:12:17 +01:00
pleb.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
pm.c ARM: sa11x0/pxa: convert OS timer registers to IOMEM 2012-07-09 17:37:35 +01:00
shannon.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
simpad.c ARM: 7865/1: sa1100: fix simpad compilation warning 2013-10-29 11:01:01 +00:00
sleep.S ARM: 7452/1: delay: allow timer-based delay implementation to be selected 2012-07-09 17:42:23 +01:00
ssp.c ARM: 7342/2: sa1100: prepare for sparse irq conversion 2012-03-25 23:57:20 +01:00
time.c This cleanup series gets rid of <mach/timex.h> for platforms not using 2014-02-24 10:06:56 +01:00