From d2d72806cceb04f9126ed1e7f7c800a1d3559954 Mon Sep 17 00:00:00 2001
From: Rob Herring <rob.herring@calxeda.com>
Date: Sat, 12 Jan 2013 10:51:59 -0600
Subject: [PATCH] --- yaml --- r: 355205 b: refs/heads/master c:
 2cb003c57e3e01d92303f4070ac9f25c9a4ed786 h: refs/heads/master i:   355203:
 23bae43f253d185846c0c558fe3166681aa4379f v: v3

---
 [refs]                                              | 2 +-
 trunk/arch/arm/mach-ep93xx/adssphere.c              | 1 -
 trunk/arch/arm/mach-ep93xx/edb93xx.c                | 1 -
 trunk/arch/arm/mach-ep93xx/gesbc9312.c              | 1 -
 trunk/arch/arm/mach-ep93xx/micro9.c                 | 1 -
 trunk/arch/arm/mach-ep93xx/simone.c                 | 1 -
 trunk/arch/arm/mach-ep93xx/snappercl15.c            | 1 -
 trunk/arch/arm/mach-ep93xx/ts72xx.c                 | 1 -
 trunk/arch/arm/mach-ep93xx/vision_ep9307.c          | 1 -
 trunk/arch/arm/mach-netx/nxdb500.c                  | 1 -
 trunk/arch/arm/mach-netx/nxdkn.c                    | 1 -
 trunk/arch/arm/mach-netx/nxeb500hmi.c               | 1 -
 trunk/arch/arm/mach-nomadik/board-nhk8815.c         | 1 -
 trunk/arch/arm/mach-s3c64xx/mach-anw6410.c          | 1 -
 trunk/arch/arm/mach-s3c64xx/mach-crag6410.c         | 1 -
 trunk/arch/arm/mach-s3c64xx/mach-hmt.c              | 1 -
 trunk/arch/arm/mach-s3c64xx/mach-mini6410.c         | 1 -
 trunk/arch/arm/mach-s3c64xx/mach-ncp.c              | 1 -
 trunk/arch/arm/mach-s3c64xx/mach-real6410.c         | 1 -
 trunk/arch/arm/mach-s3c64xx/mach-smartq5.c          | 1 -
 trunk/arch/arm/mach-s3c64xx/mach-smartq7.c          | 1 -
 trunk/arch/arm/mach-s3c64xx/mach-smdk6400.c         | 1 -
 trunk/arch/arm/mach-s3c64xx/mach-smdk6410.c         | 1 -
 trunk/arch/arm/mach-s5p64x0/include/mach/regs-irq.h | 1 -
 trunk/arch/arm/mach-s5p64x0/mach-smdk6440.c         | 1 -
 trunk/arch/arm/mach-s5p64x0/mach-smdk6450.c         | 1 -
 trunk/arch/arm/mach-s5pc100/mach-smdkc100.c         | 1 -
 trunk/arch/arm/mach-s5pv210/include/mach/regs-irq.h | 1 -
 trunk/arch/arm/mach-s5pv210/mach-aquila.c           | 1 -
 trunk/arch/arm/mach-s5pv210/mach-goni.c             | 1 -
 trunk/arch/arm/mach-s5pv210/mach-smdkc110.c         | 1 -
 trunk/arch/arm/mach-s5pv210/mach-smdkv210.c         | 1 -
 trunk/arch/arm/mach-s5pv210/mach-torbreck.c         | 1 -
 trunk/arch/arm/mach-sunxi/sunxi.c                   | 2 --
 trunk/arch/arm/mach-versatile/versatile_ab.c        | 1 -
 trunk/arch/arm/mach-versatile/versatile_dt.c        | 1 -
 trunk/arch/arm/mach-versatile/versatile_pb.c        | 1 -
 37 files changed, 1 insertion(+), 38 deletions(-)

diff --git a/[refs] b/[refs]
index e6a8b01f6514..9b6948aa2f07 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a0368029133f005251e218d98d4ca053afaafe6f
+refs/heads/master: 2cb003c57e3e01d92303f4070ac9f25c9a4ed786
diff --git a/trunk/arch/arm/mach-ep93xx/adssphere.c b/trunk/arch/arm/mach-ep93xx/adssphere.c
index 03f793ee9c8a..19332bf022bc 100644
--- a/trunk/arch/arm/mach-ep93xx/adssphere.c
+++ b/trunk/arch/arm/mach-ep93xx/adssphere.c
@@ -17,7 +17,6 @@
 
 #include <mach/hardware.h>
 
