diff options
author | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-01-23 11:59:04 +0000 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-01-23 11:59:13 +0000 |
commit | 34e5f4f198ddd36a82dc12164de7fc4f5430e09d (patch) | |
tree | 70a06002170ddc2a859f877564834177f0f3df5d /arch/arm/mach-spear6xx | |
parent | e76f4750f4c06c8b891ae7bc4c10074de08a9d41 (diff) | |
parent | a570067df9cc1b1821ca5255bbbe8adb67aca199 (diff) |
Merge branches 'debug' and 'idle' into for-armsoc
Diffstat (limited to 'arch/arm/mach-spear6xx')
-rw-r--r-- | arch/arm/mach-spear6xx/include/mach/system.h | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/arch/arm/mach-spear6xx/include/mach/system.h b/arch/arm/mach-spear6xx/include/mach/system.h deleted file mode 100644 index 0b1d2be81cf..00000000000 --- a/arch/arm/mach-spear6xx/include/mach/system.h +++ /dev/null @@ -1,19 +0,0 @@ -/* - * arch/arm/mach-spear6xx/include/mach/system.h - * - * SPEAr6xx Machine family specific architecture functions - * - * Copyright (C) 2009 ST Microelectronics - * Rajeev Kumar<rajeev-dlh.kumar@st.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_SYSTEM_H -#define __MACH_SYSTEM_H - -#include <plat/system.h> - -#endif /* __MACH_SYSTEM_H */ |