summaryrefslogtreecommitdiffstats
path: root/include/asm-ppc/io.h
diff options
context:
space:
mode:
Diffstat (limited to 'include/asm-ppc/io.h')
-rw-r--r--include/asm-ppc/io.h21
1 files changed, 7 insertions, 14 deletions
diff --git a/include/asm-ppc/io.h b/include/asm-ppc/io.h
index 03f9db09a..602363511 100644
--- a/include/asm-ppc/io.h
+++ b/include/asm-ppc/io.h
@@ -222,20 +222,6 @@ extern inline void * bus_to_virt(unsigned long address)
}
/*
- * 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.
*/
@@ -364,6 +350,13 @@ 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 */
#define dma_cache_inv(_start,_size) do { } while (0)