[PATCH] powerpc: Move LMB_ALLOC_ANYWHERE out of lmb.h

[linux-2.6-omap-h63xx.git] / include / asm-powerpc / lmb.h

diff --git a/include/asm-powerpc/lmb.h b/include/asm-powerpc/lmb.h
index ea0afe34354551a998adc2e3ae85ed1a25031ea2..fbb7bde8fb0bc63406dd75a573ab484114fce50e 100644 (file)
--- a/include/asm-powerpc/lmb.h
+++ b/include/asm-powerpc/lmb.h
@@ -1,5 +1,6 @@
 #ifndef _PPC64_LMB_H
 #define _PPC64_LMB_H
+#ifdef __KERNEL__
 
 /*
  * Definitions for talking to the Open Firmware PROM on
@@ -18,8 +19,6 @@
 
 #define MAX_LMB_REGIONS 128
 
-#define LMB_ALLOC_ANYWHERE     0
-
 struct lmb_property {
        unsigned long base;
        unsigned long size;
@@ -47,6 +46,8 @@ extern long __init lmb_reserve(unsigned long, unsigned long);
 extern unsigned long __init lmb_alloc(unsigned long, unsigned long);
 extern unsigned long __init lmb_alloc_base(unsigned long, unsigned long,
                                           unsigned long);
+extern unsigned long __init __lmb_alloc_base(unsigned long, unsigned long,
+                                          unsigned long);
 extern unsigned long __init lmb_phys_mem_size(void);
 extern unsigned long __init lmb_end_of_DRAM(void);
 extern unsigned long __init lmb_abs_to_phys(unsigned long);
@@ -78,4 +79,5 @@ lmb_end_pfn(struct lmb_region *type, unsigned long region_nr)
               lmb_size_pages(type, region_nr);
 }
 
+#endif /* __KERNEL__ */
 #endif /* _PPC64_LMB_H */