Merge master.kernel.org:/home/acme/BK/includes-2.5

into home.transmeta.com:/home/torvalds/v2.5/linux

include/linux/ncp_fs_sb.h

@@ -18,6 +18,8 @@
 
 #define NCP_DEFAULT_OPTIONS 0		/* 2 for packet signatures */
 
+struct sock;
+
 struct ncp_server {
 
 	struct ncp_mount_data_kernel m;	/* Nearly all of the mount data is of

sound/drivers/mtpav.c

@@ -51,8 +51,8 @@
  */
 
 #include <sound/driver.h>
-#include <asm/io.h>
 #include <linux/init.h>
+#include <linux/interrupt.h>
 #include <linux/slab.h>
 #include <linux/ioport.h>
 #include <sound/core.h>
@@ -61,6 +61,8 @@
 #include <sound/rawmidi.h>
 #include <linux/delay.h>
 
+#include <asm/io.h>
+
 /*
  *      globals
  */