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
Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff
[linux-2.6.git]
/
arch
/
mips
/
jazz
/
setup.c
diff --git
a/arch/mips/jazz/setup.c
b/arch/mips/jazz/setup.c
index
fccb06f
..
4036dc4
100644
(file)
--- a/
arch/mips/jazz/setup.c
+++ b/
arch/mips/jazz/setup.c
@@
-19,6
+19,8
@@
#include <linux/console.h>
#include <linux/fb.h>
#include <linux/ide.h>
#include <linux/console.h>
#include <linux/fb.h>
#include <linux/ide.h>
+#include <linux/pm.h>
+
#include <asm/bootinfo.h>
#include <asm/irq.h>
#include <asm/jazz.h>
#include <asm/bootinfo.h>
#include <asm/irq.h>
#include <asm/jazz.h>
@@
-50,7
+52,7
@@
static struct resource jazz_io_resources[] = {
{ "dma2", 0xc0, 0xdf, IORESOURCE_BUSY },
};
{ "dma2", 0xc0, 0xdf, IORESOURCE_BUSY },
};
-
static void __init jazz
_setup(void)
+
void __init plat
_setup(void)
{
int i;
{
int i;
@@
-79,7
+81,7
@@
static void __init jazz_setup(void)
_machine_restart = jazz_machine_restart;
_machine_halt = jazz_machine_halt;
_machine_restart = jazz_machine_restart;
_machine_halt = jazz_machine_halt;
-
_machine
_power_off = jazz_machine_power_off;
+
pm
_power_off = jazz_machine_power_off;
#warning "Somebody should check if screen_info is ok for Jazz."
#warning "Somebody should check if screen_info is ok for Jazz."
@@
-97,5
+99,3
@@
static void __init jazz_setup(void)
vdma_init();
}
vdma_init();
}
-
-early_initcall(jazz_setup);