-#include <asm/hardware/vic.h>
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
 
diff --git a/trunk/arch/arm/mach-ep93xx/edb93xx.c b/trunk/arch/arm/mach-ep93xx/edb93xx.c
index 4423a1e6634a..5abf2cbe5afd 100644
--- a/trunk/arch/arm/mach-ep93xx/edb93xx.c
+++ b/trunk/arch/arm/mach-ep93xx/edb93xx.c
@@ -39,7 +39,6 @@
 #include <linux/platform_data/spi-ep93xx.h>
 #include <mach/gpio-ep93xx.h>
 
-#include <asm/hardware/vic.h>
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
 
diff --git a/trunk/arch/arm/mach-ep93xx/gesbc9312.c b/trunk/arch/arm/mach-ep93xx/gesbc9312.c
index 6df752f7d25b..2a7375be6fff 100644
--- a/trunk/arch/arm/mach-ep93xx/gesbc9312.c
+++ b/trunk/arch/arm/mach-ep93xx/gesbc9312.c
@@ -17,7 +17,6 @@
 
 #include <mach/hardware.h>
 
-#include <asm/hardware/vic.h>
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
 
diff --git a/trunk/arch/arm/mach-ep93xx/micro9.c b/trunk/arch/arm/mach-ep93xx/micro9.c
index 6a66cda6a356..723c0d36a609 100644
--- a/trunk/arch/arm/mach-ep93xx/micro9.c
+++ b/trunk/arch/arm/mach-ep93xx/micro9.c
@@ -18,7 +18,6 @@
 
 #include <mach/hardware.h>
 
-#include <asm/hardware/vic.h>
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
 
diff --git a/trunk/arch/arm/mach-ep93xx/simone.c b/trunk/arch/arm/mach-ep93xx/simone.c
index a5dba8f521e8..651a7db05120 100644
--- a/trunk/arch/arm/mach-ep93xx/simone.c
+++ b/trunk/arch/arm/mach-ep93xx/simone.c
@@ -25,7 +25,6 @@
 #include <linux/platform_data/video-ep93xx.h>
 #include <mach/gpio-ep93xx.h>
 
-#include <asm/hardware/vic.h>
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
 
diff --git a/trunk/arch/arm/mach-ep93xx/snappercl15.c b/trunk/arch/arm/mach-ep93xx/snappercl15.c
index 6be24c06701c..b4389d3820cc 100644
--- a/trunk/arch/arm/mach-ep93xx/snappercl15.c
+++ b/trunk/arch/arm/mach-ep93xx/snappercl15.c
@@ -31,7 +31,6 @@
 #include <linux/platform_data/video-ep93xx.h>
 #include <mach/gpio-ep93xx.h>
 
-#include <asm/hardware/vic.h>
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
 
diff --git a/trunk/arch/arm/mach-ep93xx/ts72xx.c b/trunk/arch/arm/mach-ep93xx/ts72xx.c
index 66703f74b145..1eeee09f421f 100644
--- a/trunk/arch/arm/mach-ep93xx/ts72xx.c
+++ b/trunk/arch/arm/mach-ep93xx/ts72xx.c
@@ -22,7 +22,6 @@
 
 #include <mach/hardware.h>
 
-#include <asm/hardware/vic.h>
 #include <asm/mach-types.h>
 #include <asm/mach/map.h>
 #include <asm/mach/arch.h>
diff --git a/trunk/arch/arm/mach-ep93xx/vision_ep9307.c b/trunk/arch/arm/mach-ep93xx/vision_ep9307.c
index 88303a21286c..723d048176db 100644
--- a/trunk/arch/arm/mach-ep93xx/vision_ep9307.c
+++ b/trunk/arch/arm/mach-ep93xx/vision_ep9307.c
@@ -34,7 +34,6 @@
 #include <linux/platform_data/spi-ep93xx.h>
 #include <mach/gpio-ep93xx.h>
 
-#include <asm/hardware/vic.h>
 #include <asm/mach-types.h>
 #include <asm/mach/map.h>
 #include <asm/mach/arch.h>
