diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2011-06-14 15:51:10 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-06-14 15:51:23 +0200 |
| commit | dcc854579059ff9633db4dc41c681371d22f794e (patch) | |
| tree | 985489cf3efcb1fcaa193237fb8674d530c188dd /arch/sparc/kernel/setup_64.c | |
| parent | usb: renesas_usbhs: add DMAEngine support (diff) | |
| parent | Linux 3.0-rc3 (diff) | |
| download | linux-dcc854579059ff9633db4dc41c681371d22f794e.tar.xz linux-dcc854579059ff9633db4dc41c681371d22f794e.zip | |
Merge 3.0-rc2 into usb-linus as it's needed by some USB patches
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'arch/sparc/kernel/setup_64.c')
| -rw-r--r-- | arch/sparc/kernel/setup_64.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sparc/kernel/setup_64.c b/arch/sparc/kernel/setup_64.c index f3b6850cc8db..c4dd0999da86 100644 --- a/arch/sparc/kernel/setup_64.c +++ b/arch/sparc/kernel/setup_64.c @@ -209,7 +209,7 @@ void __init per_cpu_patch(void) default: prom_printf("Unknown cpu type, halting.\n"); prom_halt(); - }; + } *(unsigned int *) (addr + 0) = insns[0]; wmb(); |