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-spear13xx/include/mach/uncompress.h | |
| parent | 61b464aef0e306f141dbc0bb3f9c58049a987a7e (diff) | |
| parent | bcf3e72eff584136600a51a5b30ef7a794664d19 (diff) | |
| download | kernel_goldelico_gta04-1b361942b53c33f38d55065c13785aadb5103a18.zip kernel_goldelico_gta04-1b361942b53c33f38d55065c13785aadb5103a18.tar.gz kernel_goldelico_gta04-1b361942b53c33f38d55065c13785aadb5103a18.tar.bz2 | |
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-spear13xx/include/mach/uncompress.h')
| -rw-r--r-- | arch/arm/mach-spear13xx/include/mach/uncompress.h | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/arch/arm/mach-spear13xx/include/mach/uncompress.h b/arch/arm/mach-spear13xx/include/mach/uncompress.h deleted file mode 100644 index 70fe72f..0000000 --- a/arch/arm/mach-spear13xx/include/mach/uncompress.h +++ /dev/null @@ -1,19 +0,0 @@ -/* - * arch/arm/mach-spear13xx/include/mach/uncompress.h - * - * Serial port stubs for kernel decompress status messages - * - * Copyright (C) 2012 ST Microelectronics - * Viresh Kumar <viresh.linux@gmail.com> - * - * This file is licensed under the terms of the GNU General Public - * License version 2. This program is licensed "as is" without any - * warranty of any kind, whether express or implied. - */ - -#ifndef __MACH_UNCOMPRESS_H -#define __MACH_UNCOMPRESS_H - -#include <plat/uncompress.h> - -#endif /* __MACH_UNCOMPRESS_H */ |