diff --git a/trunk/arch/arm/mach-netx/nxdb500.c b/trunk/arch/arm/mach-netx/nxdb500.c
index fe40c5262206..04d5e5eb6473 100644
--- a/trunk/arch/arm/mach-netx/nxdb500.c
+++ b/trunk/arch/arm/mach-netx/nxdb500.c
@@ -28,7 +28,6 @@
 #include <mach/hardware.h>
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
-#include <asm/hardware/vic.h>
 #include <mach/netx-regs.h>
 #include <linux/platform_data/eth-netx.h>
 
diff --git a/trunk/arch/arm/mach-netx/nxdkn.c b/trunk/arch/arm/mach-netx/nxdkn.c
index e09d0d425a2f..cf15bdd50f6f 100644
--- a/trunk/arch/arm/mach-netx/nxdkn.c
+++ b/trunk/arch/arm/mach-netx/nxdkn.c
@@ -28,7 +28,6 @@
 #include <mach/hardware.h>
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
-#include <asm/hardware/vic.h>
 #include <mach/netx-regs.h>
 #include <linux/platform_data/eth-netx.h>
 
diff --git a/trunk/arch/arm/mach-netx/nxeb500hmi.c b/trunk/arch/arm/mach-netx/nxeb500hmi.c
index 169172b506f5..069bd26e1b72 100644
--- a/trunk/arch/arm/mach-netx/nxeb500hmi.c
+++ b/trunk/arch/arm/mach-netx/nxeb500hmi.c
@@ -28,7 +28,6 @@
 #include <mach/hardware.h>
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
-#include <asm/hardware/vic.h>
 #include <mach/netx-regs.h>
 #include <linux/platform_data/eth-netx.h>
 
diff --git a/trunk/arch/arm/mach-nomadik/board-nhk8815.c b/trunk/arch/arm/mach-nomadik/board-nhk8815.c
index ae565e48492c..5748df0d725a 100644
--- a/trunk/arch/arm/mach-nomadik/board-nhk8815.c
+++ b/trunk/arch/arm/mach-nomadik/board-nhk8815.c
@@ -27,7 +27,6 @@
 #include <linux/pinctrl/machine.h>
 #include <linux/platform_data/pinctrl-nomadik.h>
 #include <linux/platform_data/clocksource-nomadik-mtu.h>
-#include <asm/hardware/vic.h>
 #include <asm/sizes.h>
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
diff --git a/trunk/arch/arm/mach-s3c64xx/mach-anw6410.c b/trunk/arch/arm/mach-s3c64xx/mach-anw6410.c
index 94c9e8acbb84..fa570c2e9381 100644
--- a/trunk/arch/arm/mach-s3c64xx/mach-anw6410.c
+++ b/trunk/arch/arm/mach-s3c64xx/mach-anw6410.c
@@ -31,7 +31,6 @@
 #include <video/platform_lcd.h>
 #include <video/samsung_fimd.h>
 
-#include <asm/hardware/vic.h>
 #include <asm/mach/arch.h>
 #include <asm/mach/map.h>
 #include <asm/mach/irq.h>
diff --git a/trunk/arch/arm/mach-s3c64xx/mach-crag6410.c b/trunk/arch/arm/mach-s3c64xx/mach-crag6410.c
index 713d2c6f73f5..3185f82a0c84 100644
--- a/trunk/arch/arm/mach-s3c64xx/mach-crag6410.c
+++ b/trunk/arch/arm/mach-s3c64xx/mach-crag6410.c
@@ -42,7 +42,6 @@
 
 #include <sound/wm1250-ev1.h>
 
-#include <asm/hardware/vic.h>
 #include <asm/mach/arch.h>
 #include <asm/mach-types.h>
 
diff --git a/trunk/arch/arm/mach-s3c64xx/mach-hmt.c b/trunk/arch/arm/mach-s3c64xx/mach-hmt.c
index 052c45956f6e..2c81bf15f02b 100644
--- a/trunk/arch/arm/mach-s3c64xx/mach-hmt.c
+++ b/trunk/arch/arm/mach-s3c64xx/mach-hmt.c
@@ -30,7 +30,6 @@
 #include <mach/hardware.h>
 #include <mach/map.h>
 
-#include <asm/hardware/vic.h>
 #include <asm/irq.h>
 #include <asm/mach-types.h>
 
diff --git a/trunk/arch/arm/mach-s3c64xx/mach-mini6410.c b/trunk/arch/arm/mach-s3c64xx/mach-mini6410.c
index b5635fe19e8b..3f1e0102f09c 100644
--- a/trunk/arch/arm/mach-s3c64xx/mach-mini6410.c
+++ b/trunk/arch/arm/mach-s3c64xx/mach-mini6410.c
@@ -24,7 +24,6 @@
 #include <linux/serial_core.h>
 #include <linux/types.h>
 
