Merge tp1.ruhr-uni-bochum.de:/home/kai/kernel/v2.5/linux-2.5

into tp1.ruhr-uni-bochum.de:/home/kai/kernel/v2.5/linux-2.5.misc

arch/i386/kernel/i8259.c

@@ -243,9 +243,9 @@ static struct device device_i8259A = {
 	bus_id:		"0020",
 };
 
-static void __init init_8259A_devicefs(void)
+static int __init init_8259A_devicefs(void)
 {
-	register_sys_device(&device_i8259A);
+	return register_sys_device(&device_i8259A);
 }
 
 __initcall(init_8259A_devicefs);

arch/i386/kernel/time.c

@@ -637,13 +637,14 @@ static unsigned long __init calibrate_tsc(void)
 	return 0;
 }
 
-static struct device device_i8253;
+static struct device device_i8253 = {
+	name:	       	"i8253",
+	bus_id:		"0040",
+};
 
-static void time_init_driverfs(void)
+static int time_init_driverfs(void)
 {
-	strcpy(device_i8253.name, "i8253");
-	strcpy(device_i8253.bus_id, "0040");
-	register_sys_device(&device_i8253);
+	return register_sys_device(&device_i8253);
 }
 
 __initcall(time_init_driverfs);

drivers/pnp/pnpbios_core.c

@@ -118,7 +118,7 @@ __asm__(
 	"	pushl %ecx	\n"
 	"	pushl %ebx	\n"
 	"	pushl %eax	\n"
-	"	lcallw pnp_bios_callpoint\n"
+	"	lcallw *pnp_bios_callpoint\n"
 	"	addl $16, %esp	\n"
 	"	lret		\n"
 	".previous		\n"

include/linux/gameport.h

@@ -79,8 +79,8 @@ void gameport_rescan(struct gameport *gameport);
 void gameport_register_port(struct gameport *gameport);
 void gameport_unregister_port(struct gameport *gameport);
 #else
-void __inline__ gameport_register_port(struct gameport *gameport) { return; }
-void __inline__ gameport_unregister_port(struct gameport *gameport) { return; }
+static inline void gameport_register_port(struct gameport *gameport) { return; }
+static inline void gameport_unregister_port(struct gameport *gameport) { return; }
 #endif
 
 void gameport_register_device(struct gameport_dev *dev);