aboutsummaryrefslogtreecommitdiffstats
path: root/arch/m68knommu/include/asm/percpu.h
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2009-01-26 17:43:16 -0800
committerDavid S. Miller <davem@davemloft.net>2009-01-26 17:43:16 -0800
commit3eacdf58c2c0b9507afedfc19108e98b992c31e4 (patch)
treed95e7e022ff6e6181edce43fe97cf2883b5a91ed /arch/m68knommu/include/asm/percpu.h
parentdd0a251c8e087bca05e8f9a3657078591ae6e12b (diff)
parent5376071069ec8a7e6a8112beab16fc24f5139475 (diff)
downloadkernel_samsung_smdk4412-3eacdf58c2c0b9507afedfc19108e98b992c31e4.tar.gz
kernel_samsung_smdk4412-3eacdf58c2c0b9507afedfc19108e98b992c31e4.tar.bz2
kernel_samsung_smdk4412-3eacdf58c2c0b9507afedfc19108e98b992c31e4.zip
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'arch/m68knommu/include/asm/percpu.h')
-rw-r--r--arch/m68knommu/include/asm/percpu.h6
1 files changed, 0 insertions, 6 deletions
diff --git a/arch/m68knommu/include/asm/percpu.h b/arch/m68knommu/include/asm/percpu.h
deleted file mode 100644
index 5de72c327ef..00000000000
--- a/arch/m68knommu/include/asm/percpu.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef __ARCH_M68KNOMMU_PERCPU__
-#define __ARCH_M68KNOMMU_PERCPU__
-
-#include <asm-generic/percpu.h>
-
-#endif /* __ARCH_M68KNOMMU_PERCPU__ */