Merge branch 'devel-stable' into devel

[mv-sheeva.git] / arch / arm / mach-cns3xxx / core.h

diff --git a/arch/arm/mach-cns3xxx/core.h b/arch/arm/mach-cns3xxx/core.h
index 73898a7835d399abddfe4dad39d4f13eeb9e05d0..ffeb3a8b73bacfb1498d6cfa52ae3e1dd8d11439 100644 (file)
--- a/arch/arm/mach-cns3xxx/core.h
+++ b/arch/arm/mach-cns3xxx/core.h
@@ -11,7 +11,6 @@
 #ifndef __CNS3XXX_CORE_H
 #define __CNS3XXX_CORE_H
 
-extern void __iomem *gic_cpu_base_addr;
 extern struct sys_timer cns3xxx_timer;
 
 void __init cns3xxx_map_io(void);