summaryrefslogtreecommitdiffstats
path: root/include/asm-ppc64/emergency-restart.h
diff options
context:
space:
mode:
authorSteve French <sfrench@us.ibm.com>2005-08-30 20:33:26 +0200
committerSteve French <sfrench@us.ibm.com>2005-08-30 20:33:26 +0200
commit2016ef789a9ded2e169ad1c028ae3deb5302571f (patch)
tree601359f15b42d4d9868b4eadfe909a7bef6435c5 /include/asm-ppc64/emergency-restart.h
parent[CIFS] Remove cifs_sb argument from *build_path_from_dentry (diff)
parentMerge refs/heads/upstream from master.kernel.org:/pub/scm/linux/kernel/git/jg... (diff)
downloadlinux-2016ef789a9ded2e169ad1c028ae3deb5302571f.tar.xz
linux-2016ef789a9ded2e169ad1c028ae3deb5302571f.zip
Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'include/asm-ppc64/emergency-restart.h')
-rw-r--r--include/asm-ppc64/emergency-restart.h6
1 files changed, 0 insertions, 6 deletions
diff --git a/include/asm-ppc64/emergency-restart.h b/include/asm-ppc64/emergency-restart.h
deleted file mode 100644
index 108d8c48e42e..000000000000
--- a/include/asm-ppc64/emergency-restart.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _ASM_EMERGENCY_RESTART_H
-#define _ASM_EMERGENCY_RESTART_H
-
-#include <asm-generic/emergency-restart.h>
-
-#endif /* _ASM_EMERGENCY_RESTART_H */