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
/
sni
/
setup.c
diff --git
a/arch/mips/sni/setup.c
b/arch/mips/sni/setup.c
index
8f67cee
..
01ba6c5
100644
(file)
--- a/
arch/mips/sni/setup.c
+++ b/
arch/mips/sni/setup.c
@@
-5,7
+5,7
@@
* License. See the file "COPYING" in the main directory of this archive
* for more details.
*
* License. See the file "COPYING" in the main directory of this archive
* for more details.
*
- * Copyright (C) 1996, 97, 98, 2000, 03, 04 Ralf Baechle (ralf@linux-mips.org)
+ * Copyright (C) 1996, 97, 98, 2000, 03, 04
, 06
Ralf Baechle (ralf@linux-mips.org)
*/
#include <linux/config.h>
#include <linux/eisa.h>
*/
#include <linux/config.h>
#include <linux/eisa.h>
@@
-15,6
+15,7
@@
#include <linux/init.h>
#include <linux/interrupt.h>
#include <linux/mc146818rtc.h>
#include <linux/init.h>
#include <linux/interrupt.h>
#include <linux/mc146818rtc.h>
+#include <linux/pm.h>
#include <linux/pci.h>
#include <linux/console.h>
#include <linux/fb.h>
#include <linux/pci.h>
#include <linux/console.h>
#include <linux/fb.h>
@@
-111,7
+112,7
@@
static struct resource sni_mem_resource = {
* The RM200/RM300 has a few holes in it's PCI/EISA memory address space used
* for other purposes. Be paranoid and allocate all of the before the PCI
* code gets a chance to to map anything else there ...
* The RM200/RM300 has a few holes in it's PCI/EISA memory address space used
* for other purposes. Be paranoid and allocate all of the before the PCI
* code gets a chance to to map anything else there ...
- *
+ *
* This leaves the following areas available:
*
* 0x10000000 - 0x1009ffff (640kB) PCI/EISA/ISA Bus Memory
* This leaves the following areas available:
*
* 0x10000000 - 0x1009ffff (640kB) PCI/EISA/ISA Bus Memory
@@
-163,11
+164,11
@@
static struct pci_controller sni_controller = {
static inline void sni_pcimt_time_init(void)
{
static inline void sni_pcimt_time_init(void)
{
- rtc_get_time = mc146818_get_cmos_time;
- rtc_set_time = mc146818_set_rtc_mmss;
+ rtc_
mips_
get_time = mc146818_get_cmos_time;
+ rtc_
mips_
set_time = mc146818_set_rtc_mmss;
}
}
-
static int __init sni_rm200_pci
_setup(void)
+
void __init plat
_setup(void)
{
sni_pcimt_detect();
sni_pcimt_sc_init();
{
sni_pcimt_detect();
sni_pcimt_sc_init();
@@
-189,15
+190,11
@@
static int __init sni_rm200_pci_setup(void)
_machine_restart = sni_machine_restart;
_machine_halt = sni_machine_halt;
_machine_restart = sni_machine_restart;
_machine_halt = sni_machine_halt;
-
_machine
_power_off = sni_machine_power_off;
+
pm
_power_off = sni_machine_power_off;
sni_display_setup();
#ifdef CONFIG_PCI
register_pci_controller(&sni_controller);
#endif
sni_display_setup();
#ifdef CONFIG_PCI
register_pci_controller(&sni_controller);
#endif
-
- return 0;
}
}
-
-early_initcall(sni_rm200_pci_setup);