diff options
author | Alexander Schulz <alex@shark-linux.de> | 2009-01-08 12:05:58 -0500 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-02-19 06:30:20 -0500 |
commit | eab184c2362567f2b2e951b7bd0e0d353a7e5091 (patch) | |
tree | f03f859d1f038b1c0b358c35fb842fc2f50f41d7 /arch/arm/mach-shark/include/mach/system.h | |
parent | 60f793de891ea06fa870546336a88df543ec56ae (diff) |
[ARM] 5363/1: Shark cleanup and new defconfig
This includes a new defconfig for the Shark and some changes to
the mach-shark directory to avoid namespace pollution and to
switch the rtc to the newer driver.
Signed-off-by: Alexander Schulz <alex@shark-linux.de>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mach-shark/include/mach/system.h')
-rw-r--r-- | arch/arm/mach-shark/include/mach/system.h | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/arch/arm/mach-shark/include/mach/system.h b/arch/arm/mach-shark/include/mach/system.h index e45bd734a03e..0752ca29971a 100644 --- a/arch/arm/mach-shark/include/mach/system.h +++ b/arch/arm/mach-shark/include/mach/system.h | |||
@@ -6,20 +6,8 @@ | |||
6 | #ifndef __ASM_ARCH_SYSTEM_H | 6 | #ifndef __ASM_ARCH_SYSTEM_H |
7 | #define __ASM_ARCH_SYSTEM_H | 7 | #define __ASM_ARCH_SYSTEM_H |
8 | 8 | ||
9 | #include <linux/io.h> | 9 | /* Found in arch/mach-shark/core.c */ |
10 | 10 | extern void arch_reset(char mode); | |
11 | static void arch_reset(char mode) | ||
12 | { | ||
13 | short temp; | ||
14 | local_irq_disable(); | ||
15 | /* Reset the Machine via pc[3] of the sequoia chipset */ | ||
16 | outw(0x09,0x24); | ||
17 | temp=inw(0x26); | ||
18 | temp = temp | (1<<3) | (1<<10); | ||
19 | outw(0x09,0x24); | ||
20 | outw(temp,0x26); | ||
21 | |||
22 | } | ||
23 | 11 | ||
24 | static inline void arch_idle(void) | 12 | static inline void arch_idle(void) |
25 | { | 13 | { |