summaryrefslogtreecommitdiff
path: root/arch/sparc/include/asm/memblock.h
diff options
context:
space:
mode:
authorDave Airlie <airlied@redhat.com>2010-08-02 10:05:18 +1000
committerDave Airlie <airlied@redhat.com>2010-08-02 10:05:24 +1000
commitd656ae53f64cb0f01dac8a02c4d31453d64ef97c (patch)
treecf641d4e5828b8f7c430b42657237c5daf9571fd /arch/sparc/include/asm/memblock.h
parent167ffc44caaee68ea60dadf6931a4d195a4ed1f0 (diff)
parentb37fa16e78d6f9790462b3181602a26b5af36260 (diff)
Merge tag 'v2.6.35-rc6' into drm-radeon-next
Need this to avoid conflicts with future radeon fixes
Diffstat (limited to 'arch/sparc/include/asm/memblock.h')
-rw-r--r--arch/sparc/include/asm/memblock.h10
1 files changed, 10 insertions, 0 deletions
diff --git a/arch/sparc/include/asm/memblock.h b/arch/sparc/include/asm/memblock.h
new file mode 100644
index 0000000000000..f12af880649bc
--- /dev/null
+++ b/arch/sparc/include/asm/memblock.h
@@ -0,0 +1,10 @@
+#ifndef _SPARC64_MEMBLOCK_H
+#define _SPARC64_MEMBLOCK_H
+
+#include <asm/oplib.h>
+
+#define MEMBLOCK_DBG(fmt...) prom_printf(fmt)
+
+#define MEMBLOCK_REAL_LIMIT 0
+
+#endif /* !(_SPARC64_MEMBLOCK_H) */