patch-2.4.1 linux/include/asm-ppc/io.h

• Lines: 35
• Date: Mon Jan 22 15:41:15 2001
• Orig file: v2.4.0/linux/include/asm-ppc/io.h
• Orig date: Sat Nov 11 18:23:10 2000

diff -u --recursive --new-file v2.4.0/linux/include/asm-ppc/io.h linux/include/asm-ppc/io.h
@@ -222,20 +222,6 @@
 }
 
 /*
- * The PCI bus bridge can translate addresses issued by the processor(s)
- * into a different address on the PCI bus.  On 32-bit cpus, we assume
- * this mapping is 1-1, but on 64-bit systems it often isn't.
- */
-#ifndef CONFIG_PPC64BRIDGE
-#define phys_to_bus(x)	(x)
-#define bus_to_phys(x)	(x)
-
-#else
-extern unsigned long phys_to_bus(unsigned long pa);
-extern unsigned long bus_to_phys(unsigned int ba, int busnr);
-#endif /* CONFIG_PPC64BRIDGE */
-
-/*
  * Change virtual addresses to physical addresses and vv, for
  * addresses in the area where the kernel has the RAM mapped.
  */
@@ -362,6 +348,13 @@
 	retval = 1;
 out:
 	return retval;
+}
+
+/* Make some pcmcia drivers happy */
+static inline int isa_check_signature(unsigned long io_addr,
+	const unsigned char *signature, int length)
+{
+	return 0;
 }
 
 /* Nothing to do */