summaryrefslogtreecommitdiff
path: root/arch/arm/mach-pxa/include/mach/viper.h
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2009-12-21 15:44:34 +0900
committerPaul Mundt <lethal@linux-sh.org>2009-12-21 15:44:34 +0900
commit4b4f887fb2780e39383c1f202b72f5a2780b2d4c (patch)
treee790d89c2612d2464ac00063dac677653f4ac9cb /arch/arm/mach-pxa/include/mach/viper.h
parent6424db52e24e8cdf89917fa3c10395116440160e (diff)
parent76e7461a21dfe13565b2a323b53c8cc963541126 (diff)
downloadlwn-4b4f887fb2780e39383c1f202b72f5a2780b2d4c.tar.gz
lwn-4b4f887fb2780e39383c1f202b72f5a2780b2d4c.zip
Merge branch 'master' into sh/hw-breakpoints
Diffstat (limited to 'arch/arm/mach-pxa/include/mach/viper.h')
-rw-r--r--arch/arm/mach-pxa/include/mach/viper.h2
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm/mach-pxa/include/mach/viper.h b/arch/arm/mach-pxa/include/mach/viper.h
index 10988c270ca3..5f5fbf1f6489 100644
--- a/arch/arm/mach-pxa/include/mach/viper.h
+++ b/arch/arm/mach-pxa/include/mach/viper.h
@@ -85,8 +85,6 @@
/* Interrupt and Configuration Register (VIPER_ICR) */
/* This is a write only register. Only CF_RST is used under Linux */
-extern void viper_cf_rst(int state);
-
#define VIPER_ICR_RETRIG (1 << 0)
#define VIPER_ICR_AUTO_CLR (1 << 1)
#define VIPER_ICR_R_DIS (1 << 2)