diff options
author | James Morris <jmorris@namei.org> | 2009-06-30 01:10:35 +0200 |
---|---|---|
committer | James Morris <jmorris@namei.org> | 2009-06-30 01:10:35 +0200 |
commit | ac7242142b03421c96b0a2f8d99f146d075614c2 (patch) | |
tree | b0b2ead65858c7a343d38affed86fe815e37e7e9 /arch/blackfin/include/asm/pgalloc.h | |
parent | selinux: clean up avc node cache when disabling selinux (diff) | |
parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiw... (diff) | |
download | linux-ac7242142b03421c96b0a2f8d99f146d075614c2.tar.xz linux-ac7242142b03421c96b0a2f8d99f146d075614c2.zip |
Merge branch 'master' into next
Diffstat (limited to 'arch/blackfin/include/asm/pgalloc.h')
-rw-r--r-- | arch/blackfin/include/asm/pgalloc.h | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/arch/blackfin/include/asm/pgalloc.h b/arch/blackfin/include/asm/pgalloc.h index c686e0542fd0..f261cb7dda06 100644 --- a/arch/blackfin/include/asm/pgalloc.h +++ b/arch/blackfin/include/asm/pgalloc.h @@ -1,8 +1 @@ -#ifndef _BLACKFIN_PGALLOC_H -#define _BLACKFIN_PGALLOC_H - -#include <asm/setup.h> - -#define check_pgt_cache() do { } while (0) - -#endif /* _BLACKFIN_PGALLOC_H */ +#include <asm-generic/pgalloc.h> |