strip '<drivername>:' when parsing video_mode; parse resulution as decimal numbers

[karo-tx-uboot.git] / include / lmb.h

diff --git a/include/lmb.h b/include/lmb.h
index 02830756392aeb7f6998e5afee6dc12eeaa597da..5d1f4b624a2695b06e478dd7fcf205508d1a5cc1 100644 (file)
--- a/include/lmb.h
+++ b/include/lmb.h
@@ -1,6 +1,7 @@
 #ifndef _LINUX_LMB_H
 #define _LINUX_LMB_H
 #ifdef __KERNEL__
+#ifdef CONFIG_LMB
 
 #include <asm/types.h>
 /*
@@ -43,7 +44,7 @@ extern phys_addr_t lmb_alloc_base(struct lmb *lmb, phys_size_t size, ulong align
 extern phys_addr_t __lmb_alloc_base(struct lmb *lmb, phys_size_t size, ulong align,
                              phys_addr_t max_addr);
 extern int lmb_is_reserved(struct lmb *lmb, phys_addr_t addr);
-extern long lmb_free(struct lmb *lmb, u64 base, u64 size);
+extern long lmb_free(struct lmb *lmb, phys_addr_t base, phys_size_t size);
 
 extern void lmb_dump_all(struct lmb *lmb);
 
@@ -52,6 +53,11 @@ lmb_size_bytes(struct lmb_region *type, unsigned long region_nr)
 {
        return type->region[region_nr].size;
 }
+
+void board_lmb_reserve(struct lmb *lmb);
+void arch_lmb_reserve(struct lmb *lmb);
+
+#endif /* CONFIG_LMB */
 #endif /* __KERNEL__ */
 
 #endif /* _LINUX_LMB_H */