summaryrefslogtreecommitdiff
path: root/include/linux/cache.h
diff options
context:
space:
mode:
authorDave Jones <davej@halogen.(none)>2002-12-30 23:08:22 +0000
committerDave Jones <davej@halogen.(none)>2002-12-30 23:08:22 +0000
commit1f46ead556d590cbb585ecaebe8ac1871d3c6dab (patch)
tree680083ed2d1564b17306d6cfee9d2b1a3c973f29 /include/linux/cache.h
parent05ae9880250d5ffe81f9385a83b8d4e73ca5c4c0 (diff)
parent43fb68dc00a8ab0b728e27c2a8fd4033d2ba0932 (diff)
Merge halogen.(none):/home/davej/src/kernel/2.5/bk-linus
into halogen.(none):/home/davej/src/kernel/2.5/agpgart
Diffstat (limited to 'include/linux/cache.h')
-rw-r--r--include/linux/cache.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/include/linux/cache.h b/include/linux/cache.h
index 95faa6ec3aa7..3db3832f35cb 100644
--- a/include/linux/cache.h
+++ b/include/linux/cache.h
@@ -1,11 +1,10 @@
#ifndef __LINUX_CACHE_H
#define __LINUX_CACHE_H
+#include <linux/kernel.h>
#include <linux/config.h>
#include <asm/cache.h>
-#define ALIGN(x,a) (((x)+(a)-1)&~((a)-1))
-
#ifndef L1_CACHE_ALIGN
#define L1_CACHE_ALIGN(x) ALIGN(x, L1_CACHE_BYTES)
#endif