summaryrefslogtreecommitdiffstats
path: root/include/asm-cris/arch-v32/page.h
diff options
context:
space:
mode:
authorJeff Garzik <jeff@garzik.org>2006-06-22 22:51:46 -0400
committerJeff Garzik <jeff@garzik.org>2006-06-22 22:51:46 -0400
commitdbe1ab9514c231c9b062140a107d9dea0eabefcc (patch)
tree0001c7143cf923fc704215f0a0e54221e9e5cbb9 /include/asm-cris/arch-v32/page.h
parent612eff0e3715a6faff5ba1b74873b99e036c59fe (diff)
parentd588fcbe5a7ba8bba2cebf7799ab2d573717a806 (diff)
downloadkernel-crypto-dbe1ab9514c231c9b062140a107d9dea0eabefcc.tar.gz
kernel-crypto-dbe1ab9514c231c9b062140a107d9dea0eabefcc.tar.xz
kernel-crypto-dbe1ab9514c231c9b062140a107d9dea0eabefcc.zip
Merge branch 'master' into upstream
Diffstat (limited to 'include/asm-cris/arch-v32/page.h')
-rw-r--r--include/asm-cris/arch-v32/page.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/include/asm-cris/arch-v32/page.h b/include/asm-cris/arch-v32/page.h
index 77827bc17cc..fa454fe1242 100644
--- a/include/asm-cris/arch-v32/page.h
+++ b/include/asm-cris/arch-v32/page.h
@@ -1,7 +1,6 @@
#ifndef _ASM_CRIS_ARCH_PAGE_H
#define _ASM_CRIS_ARCH_PAGE_H
-#include <linux/config.h>
#ifdef __KERNEL__