summaryrefslogtreecommitdiffstats
path: root/arch/sh/include/asm/percpu.h
diff options
context:
space:
mode:
authorJens Axboe <axboe@kernel.dk>2012-07-30 09:03:10 +0200
committerJens Axboe <axboe@kernel.dk>2012-07-30 09:03:10 +0200
commit72ea1f74fcdf874cca6d2c0962379523bbd99e2c (patch)
tree4c67be6c73356086ff44ef1b8b1c9479702689ca /arch/sh/include/asm/percpu.h
parentMerge branch 'upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/jiko... (diff)
parentdrbd: announce FLUSH/FUA capability to upper layers (diff)
downloadlinux-72ea1f74fcdf874cca6d2c0962379523bbd99e2c.tar.xz
linux-72ea1f74fcdf874cca6d2c0962379523bbd99e2c.zip
Merge branch 'for-jens' of git://git.drbd.org/linux-drbd into for-3.6/drivers
Diffstat (limited to 'arch/sh/include/asm/percpu.h')
-rw-r--r--arch/sh/include/asm/percpu.h6
1 files changed, 0 insertions, 6 deletions
diff --git a/arch/sh/include/asm/percpu.h b/arch/sh/include/asm/percpu.h
deleted file mode 100644
index 4db4b39a4399..000000000000
--- a/arch/sh/include/asm/percpu.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef __ARCH_SH_PERCPU
-#define __ARCH_SH_PERCPU
-
-#include <asm-generic/percpu.h>
-
-#endif /* __ARCH_SH_PERCPU */