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-highbank/include/mach/system.h | |
parent | e76f4750f4c06c8b891ae7bc4c10074de08a9d41 (diff) | |
parent | a570067df9cc1b1821ca5255bbbe8adb67aca199 (diff) | |
download | blackbird-op-linux-34e5f4f198ddd36a82dc12164de7fc4f5430e09d.tar.gz blackbird-op-linux-34e5f4f198ddd36a82dc12164de7fc4f5430e09d.zip |
Merge branches 'debug' and 'idle' into for-armsoc
Diffstat (limited to 'arch/arm/mach-highbank/include/mach/system.h')
-rw-r--r-- | arch/arm/mach-highbank/include/mach/system.h | 24 |
1 files changed, 0 insertions, 24 deletions
diff --git a/arch/arm/mach-highbank/include/mach/system.h b/arch/arm/mach-highbank/include/mach/system.h deleted file mode 100644 index b1d8b5fbe373..000000000000 --- a/arch/arm/mach-highbank/include/mach/system.h +++ /dev/null @@ -1,24 +0,0 @@ -/* - * Copyright 2010-2011 Calxeda, Inc. - * - * This program is free software; you can redistribute it and/or modify it - * under the terms and conditions of the GNU General Public License, - * version 2, as published by the Free Software Foundation. - * - * This program is distributed in the hope it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for - * more details. - * - * You should have received a copy of the GNU General Public License along with - * this program. If not, see <http://www.gnu.org/licenses/>. - */ -#ifndef __MACH_SYSTEM_H -#define __MACH_SYSTEM_H - -static inline void arch_idle(void) -{ - cpu_do_idle(); -} - -#endif |