diff options
author | Arnd Bergmann <arnd@arndb.de> | 2013-04-19 22:30:31 +0200 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2013-04-19 22:50:01 +0200 |
commit | 1b361942b53c33f38d55065c13785aadb5103a18 (patch) | |
tree | 07b26d32b175f27f18f1fca3d5944a58f89cd17f /arch/arm/mach-spear6xx/include/mach/hardware.h | |
parent | 61b464aef0e306f141dbc0bb3f9c58049a987a7e (diff) | |
parent | bcf3e72eff584136600a51a5b30ef7a794664d19 (diff) | |
download | linux-rt-1b361942b53c33f38d55065c13785aadb5103a18.tar.gz |
Merge branch 'spear/multiplatform' into late/cleanup
This is a prerequisite for the spear/dwdma series.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/mach-spear6xx/include/mach/hardware.h')
-rw-r--r-- | arch/arm/mach-spear6xx/include/mach/hardware.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/mach-spear6xx/include/mach/hardware.h b/arch/arm/mach-spear6xx/include/mach/hardware.h deleted file mode 100644 index 40a8c178f10d..000000000000 --- a/arch/arm/mach-spear6xx/include/mach/hardware.h +++ /dev/null @@ -1 +0,0 @@ -/* empty */ |