summaryrefslogtreecommitdiff
path: root/arch/powerpc/include/asm/system.h
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2011-07-28 19:25:46 +0400
committerArnd Bergmann <arnd@arndb.de>2011-07-28 19:25:46 +0400
commit6124a4e430b64d1577438c8648c59e996d02e73e (patch)
tree49cfafad785d1c9e403a5b0d755298b9af2c260f /arch/powerpc/include/asm/system.h
parent8e267f3da5f117d2f1316cf6ddf740f93f1c73aa (diff)
parent580975d7f48d7d047e22bb0f42adf7557801d8d4 (diff)
downloadlinux-6124a4e430b64d1577438c8648c59e996d02e73e.tar.xz
Merge branch 'imx/dt' into next/dt
Diffstat (limited to 'arch/powerpc/include/asm/system.h')
-rw-r--r--arch/powerpc/include/asm/system.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/powerpc/include/asm/system.h b/arch/powerpc/include/asm/system.h
index 2dc595dda03b..e30a13d1ee76 100644
--- a/arch/powerpc/include/asm/system.h
+++ b/arch/powerpc/include/asm/system.h
@@ -120,7 +120,6 @@ extern void do_dabr(struct pt_regs *regs, unsigned long address,
unsigned long error_code);
#endif
extern void print_backtrace(unsigned long *);
-extern void show_regs(struct pt_regs * regs);
extern void flush_instruction_cache(void);
extern void hard_reset_now(void);
extern void poweroff_now(void);