-#include <asm/hardware/vic.h>
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
 #include <asm/mach/map.h>
diff --git a/trunk/arch/arm/mach-s3c64xx/mach-ncp.c b/trunk/arch/arm/mach-s3c64xx/mach-ncp.c
index 08a445c3b397..73caf9fdf5f7 100644
--- a/trunk/arch/arm/mach-s3c64xx/mach-ncp.c
+++ b/trunk/arch/arm/mach-s3c64xx/mach-ncp.c
@@ -26,7 +26,6 @@
 #include <video/platform_lcd.h>
 #include <video/samsung_fimd.h>
 
-#include <asm/hardware/vic.h>
 #include <asm/mach/arch.h>
 #include <asm/mach/map.h>
 #include <asm/mach/irq.h>
diff --git a/trunk/arch/arm/mach-s3c64xx/mach-real6410.c b/trunk/arch/arm/mach-s3c64xx/mach-real6410.c
index 5980c180240d..4f8129d09ba7 100644
--- a/trunk/arch/arm/mach-s3c64xx/mach-real6410.c
+++ b/trunk/arch/arm/mach-s3c64xx/mach-real6410.c
@@ -25,7 +25,6 @@
 #include <linux/serial_core.h>
 #include <linux/types.h>
 
-#include <asm/hardware/vic.h>
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
 #include <asm/mach/map.h>
diff --git a/trunk/arch/arm/mach-s3c64xx/mach-smartq5.c b/trunk/arch/arm/mach-s3c64xx/mach-smartq5.c
index 28f3303bf357..323399b3d110 100644
--- a/trunk/arch/arm/mach-s3c64xx/mach-smartq5.c
+++ b/trunk/arch/arm/mach-s3c64xx/mach-smartq5.c
@@ -17,7 +17,6 @@
 #include <linux/leds.h>
 #include <linux/platform_device.h>
 
-#include <asm/hardware/vic.h>
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
 
diff --git a/trunk/arch/arm/mach-s3c64xx/mach-smartq7.c b/trunk/arch/arm/mach-s3c64xx/mach-smartq7.c
index 2d8a5d56afec..9077b85785ca 100644
--- a/trunk/arch/arm/mach-s3c64xx/mach-smartq7.c
+++ b/trunk/arch/arm/mach-s3c64xx/mach-smartq7.c
@@ -17,7 +17,6 @@
 #include <linux/leds.h>
 #include <linux/platform_device.h>
 
-#include <asm/hardware/vic.h>
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
 
diff --git a/trunk/arch/arm/mach-s3c64xx/mach-smdk6400.c b/trunk/arch/arm/mach-s3c64xx/mach-smdk6400.c
index 9de7c26a90f8..7df76e482b41 100644
--- a/trunk/arch/arm/mach-s3c64xx/mach-smdk6400.c
+++ b/trunk/arch/arm/mach-s3c64xx/mach-smdk6400.c
@@ -22,7 +22,6 @@
 
 #include <asm/mach-types.h>
 
-#include <asm/hardware/vic.h>
 #include <asm/mach/arch.h>
 #include <asm/mach/map.h>
 #include <asm/mach/irq.h>
diff --git a/trunk/arch/arm/mach-s3c64xx/mach-smdk6410.c b/trunk/arch/arm/mach-s3c64xx/mach-smdk6410.c
index 65fea58381ae..ad5142ab7756 100644
--- a/trunk/arch/arm/mach-s3c64xx/mach-smdk6410.c
+++ b/trunk/arch/arm/mach-s3c64xx/mach-smdk6410.c
@@ -45,7 +45,6 @@
 #include <video/platform_lcd.h>
 #include <video/samsung_fimd.h>
 
-#include <asm/hardware/vic.h>
 #include <asm/mach/arch.h>
 #include <asm/mach/map.h>
 #include <asm/mach/irq.h>
diff --git a/trunk/arch/arm/mach-s5p64x0/include/mach/regs-irq.h b/trunk/arch/arm/mach-s5p64x0/include/mach/regs-irq.h
index 4aaebdace55f..d60397d1ff40 100644
--- a/trunk/arch/arm/mach-s5p64x0/include/mach/regs-irq.h
+++ b/trunk/arch/arm/mach-s5p64x0/include/mach/regs-irq.h
@@ -13,7 +13,6 @@
 #ifndef __ASM_ARCH_REGS_IRQ_H
 #define __ASM_ARCH_REGS_IRQ_H __FILE__
 
