git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge to Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...
[linux-2.6.git]
/
arch
/
m68knommu
/
platform
/
68360
/
config.c
diff --git
a/arch/m68knommu/platform/68360/config.c
b/arch/m68knommu/platform/68360/config.c
index
3db2446
..
c5482e3
100644
(file)
--- a/
arch/m68knommu/platform/68360/config.c
+++ b/
arch/m68knommu/platform/68360/config.c
@@
-11,7
+11,6
@@
*/
#include <stdarg.h>
*/
#include <stdarg.h>
-#include <linux/config.h>
#include <linux/types.h>
#include <linux/kernel.h>
#include <linux/mm.h>
#include <linux/types.h>
#include <linux/kernel.h>
#include <linux/mm.h>
@@
-141,13
+140,13
@@
int BSP_set_clock_mmss (unsigned long nowtime)
void BSP_reset (void)
{
local_irq_disable();
void BSP_reset (void)
{
local_irq_disable();
- asm volatile (
"
- moveal #_start, %a0;
- moveb #0, 0xFFFFF300;
- moveal 0(%a0), %sp;
- moveal 4(%a0), %a0;
- jmp (%a0);
-
"
);
+ asm volatile (
+ "moveal #_start, %a0;\n"
+ "moveb #0, 0xFFFFF300;\n"
+ "moveal 0(%a0), %sp;\n"
+ "moveal 4(%a0), %a0;\n"
+ "jmp (%a0);\n"
+ );
}
unsigned char *scc1_hwaddr;
}
unsigned char *scc1_hwaddr;