summaryrefslogtreecommitdiff
path: root/include/asm-blackfin/shmparam.h
diff options
context:
space:
mode:
authorRussell King <rmk@dyn-67.arm.linux.org.uk>2008-10-10 00:31:56 +0400
committerRussell King <rmk+kernel@arm.linux.org.uk>2008-10-10 00:31:56 +0400
commit6a4690c22f5da1eb1c898b61b6a80da52fbd976f (patch)
treea03891a32abe0da191fb765fe669a597e07423c6 /include/asm-blackfin/shmparam.h
parent90bb28b0644f7324f8bd1feb27b35146e6785ba2 (diff)
parent8ec53663d2698076468b3e1edc4e1b418bd54de3 (diff)
downloadlinux-6a4690c22f5da1eb1c898b61b6a80da52fbd976f.tar.xz
Merge branch 'ptebits' into devel
Conflicts: arch/arm/Kconfig
Diffstat (limited to 'include/asm-blackfin/shmparam.h')
-rw-r--r--include/asm-blackfin/shmparam.h6
1 files changed, 0 insertions, 6 deletions
diff --git a/include/asm-blackfin/shmparam.h b/include/asm-blackfin/shmparam.h
deleted file mode 100644
index 3c03906b7664..000000000000
--- a/include/asm-blackfin/shmparam.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _BFIN_SHMPARAM_H
-#define _BFIN_SHMPARAM_H
-
-#define SHMLBA PAGE_SIZE /* attach addr a multiple of this */
-
-#endif /* _BFIN_SHMPARAM_H */