Merge branch 'viafb-next' of git://github.com/schandinat/linux-2.6

[pandora-kernel.git] / arch / arm / mach-loki / include / mach / bridge-regs.h

diff --git a/arch/arm/mach-loki/include/mach/bridge-regs.h b/arch/arm/mach-loki/include/mach/bridge-regs.h
index a3fabf7..fd87732 100644 (file)
--- a/arch/arm/mach-loki/include/mach/bridge-regs.h
+++ b/arch/arm/mach-loki/include/mach/bridge-regs.h
@@ -17,11 +17,6 @@
 #define SYSTEM_SOFT_RESET      (BRIDGE_VIRT_BASE | 0x010c)
 #define SOFT_RESET             0x00000001
 
-#define BRIDGE_CAUSE           (BRIDGE_VIRT_BASE | 0x0110)
-
-#define BRIDGE_MASK            (BRIDGE_VIRT_BASE | 0x0114)
-#define BRIDGE_INT_TIMER0      0x0002
-#define BRIDGE_INT_TIMER1      0x0004
 #define BRIDGE_INT_TIMER1_CLR  0x0004
 
 #define IRQ_VIRT_BASE          (BRIDGE_VIRT_BASE | 0x0200)