Merge master.kernel.org:/pub/scm/linux/kernel/git/lenb/to-linus

[linux-2.6] / include / asm-ppc / prom.h

diff --git a/include/asm-ppc/prom.h b/include/asm-ppc/prom.h
index 56394c6cf52e3be20d899b92f73d9d43d98a8434..75c0637acdc8ad2e7615be70f3819b71905befb2 100644 (file)
--- a/include/asm-ppc/prom.h
+++ b/include/asm-ppc/prom.h
@@ -14,9 +14,6 @@
 typedef u32 phandle;
 typedef u32 ihandle;
 
-extern char *prom_display_paths[];
-extern unsigned int prom_num_displays;
-
 struct address_range {
        unsigned int space;
        unsigned int address;