Merge nuts.ninka.net:/home/davem/src/BK/sparcwork-2.5

into nuts.ninka.net:/home/davem/src/BK/sparc-2.5

arch/sparc64/kernel/ebus.c

@@ -12,6 +12,7 @@
 #include <linux/init.h>
 #include <linux/slab.h>
 #include <linux/string.h>
+#include <linux/interrupt.h>
 
 #include <asm/system.h>
 #include <asm/page.h>

arch/sparc64/kernel/pci.c

@@ -461,7 +461,7 @@ int pci_assign_resource(struct pci_dev *pdev, int resource)
 
 	if (err < 0) {
 		printk("PCI: Failed to allocate resource %d for %s\n",
-		       resource, pdev->name);
+		       resource, pdev->dev.name);
 	} else {
 		/* Update PCI config space. */
 		pbm->parent->base_address_update(pdev, resource);

arch/sparc64/kernel/pci_common.c

@@ -404,7 +404,7 @@ static void __init pdev_record_assignments(struct pci_pbm_info *pbm,
 			if ((res->start >> 32) != 0UL) {
 				printk(KERN_ERR "PCI: OBP assigns out of range MEM address "
 				       "%016lx for region %ld on device %s\n",
-				       res->start, (res - &pdev->resource[0]), pdev->name);
+				       res->start, (res - &pdev->resource[0]), pdev->dev.name);
 				continue;
 			}
 		}
@@ -426,7 +426,7 @@ static void __init pdev_record_assignments(struct pci_pbm_info *pbm,
 				       "[%016lx:%016lx] of device %s\n",
 				       (res - &pdev->resource[0]),
 				       res->start, res->end,
-				       pdev->name);
+				       pdev->dev.name);
 			}
 		}
 	}
@@ -503,7 +503,7 @@ static void __init pdev_assign_unassigned(struct pci_pbm_info *pbm,
 		if (allocate_resource(root, res, size + 1, min, max, align, NULL, NULL) < 0) {
 			/* uh oh */
 			prom_printf("PCI: Failed to allocate resource %d for %s\n",
-				    i, pdev->name);
+				    i, pdev->dev.name);
 			prom_halt();
 		}
 
@@ -1005,7 +1005,7 @@ void pci_scan_for_target_abort(struct pci_controller_info *p,
 			pci_write_config_word(pdev, PCI_STATUS, error_bits);
 			printk("PCI%d(PBM%c): Device [%s] saw Target Abort [%016x]\n",
 			       p->index, ((pbm == &p->pbm_A) ? 'A' : 'B'),
-			       pdev->name, status);
+			       pdev->dev.name, status);
 		}
 	}
 
@@ -1031,7 +1031,7 @@ void pci_scan_for_master_abort(struct pci_controller_info *p,
 			pci_write_config_word(pdev, PCI_STATUS, error_bits);
 			printk("PCI%d(PBM%c): Device [%s] received Master Abort [%016x]\n",
 			       p->index, ((pbm == &p->pbm_A) ? 'A' : 'B'),
-			       pdev->name, status);
+			       pdev->dev.name, status);
 		}
 	}
 
@@ -1058,7 +1058,7 @@ void pci_scan_for_parity_error(struct pci_controller_info *p,
 			pci_write_config_word(pdev, PCI_STATUS, error_bits);
 			printk("PCI%d(PBM%c): Device [%s] saw Parity Error [%016x]\n",
 			       p->index, ((pbm == &p->pbm_A) ? 'A' : 'B'),
-			       pdev->name, status);
+			       pdev->dev.name, status);
 		}
 	}
 

arch/sparc64/kernel/pci_psycho.c

@@ -11,6 +11,7 @@
 #include <linux/pci.h>
 #include <linux/init.h>
 #include <linux/slab.h>
+#include <linux/interrupt.h>
 
 #include <asm/pbm.h>
 #include <asm/iommu.h>

arch/sparc64/kernel/pci_sabre.c

@@ -11,6 +11,7 @@
 #include <linux/pci.h>
 #include <linux/init.h>
 #include <linux/slab.h>
+#include <linux/interrupt.h>
 
 #include <asm/apb.h>
 #include <asm/pbm.h>

arch/sparc64/kernel/pci_schizo.c

@@ -9,6 +9,7 @@
 #include <linux/pci.h>
 #include <linux/init.h>
 #include <linux/slab.h>
+#include <linux/interrupt.h>
 
 #include <asm/pbm.h>
 #include <asm/iommu.h>

arch/sparc64/kernel/power.c

@@ -10,6 +10,7 @@
 #include <linux/sched.h>
 #include <linux/signal.h>
 #include <linux/delay.h>
+#include <linux/interrupt.h>
 
 #include <asm/system.h>
 #include <asm/ebus.h>

arch/sparc64/kernel/sbus.c

@@ -10,6 +10,7 @@
 #include <linux/spinlock.h>
 #include <linux/slab.h>
 #include <linux/init.h>
+#include <linux/interrupt.h>
 
 #include <asm/page.h>
 #include <asm/sbus.h>

arch/sparc64/kernel/sys_sunos32.c

@@ -52,6 +52,9 @@
 #include <linux/time.h>
 #include <linux/personality.h>
 
+/* For SOCKET_I */
+#include <net/sock.h>
+
 /* Use this to get at 32-bit user passed pointers. */
 #define A(__x)				\
 ({	unsigned long __ret;		\

arch/sparc64/solaris/fs.c

@@ -19,6 +19,7 @@
 #include <linux/limits.h>
 #include <linux/resource.h>
 #include <linux/quotaops.h>
+#include <linux/mount.h>
 
 #include <asm/uaccess.h>
 #include <asm/string.h>

arch/sparc64/solaris/ioctl.c

@@ -24,6 +24,8 @@
 #include <linux/mtio.h>
 #include <linux/time.h>
 
+#include <net/sock.h>
+
 #include <asm/uaccess.h>
 #include <asm/termios.h>
 #include <asm/openpromio.h>

arch/sparc64/solaris/socket.c

@@ -13,6 +13,7 @@
 #include <linux/slab.h>
 #include <linux/socket.h>
 #include <linux/file.h>
+#include <linux/net.h>
 
 #include <asm/uaccess.h>
 #include <asm/string.h>

arch/sparc64/solaris/socksys.c

@@ -27,6 +27,8 @@
 #include <linux/in.h>
 #include <linux/devfs_fs_kernel.h>
 
+#include <net/sock.h>
+
 #include <asm/uaccess.h>
 #include <asm/termios.h>