diff options
| author | Anton Altaparmakov <aia21@cantab.net> | 2005-10-31 10:06:46 +0000 |
|---|---|---|
| committer | Anton Altaparmakov <aia21@cantab.net> | 2005-10-31 10:06:46 +0000 |
| commit | 1f04c0a24b2f3cfe89c802a24396263623e3512d (patch) | |
| tree | d7e2216b6e65b833c0c2b79b478d13ce17dbf296 /include/asm-ppc64/page.h | |
| parent | 07b188ab773e183871e57b33ae37bf635c9f12ba (diff) | |
| parent | e2f2e58e7968f8446b1078a20a18bf8ea12b4fbc (diff) | |
| download | kernel_samsung_smdk4412-1f04c0a24b2f3cfe89c802a24396263623e3512d.zip kernel_samsung_smdk4412-1f04c0a24b2f3cfe89c802a24396263623e3512d.tar.gz kernel_samsung_smdk4412-1f04c0a24b2f3cfe89c802a24396263623e3512d.tar.bz2 | |
Merge branch 'master' of /usr/src/ntfs-2.6/
Diffstat (limited to 'include/asm-ppc64/page.h')
| -rw-r--r-- | include/asm-ppc64/page.h | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/include/asm-ppc64/page.h b/include/asm-ppc64/page.h index a15422b..d404431 100644 --- a/include/asm-ppc64/page.h +++ b/include/asm-ppc64/page.h @@ -11,13 +11,7 @@ */ #include <linux/config.h> - -#ifdef __ASSEMBLY__ - #define ASM_CONST(x) x -#else - #define __ASM_CONST(x) x##UL - #define ASM_CONST(x) __ASM_CONST(x) -#endif +#include <asm/ppc_asm.h> /* for ASM_CONST */ /* PAGE_SHIFT determines the page size */ #define PAGE_SHIFT 12 |