-#include <asm/hardware/vic.h>
 #include <mach/map.h>
 
 #endif /* __ASM_ARCH_REGS_IRQ_H */
diff --git a/trunk/arch/arm/mach-s5p64x0/mach-smdk6440.c b/trunk/arch/arm/mach-s5p64x0/mach-smdk6440.c
index 7b752ac85e5c..e2419296a9e2 100644
--- a/trunk/arch/arm/mach-s5p64x0/mach-smdk6440.c
+++ b/trunk/arch/arm/mach-s5p64x0/mach-smdk6440.c
@@ -29,7 +29,6 @@
 #include <video/platform_lcd.h>
 #include <video/samsung_fimd.h>
 
-#include <asm/hardware/vic.h>
 #include <asm/mach/arch.h>
 #include <asm/mach/map.h>
 #include <asm/irq.h>
diff --git a/trunk/arch/arm/mach-s5p64x0/mach-smdk6450.c b/trunk/arch/arm/mach-s5p64x0/mach-smdk6450.c
index 97585f337ac0..999273107fa9 100644
--- a/trunk/arch/arm/mach-s5p64x0/mach-smdk6450.c
+++ b/trunk/arch/arm/mach-s5p64x0/mach-smdk6450.c
@@ -29,7 +29,6 @@
 #include <video/platform_lcd.h>
 #include <video/samsung_fimd.h>
 
-#include <asm/hardware/vic.h>
 #include <asm/mach/arch.h>
 #include <asm/mach/map.h>
 #include <asm/irq.h>
diff --git a/trunk/arch/arm/mach-s5pc100/mach-smdkc100.c b/trunk/arch/arm/mach-s5pc100/mach-smdkc100.c
index 99686debd3a2..c3f30953df21 100644
--- a/trunk/arch/arm/mach-s5pc100/mach-smdkc100.c
+++ b/trunk/arch/arm/mach-s5pc100/mach-smdkc100.c
@@ -25,7 +25,6 @@
 #include <linux/input.h>
 #include <linux/pwm_backlight.h>
 
-#include <asm/hardware/vic.h>
 #include <asm/mach/arch.h>
 #include <asm/mach/map.h>
 
diff --git a/trunk/arch/arm/mach-s5pv210/include/mach/regs-irq.h b/trunk/arch/arm/mach-s5pv210/include/mach/regs-irq.h
index 5c3b104a7c86..d8bc1e6c7aaa 100644
--- a/trunk/arch/arm/mach-s5pv210/include/mach/regs-irq.h
+++ b/trunk/arch/arm/mach-s5pv210/include/mach/regs-irq.h
@@ -13,7 +13,6 @@
 #ifndef __ASM_ARCH_REGS_IRQ_H
 #define __ASM_ARCH_REGS_IRQ_H __FILE__
 
-#include <asm/hardware/vic.h>
 #include <mach/map.h>
 
 #endif /* __ASM_ARCH_REGS_IRQ_H */
diff --git a/trunk/arch/arm/mach-s5pv210/mach-aquila.c b/trunk/arch/arm/mach-s5pv210/mach-aquila.c
index 1cba073b0a67..45eb0a8244c4 100644
--- a/trunk/arch/arm/mach-s5pv210/mach-aquila.c
+++ b/trunk/arch/arm/mach-s5pv210/mach-aquila.c
@@ -22,7 +22,6 @@
 #include <linux/input.h>
 #include <linux/gpio.h>
 
-#include <asm/hardware/vic.h>
 #include <asm/mach/arch.h>
 #include <asm/mach/map.h>
 #include <asm/setup.h>
diff --git a/trunk/arch/arm/mach-s5pv210/mach-goni.c b/trunk/arch/arm/mach-s5pv210/mach-goni.c
index 8f26d53f0720..9f7f1607c547 100644
--- a/trunk/arch/arm/mach-s5pv210/mach-goni.c
+++ b/trunk/arch/arm/mach-s5pv210/mach-goni.c
@@ -29,7 +29,6 @@
 #include <linux/interrupt.h>
 #include <linux/platform_data/s3c-hsotg.h>
 
-#include <asm/hardware/vic.h>
 #include <asm/mach/arch.h>
 #include <asm/mach/map.h>
 #include <asm/setup.h>
