summaryrefslogtreecommitdiff
path: root/include/linux
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2009-09-05 13:38:34 -0400
committerLen Brown <len.brown@intel.com>2009-09-05 13:38:34 -0400
commit8ff0e082f0833d32c7523a6cd72b6cf6a2142ce8 (patch)
tree2a0cac3d11c4dfcab87e0387d2862ff714fd8cdc /include/linux
parent8aeb0a352af7eb26863e53c203eeb852fd4590c3 (diff)
parentf61f925859c57f6175082aeeee17743c68558a6e (diff)
Merge branch 'bugzilla-13002' into release
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/lmb.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/lmb.h b/include/linux/lmb.h
index c46c89505dac..2442e3f3d033 100644
--- a/include/linux/lmb.h
+++ b/include/linux/lmb.h
@@ -51,7 +51,7 @@ extern u64 __init lmb_alloc_base(u64 size,
extern u64 __init __lmb_alloc_base(u64 size,
u64 align, u64 max_addr);
extern u64 __init lmb_phys_mem_size(void);
-extern u64 __init lmb_end_of_DRAM(void);
+extern u64 lmb_end_of_DRAM(void);
extern void __init lmb_enforce_memory_limit(u64 memory_limit);
extern int __init lmb_is_reserved(u64 addr);
extern int lmb_find(struct lmb_property *res);