patch-2.4.25 linux-2.4.25/arch/ppc/boot/prep/vreset.c
Next file: linux-2.4.25/arch/ppc/boot/simple/Makefile
Previous file: linux-2.4.25/arch/ppc/boot/prep/of1275.h
Back to the patch index
Back to the overall index
- Lines: 32
- Date:
2004-02-18 05:36:30.000000000 -0800
- Orig file:
linux-2.4.24/arch/ppc/boot/prep/vreset.c
- Orig date:
2003-06-13 07:51:31.000000000 -0700
diff -urN linux-2.4.24/arch/ppc/boot/prep/vreset.c linux-2.4.25/arch/ppc/boot/prep/vreset.c
@@ -389,7 +389,7 @@
extern void puts(const char *);
static void unlockS3(void);
-static void inline
+static inline void
outw(int port, unsigned short val)
{
outb(port, val >> 8);
@@ -691,14 +691,14 @@
unsigned long regs[NPCIREGS];
} PCI_slots [NSLOTS] = {
- { (unsigned long *)0x80808000, 0xDEADBEEF }, /* onboard */
- { (unsigned long *)0x80800800, 0xDEADBEEF }, /* onboard */
- { (unsigned long *)0x80801000, 0xDEADBEEF }, /* onboard */
- { (unsigned long *)0x80802000, 0xDEADBEEF }, /* onboard */
- { (unsigned long *)0x80804000, 0xDEADBEEF }, /* onboard */
- { (unsigned long *)0x80810000, 0xDEADBEEF }, /* slot A/1 */
- { (unsigned long *)0x80820000, 0xDEADBEEF }, /* slot B/2 */
- { (unsigned long *)0x80840000, 0xDEADBEEF } /* slot C/3 */
+ { (unsigned long *)0x80808000, {0xDEADBEEF,} }, /* onboard */
+ { (unsigned long *)0x80800800, {0xDEADBEEF,} }, /* onboard */
+ { (unsigned long *)0x80801000, {0xDEADBEEF,} }, /* onboard */
+ { (unsigned long *)0x80802000, {0xDEADBEEF,} }, /* onboard */
+ { (unsigned long *)0x80804000, {0xDEADBEEF,} }, /* onboard */
+ { (unsigned long *)0x80810000, {0xDEADBEEF,} }, /* slot A/1 */
+ { (unsigned long *)0x80820000, {0xDEADBEEF,} }, /* slot B/2 */
+ { (unsigned long *)0x80840000, {0xDEADBEEF,} } /* slot C/3 */
};
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)