diff --git a/trunk/arch/arm/mach-s5pv210/mach-smdkc110.c b/trunk/arch/arm/mach-s5pv210/mach-smdkc110.c
index 7fa02213f08b..2f152f919769 100644
--- a/trunk/arch/arm/mach-s5pv210/mach-smdkc110.c
+++ b/trunk/arch/arm/mach-s5pv210/mach-smdkc110.c
@@ -15,7 +15,6 @@
 #include <linux/i2c.h>
 #include <linux/device.h>
 
-#include <asm/hardware/vic.h>
 #include <asm/mach/arch.h>
 #include <asm/mach/map.h>
 #include <asm/setup.h>
diff --git a/trunk/arch/arm/mach-s5pv210/mach-smdkv210.c b/trunk/arch/arm/mach-s5pv210/mach-smdkv210.c
index ebf31ee678e9..721967bc3927 100644
--- a/trunk/arch/arm/mach-s5pv210/mach-smdkv210.c
+++ b/trunk/arch/arm/mach-s5pv210/mach-smdkv210.c
@@ -21,7 +21,6 @@
 #include <linux/pwm_backlight.h>
 #include <linux/platform_data/s3c-hsotg.h>
 
-#include <asm/hardware/vic.h>
 #include <asm/mach/arch.h>
 #include <asm/mach/map.h>
 #include <asm/setup.h>
diff --git a/trunk/arch/arm/mach-s5pv210/mach-torbreck.c b/trunk/arch/arm/mach-s5pv210/mach-torbreck.c
index 8936018450aa..0ed270f8b0a8 100644
--- a/trunk/arch/arm/mach-s5pv210/mach-torbreck.c
+++ b/trunk/arch/arm/mach-s5pv210/mach-torbreck.c
@@ -14,7 +14,6 @@
 #include <linux/init.h>
 #include <linux/serial_core.h>
 
-#include <asm/hardware/vic.h>
 #include <asm/mach/arch.h>
 #include <asm/mach/map.h>
 #include <asm/setup.h>
diff --git a/trunk/arch/arm/mach-sunxi/sunxi.c b/trunk/arch/arm/mach-sunxi/sunxi.c
index 1dc8a92e5a5f..0ff310eecdfd 100644
--- a/trunk/arch/arm/mach-sunxi/sunxi.c
+++ b/trunk/arch/arm/mach-sunxi/sunxi.c
@@ -21,8 +21,6 @@
 
 #include <linux/irqchip/sunxi.h>
 
-#include <asm/hardware/vic.h>
-
 #include <asm/mach/arch.h>
 #include <asm/mach/map.h>
 
diff --git a/trunk/arch/arm/mach-versatile/versatile_ab.c b/trunk/arch/arm/mach-versatile/versatile_ab.c
index 886d9764448d..ddeec670d50d 100644
--- a/trunk/arch/arm/mach-versatile/versatile_ab.c
+++ b/trunk/arch/arm/mach-versatile/versatile_ab.c
@@ -26,7 +26,6 @@
 
 #include <mach/hardware.h>
 #include <asm/irq.h>
-#include <asm/hardware/vic.h>
 #include <asm/mach-types.h>
 
 #include <asm/mach/arch.h>
diff --git a/trunk/arch/arm/mach-versatile/versatile_dt.c b/trunk/arch/arm/mach-versatile/versatile_dt.c
index 17782cd0bda0..f48f2e4b667d 100644
--- a/trunk/arch/arm/mach-versatile/versatile_dt.c
+++ b/trunk/arch/arm/mach-versatile/versatile_dt.c
@@ -24,7 +24,6 @@
 #include <linux/init.h>
 #include <linux/of_irq.h>
 #include <linux/of_platform.h>
-#include <asm/hardware/vic.h>
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
 
diff --git a/trunk/arch/arm/mach-versatile/versatile_pb.c b/trunk/arch/arm/mach-versatile/versatile_pb.c
index 4119320756e8..e52eb23a0a28 100644
--- a/trunk/arch/arm/mach-versatile/versatile_pb.c
+++ b/trunk/arch/arm/mach-versatile/versatile_pb.c
@@ -27,7 +27,6 @@
 #include <linux/io.h>
 
 #include <mach/hardware.h>
-#include <asm/hardware/vic.h>
 #include <asm/irq.h>
 #include <asm/mach-types.h>