Merge nuts.ninka.net:/disk1/davem/BK/sparcwork-2.6

into nuts.ninka.net:/disk1/davem/BK/sparc-2.6

arch/sparc64/kernel/pci_common.c

@@ -303,14 +303,23 @@ __init get_device_resource(struct linux_prom_pci_registers *ap,
 {
 	struct resource *res;
 	int breg = (ap->phys_hi & 0xff);
-	int space = (ap->phys_hi >> 24) & 3;
 
 	switch (breg) {
 	case  PCI_ROM_ADDRESS:
+		/* Unfortunately I have seen several cases where
+		 * buggy FCODE uses a space value of '1' (I/O space)
+		 * in the register property for the ROM address
+		 * so disable this sanity check for now.
+		 */
+#if 0
+	{
+		int space = (ap->phys_hi >> 24) & 3;
+
 		/* It had better be MEM space. */
 		if (space != 2)
 			bad_assignment(pdev, ap, NULL, 0);
-
+	}
+#endif
 		res = &pdev->resource[PCI_ROM_RESOURCE];
 		break;
 

include/asm-sparc/elf.h

@@ -8,8 +8,11 @@
 
 #include <linux/config.h>
 #include <asm/ptrace.h>
+
+#ifdef __KERNEL__
 #include <asm/mbus.h>
 #include <asm/uaccess.h>
+#endif
 
 /*
  * Sparc section types