diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2015-05-22 16:39:20 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2015-05-22 16:39:20 +0200 |
| commit | d7c82daf4fbf3692ef4b2fd2056221733599ce5b (patch) | |
| tree | cf624cc780dbcd175a1e6ae19b17aa3fb87bc0fc /fs/gfs2/Makefile | |
| parent | 2ed25580870190b26b0add8a3dc58dfaf5bed8cb (diff) | |
| parent | 196b44ea0f7582290e84dbb37f10d2468f726fbf (diff) | |
Merge tag 'at91-cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux into next/cleanup
Merge "First batch of cleanup for 4.2" from Alexandre Belloni:
- use syscon in the ata and cf drivers to configure the SMC and drop
sam9_smc.c
- switch the at91rm9200 memory controller to syscon
- remove last useless headers
- remove now useless Makefile.boot
* tag 'at91-cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux:
ARM: at91: remove useless Makefile.boot
ARM: at91: remove at91rm9200_sdramc.h
ARM: at91: remove mach/at91_ramc.h and mach/at91rm9200_mc.h
ARM: at91/pm: use the atmel-mc syscon defines
pcmcia: at91_cf: Use syscon to configure the MC/smc
ARM: at91: declare the at91rm9200 memory controller as a syscon
mfd: syscon: Add Atmel MC (Memory Controller) registers definition
ARM: at91: drop sam9_smc.c
ata: at91: use syscon to configure the smc
Diffstat (limited to 'fs/gfs2/Makefile')
0 files changed, 0 insertions, 0 deletions