diff options
Diffstat (limited to 'drivers')
96 files changed, 93 insertions, 96 deletions
diff --git a/drivers/char/ds1620.c b/drivers/char/ds1620.c index 34275c6f1da2..be85c6d1edfe 100644 --- a/drivers/char/ds1620.c +++ b/drivers/char/ds1620.c @@ -10,7 +10,7 @@ #include <linux/init.h> #include <linux/smp_lock.h> -#include <asm/hardware.h> +#include <asm/arch/hardware.h> #include <asm/mach-types.h> #include <asm/uaccess.h> #include <asm/therm.h> diff --git a/drivers/char/hw_random/ixp4xx-rng.c b/drivers/char/hw_random/ixp4xx-rng.c index bab43ca32ac1..b4402b5958e8 100644 --- a/drivers/char/hw_random/ixp4xx-rng.c +++ b/drivers/char/hw_random/ixp4xx-rng.c @@ -23,7 +23,7 @@ #include <linux/hw_random.h> #include <asm/io.h> -#include <asm/hardware.h> +#include <asm/arch/hardware.h> static int ixp4xx_rng_data_read(struct hwrng *rng, u32 *buffer) diff --git a/drivers/i2c/busses/i2c-acorn.c b/drivers/i2c/busses/i2c-acorn.c index 7c2be3558a24..5ec60d141ce1 100644 --- a/drivers/i2c/busses/i2c-acorn.c +++ b/drivers/i2c/busses/i2c-acorn.c @@ -16,7 +16,7 @@ #include <linux/i2c.h> #include <linux/i2c-algo-bit.h> -#include <asm/hardware.h> +#include <asm/arch/hardware.h> #include <asm/io.h> #include <asm/hardware/ioc.h> #include <asm/system.h> diff --git a/drivers/i2c/busses/i2c-davinci.c b/drivers/i2c/busses/i2c-davinci.c index 4f427a51243b..eccbb7451562 100644 --- a/drivers/i2c/busses/i2c-davinci.c +++ b/drivers/i2c/busses/i2c-davinci.c @@ -36,7 +36,7 @@ #include <linux/platform_device.h> #include <linux/io.h> -#include <asm/hardware.h> +#include <asm/arch/hardware.h> #include <asm/arch/i2c.h> diff --git a/drivers/i2c/busses/i2c-ixp2000.c b/drivers/i2c/busses/i2c-ixp2000.c index 5af9e6521e6c..bd0f3f4323bc 100644 --- a/drivers/i2c/busses/i2c-ixp2000.c +++ b/drivers/i2c/busses/i2c-ixp2000.c @@ -33,7 +33,7 @@ #include <linux/i2c.h> #include <linux/i2c-algo-bit.h> -#include <asm/hardware.h> /* Pick up IXP2000-specific bits */ +#include <asm/arch/hardware.h> /* Pick up IXP2000-specific bits */ #include <asm/arch/gpio.h> static inline int ixp2000_scl_pin(void *data) diff --git a/drivers/i2c/busses/i2c-pnx.c b/drivers/i2c/busses/i2c-pnx.c index 1ca21084ffcf..e06ccc6c5e97 100644 --- a/drivers/i2c/busses/i2c-pnx.c +++ b/drivers/i2c/busses/i2c-pnx.c @@ -19,7 +19,7 @@ #include <linux/completion.h> #include <linux/platform_device.h> #include <linux/i2c-pnx.h> -#include <asm/hardware.h> +#include <asm/arch/hardware.h> #include <asm/irq.h> #include <asm/uaccess.h> diff --git a/drivers/i2c/busses/i2c-pxa.c b/drivers/i2c/busses/i2c-pxa.c index af9e6034d7fb..d65b7fbb4694 100644 --- a/drivers/i2c/busses/i2c-pxa.c +++ b/drivers/i2c/busses/i2c-pxa.c @@ -34,7 +34,7 @@ #include <linux/err.h> #include <linux/clk.h> -#include <asm/hardware.h> +#include <asm/arch/hardware.h> #include <asm/irq.h> #include <asm/io.h> #include <asm/arch/i2c.h> diff --git a/drivers/i2c/busses/i2c-s3c2410.c b/drivers/i2c/busses/i2c-s3c2410.c index 007390ad9810..598b9cbd3a05 100644 --- a/drivers/i2c/busses/i2c-s3c2410.c +++ b/drivers/i2c/busses/i2c-s3c2410.c @@ -34,7 +34,7 @@ #include <linux/platform_device.h> #include <linux/clk.h> -#include <asm/hardware.h> +#include <asm/arch/hardware.h> #include <asm/irq.h> #include <asm/io.h> diff --git a/drivers/input/keyboard/jornada720_kbd.c b/drivers/input/keyboard/jornada720_kbd.c index ce650af6d649..63774b53d75c 100644 --- a/drivers/input/keyboard/jornada720_kbd.c +++ b/drivers/input/keyboard/jornada720_kbd.c @@ -25,7 +25,7 @@ #include <linux/platform_device.h> #include <asm/arch/jornada720.h> -#include <asm/hardware.h> +#include <asm/arch/hardware.h> MODULE_AUTHOR("Kristoffer Ericson <Kristoffer.Ericson@gmail.com>"); MODULE_DESCRIPTION("HP Jornada 710/720/728 keyboard driver"); diff --git a/drivers/input/keyboard/omap-keypad.c b/drivers/input/keyboard/omap-keypad.c index 435ac071aab3..b79648508324 100644 --- a/drivers/input/keyboard/omap-keypad.c +++ b/drivers/input/keyboard/omap-keypad.c @@ -38,7 +38,7 @@ #include <asm/arch/keypad.h> #include <asm/arch/menelaus.h> #include <asm/irq.h> -#include <asm/hardware.h> +#include <asm/arch/hardware.h> #include <asm/io.h> #include <asm/arch/mux.h> diff --git a/drivers/input/misc/ixp4xx-beeper.c b/drivers/input/misc/ixp4xx-beeper.c index 798d84c44d03..7908f5c12b08 100644 --- a/drivers/input/misc/ixp4xx-beeper.c +++ b/drivers/input/misc/ixp4xx-beeper.c @@ -20,7 +20,7 @@ #include <linux/delay.h> #include <linux/platform_device.h> #include <linux/interrupt.h> -#include <asm/hardware.h> +#include <asm/arch/hardware.h> MODULE_AUTHOR("Alessandro Zummo <a.zummo@towertech.it>"); MODULE_DESCRIPTION("ixp4xx beeper driver"); diff --git a/drivers/input/mouse/rpcmouse.c b/drivers/input/mouse/rpcmouse.c index 18a48636ba4a..536e3be31b40 100644 --- a/drivers/input/mouse/rpcmouse.c +++ b/drivers/input/mouse/rpcmouse.c @@ -23,7 +23,7 @@ #include <linux/init.h> #include <linux/input.h> -#include <asm/hardware.h> +#include <asm/arch/hardware.h> #include <asm/irq.h> #include <asm/io.h> #include <asm/hardware/iomd.h> diff --git a/drivers/input/serio/rpckbd.c b/drivers/input/serio/rpckbd.c index 1567b7782478..22374d0d998f 100644 --- a/drivers/input/serio/rpckbd.c +++ b/drivers/input/serio/rpckbd.c @@ -35,7 +35,7 @@ #include <linux/platform_device.h> #include <asm/irq.h> -#include <asm/hardware.h> +#include <asm/arch/hardware.h> #include <asm/io.h> #include <asm/hardware/iomd.h> #include <asm/system.h> diff --git a/drivers/input/touchscreen/jornada720_ts.c b/drivers/input/touchscreen/jornada720_ts.c index 1aca108b1031..19f40772c2fd 100644 --- a/drivers/input/touchscreen/jornada720_ts.c +++ b/drivers/input/touchscreen/jornada720_ts.c @@ -19,7 +19,7 @@ #include <linux/interrupt.h> #include <linux/module.h> -#include <asm/hardware.h> +#include <asm/arch/hardware.h> #include <asm/arch/jornada720.h> MODULE_AUTHOR("Kristoffer Ericson <kristoffer.ericson@gmail.com>"); diff --git a/drivers/leds/leds-h1940.c b/drivers/leds/leds-h1940.c index 73c705021686..5227585e74bf 100644 --- a/drivers/leds/leds-h1940.c +++ b/drivers/leds/leds-h1940.c @@ -17,7 +17,7 @@ #include <linux/ctype.h> #include <linux/leds.h> #include <asm/arch/regs-gpio.h> -#include <asm/hardware.h> +#include <asm/arch/hardware.h> #include <asm/arch/h1940-latch.h> /* diff --git a/drivers/leds/leds-locomo.c b/drivers/leds/leds-locomo.c index 7295f7f52185..17ebfe283e76 100644 --- a/drivers/leds/leds-locomo.c +++ b/drivers/leds/leds-locomo.c @@ -13,7 +13,7 @@ #include <linux/device.h> #include <linux/leds.h> -#include <asm/hardware.h> +#include <asm/arch/hardware.h> #include <asm/hardware/locomo.h> static void locomoled_brightness_set(struct led_classdev *led_cdev, diff --git a/drivers/leds/leds-s3c24xx.c b/drivers/leds/leds-s3c24xx.c index d4f5021dccbf..cb74c1890b36 100644 --- a/drivers/leds/leds-s3c24xx.c +++ b/drivers/leds/leds-s3c24xx.c @@ -16,7 +16,7 @@ #include <linux/platform_device.h> #include <linux/leds.h> -#include <asm/hardware.h> +#include <asm/arch/hardware.h> #include <asm/arch/regs-gpio.h> #include <asm/arch/leds-gpio.h> diff --git a/drivers/mfd/mcp-sa11x0.c b/drivers/mfd/mcp-sa11x0.c index b5272b5ce3fa..6a2a2a8c3878 100644 --- a/drivers/mfd/mcp-sa11x0.c +++ b/drivers/mfd/mcp-sa11x0.c @@ -21,7 +21,7 @@ #include <linux/platform_device.h> #include <asm/dma.h> -#include <asm/hardware.h> +#include <asm/arch/hardware.h> #include <asm/mach-types.h> #include <asm/system.h> #include <asm/arch/mcp.h> diff --git a/drivers/mfd/ucb1x00-core.c b/drivers/mfd/ucb1x00-core.c index f6b10dda31fd..a67541113e1d 100644 --- a/drivers/mfd/ucb1x00-core.c +++ b/drivers/mfd/ucb1x00-core.c @@ -26,7 +26,7 @@ #include <linux/mutex.h> #include <asm/dma.h> -#include <asm/hardware.h> +#include <asm/arch/hardware.h> #include "ucb1x00.h" diff --git a/drivers/mtd/maps/autcpu12-nvram.c b/drivers/mtd/maps/autcpu12-nvram.c index cf32267263df..f199b16de2db 100644 --- a/drivers/mtd/maps/autcpu12-nvram.c +++ b/drivers/mtd/maps/autcpu12-nvram.c @@ -25,7 +25,7 @@ #include <linux/init.h> #include <asm/io.h> #include <asm/sizes.h> -#include <asm/hardware.h> +#include <asm/arch/hardware.h> #include <asm/arch/autcpu12.h> #include <linux/mtd/mtd.h> #include <linux/mtd/map.h> diff --git a/drivers/mtd/maps/ceiva.c b/drivers/mtd/maps/ceiva.c index 6464d487eb1a..468204ca238f 100644 --- a/drivers/mtd/maps/ceiva.c +++ b/drivers/mtd/maps/ceiva.c @@ -25,7 +25,7 @@ #include <linux/mtd/partitions.h> #include <linux/mtd/concat.h> -#include <asm/hardware.h> +#include <asm/arch/hardware.h> #include <asm/mach-types.h> #include <asm/io.h> #include <asm/sizes.h> diff --git a/drivers/mtd/maps/h720x-flash.c b/drivers/mtd/maps/h720x-flash.c index ef8915474462..873ff1523bbe 100644 --- a/drivers/mtd/maps/h720x-flash.c +++ b/drivers/mtd/maps/h720x-flash.c @@ -16,7 +16,7 @@ #include <linux/mtd/mtd.h> #include <linux/mtd/map.h> #include <linux/mtd/partitions.h> -#include <asm/hardware.h> +#include <asm/arch/hardware.h> #include <asm/io.h> static struct mtd_info *mymtd; diff --git a/drivers/mtd/maps/integrator-flash.c b/drivers/mtd/maps/integrator-flash.c index ee361aaadb1e..d0282ceecc9f 100644 --- a/drivers/mtd/maps/integrator-flash.c +++ b/drivers/mtd/maps/integrator-flash.c @@ -37,7 +37,7 @@ #include <linux/mtd/partitions.h> #include <asm/mach/flash.h> -#include <asm/hardware.h> +#include <asm/arch/hardware.h> #include <asm/io.h> #include <asm/system.h> diff --git a/drivers/mtd/maps/ipaq-flash.c b/drivers/mtd/maps/ipaq-flash.c index 113b1062020d..6447e8be9922 100644 --- a/drivers/mtd/maps/ipaq-flash.c +++ b/drivers/mtd/maps/ipaq-flash.c @@ -24,7 +24,7 @@ #include <linux/mtd/concat.h> #endif -#include <asm/hardware.h> +#include <asm/arch/hardware.h> #include <asm/arch/h3600.h> #include <asm/io.h> diff --git a/drivers/mtd/maps/ixp2000.c b/drivers/mtd/maps/ixp2000.c index c2264792a20b..33b583e0d1bf 100644 --- a/drivers/mtd/maps/ixp2000.c +++ b/drivers/mtd/maps/ixp2000.c @@ -30,7 +30,7 @@ #include <linux/mtd/partitions.h> #include <asm/io.h> -#include <asm/hardware.h> +#include <asm/arch/hardware.h> #include <asm/mach/flash.h> #include <linux/reboot.h> diff --git a/drivers/mtd/maps/omap_nor.c b/drivers/mtd/maps/omap_nor.c index 68eec6c6c517..771e6806c58d 100644 --- a/drivers/mtd/maps/omap_nor.c +++ b/drivers/mtd/maps/omap_nor.c @@ -43,7 +43,7 @@ #include <linux/mtd/partitions.h> #include <asm/io.h> -#include <asm/hardware.h> +#include <asm/arch/hardware.h> #include <asm/mach/flash.h> #include <asm/arch/tc.h> diff --git a/drivers/mtd/maps/pxa2xx-flash.c b/drivers/mtd/maps/pxa2xx-flash.c index 82113295c266..fe070cc0a49f 100644 --- a/drivers/mtd/maps/pxa2xx-flash.c +++ b/drivers/mtd/maps/pxa2xx-flash.c @@ -19,7 +19,7 @@ #include <linux/mtd/partitions.h> #include <asm/io.h> -#include <asm/hardware.h> +#include <asm/arch/hardware.h> #include <asm/cacheflush.h> #include <asm/mach/flash.h> diff --git a/drivers/mtd/maps/sa1100-flash.c b/drivers/mtd/maps/sa1100-flash.c index e177a43dfff0..7fc3204eee7e 100644 --- a/drivers/mtd/maps/sa1100-flash.c +++ b/drivers/mtd/maps/sa1100-flash.c @@ -18,7 +18,7 @@ #include <linux/mtd/partitions.h> #include <linux/mtd/concat.h> -#include <asm/hardware.h> +#include <asm/arch/hardware.h> #include <asm/io.h> #include <asm/sizes.h> #include <asm/mach/flash.h> diff --git a/drivers/mtd/nand/sharpsl.c b/drivers/mtd/nand/sharpsl.c index 6dba2fb66ae5..18d2cd395b24 100644 --- a/drivers/mtd/nand/sharpsl.c +++ b/drivers/mtd/nand/sharpsl.c @@ -21,7 +21,7 @@ #include <linux/mtd/partitions.h> #include <linux/interrupt.h> #include <asm/io.h> -#include <asm/hardware.h> +#include <asm/arch/hardware.h> #include <asm/mach-types.h> static void __iomem *sharpsl_io_base; diff --git a/drivers/net/arm/am79c961a.c b/drivers/net/arm/am79c961a.c index a637910b02dd..0ece4f9f1fa1 100644 --- a/drivers/net/arm/am79c961a.c +++ b/drivers/net/arm/am79c961a.c @@ -28,7 +28,7 @@ #include <linux/bitops.h> #include <linux/platform_device.h> -#include <asm/hardware.h> +#include <asm/arch/hardware.h> #include <asm/io.h> #include <asm/system.h> diff --git a/drivers/net/irda/ep7211-sir.c b/drivers/net/irda/ep7211-sir.c index 831572429bb9..2f89d47a37c5 100644 --- a/drivers/net/irda/ep7211-sir.c +++ b/drivers/net/irda/ep7211-sir.c @@ -14,7 +14,7 @@ #include <net/irda/irda_device.h> #include <asm/io.h> -#include <asm/hardware.h> +#include <asm/arch/hardware.h> #include "sir-dev.h" diff --git a/drivers/net/irda/sa1100_ir.c b/drivers/net/irda/sa1100_ir.c index 1bc8518f9197..d16594a5dbc7 100644 --- a/drivers/net/irda/sa1100_ir.c +++ b/drivers/net/irda/sa1100_ir.c @@ -37,7 +37,7 @@ #include <asm/irq.h> #include <asm/dma.h> -#include <asm/hardware.h> +#include <asm/arch/hardware.h> #include <asm/mach/irda.h> static int power_level = 3; diff --git a/drivers/net/ixp2000/ixp2400-msf.c b/drivers/net/ixp2000/ixp2400-msf.c index 9ec38eebfb56..65267c973109 100644 --- a/drivers/net/ixp2000/ixp2400-msf.c +++ b/drivers/net/ixp2000/ixp2400-msf.c @@ -13,7 +13,7 @@ #include <linux/kernel.h> #include <linux/init.h> -#include <asm/hardware.h> +#include <asm/arch/hardware.h> #include <asm/arch/ixp2000-regs.h> #include <asm/delay.h> #include <asm/io.h> diff --git a/drivers/net/netx-eth.c b/drivers/net/netx-eth.c index dc442e370850..f2655ce526b9 100644 --- a/drivers/net/netx-eth.c +++ b/drivers/net/netx-eth.c @@ -29,7 +29,6 @@ #include <linux/mii.h> #include <asm/io.h> -#include <asm/hardware.h> #include <asm/arch/hardware.h> #include <asm/arch/netx-regs.h> #include <asm/arch/pfifo.h> diff --git a/drivers/pcmcia/at91_cf.c b/drivers/pcmcia/at91_cf.c index 684968558c19..ab6b4bee3187 100644 --- a/drivers/pcmcia/at91_cf.c +++ b/drivers/pcmcia/at91_cf.c @@ -18,7 +18,7 @@ #include <pcmcia/ss.h> -#include <asm/hardware.h> +#include <asm/arch/hardware.h> #include <asm/io.h> #include <asm/sizes.h> #include <asm/gpio.h> diff --git a/drivers/pcmcia/omap_cf.c b/drivers/pcmcia/omap_cf.c index 569b746b5731..36cf9bcf3ac1 100644 --- a/drivers/pcmcia/omap_cf.c +++ b/drivers/pcmcia/omap_cf.c @@ -19,7 +19,7 @@ #include <pcmcia/ss.h> -#include <asm/hardware.h> +#include <asm/arch/hardware.h> #include <asm/io.h> #include <asm/sizes.h> diff --git a/drivers/pcmcia/pxa2xx_base.c b/drivers/pcmcia/pxa2xx_base.c index ccfdf1969a7f..ff5e3f324f3e 100644 --- a/drivers/pcmcia/pxa2xx_base.c +++ b/drivers/pcmcia/pxa2xx_base.c @@ -24,7 +24,7 @@ #include <linux/spinlock.h> #include <linux/platform_device.h> -#include <asm/hardware.h> +#include <asm/arch/hardware.h> #include <asm/io.h> #include <asm/irq.h> #include <asm/system.h> diff --git a/drivers/pcmcia/pxa2xx_lubbock.c b/drivers/pcmcia/pxa2xx_lubbock.c index 881ec8a8e389..64f709d0113d 100644 --- a/drivers/pcmcia/pxa2xx_lubbock.c +++ b/drivers/pcmcia/pxa2xx_lubbock.c @@ -21,7 +21,7 @@ #include <linux/init.h> #include <linux/delay.h> -#include <asm/hardware.h> +#include <asm/arch/hardware.h> #include <asm/hardware/sa1111.h> #include <asm/mach-types.h> #include <asm/arch/pxa-regs.h> diff --git a/drivers/pcmcia/pxa2xx_mainstone.c b/drivers/pcmcia/pxa2xx_mainstone.c index 92d1cc33808c..b0dcda481522 100644 --- a/drivers/pcmcia/pxa2xx_mainstone.c +++ b/drivers/pcmcia/pxa2xx_mainstone.c @@ -21,7 +21,7 @@ #include <pcmcia/ss.h> -#include <asm/hardware.h> +#include <asm/arch/hardware.h> #include <asm/mach-types.h> #include <asm/irq.h> diff --git a/drivers/pcmcia/pxa2xx_sharpsl.c b/drivers/pcmcia/pxa2xx_sharpsl.c index d71f93d45833..58395bff9a72 100644 --- a/drivers/pcmcia/pxa2xx_sharpsl.c +++ b/drivers/pcmcia/pxa2xx_sharpsl.c @@ -19,7 +19,7 @@ #include <linux/platform_device.h> #include <asm/mach-types.h> -#include <asm/hardware.h> +#include <asm/arch/hardware.h> #include <asm/irq.h> #include <asm/hardware/scoop.h> diff --git a/drivers/pcmcia/sa1100_assabet.c b/drivers/pcmcia/sa1100_assabet.c index ce133ce81c10..71fbb62804b1 100644 --- a/drivers/pcmcia/sa1100_assabet.c +++ b/drivers/pcmcia/sa1100_assabet.c @@ -11,7 +11,7 @@ #include <linux/device.h> #include <linux/init.h> -#include <asm/hardware.h> +#include <asm/arch/hardware.h> #include <asm/mach-types.h> #include <asm/irq.h> #include <asm/signal.h> diff --git a/drivers/pcmcia/sa1100_badge4.c b/drivers/pcmcia/sa1100_badge4.c index 607c3f326eca..a34279a6788b 100644 --- a/drivers/pcmcia/sa1100_badge4.c +++ b/drivers/pcmcia/sa1100_badge4.c @@ -18,7 +18,7 @@ #include <linux/errno.h> #include <linux/init.h> -#include <asm/hardware.h> +#include <asm/arch/hardware.h> #include <asm/mach-types.h> #include <asm/arch/badge4.h> #include <asm/hardware/sa1111.h> diff --git a/drivers/pcmcia/sa1100_cerf.c b/drivers/pcmcia/sa1100_cerf.c index 7c3951a2675d..bd843bffde59 100644 --- a/drivers/pcmcia/sa1100_cerf.c +++ b/drivers/pcmcia/sa1100_cerf.c @@ -11,7 +11,7 @@ #include <linux/init.h> #include <linux/delay.h> -#include <asm/hardware.h> +#include <asm/arch/hardware.h> #include <asm/mach-types.h> #include <asm/irq.h> #include <asm/arch/cerf.h> diff --git a/drivers/pcmcia/sa1100_h3600.c b/drivers/pcmcia/sa1100_h3600.c index e5491879acd9..9017b1302cc7 100644 --- a/drivers/pcmcia/sa1100_h3600.c +++ b/drivers/pcmcia/sa1100_h3600.c @@ -11,7 +11,7 @@ #include <linux/init.h> #include <linux/delay.h> -#include <asm/hardware.h> +#include <asm/arch/hardware.h> #include <asm/irq.h> #include <asm/mach-types.h> #include <asm/arch/h3600.h> diff --git a/drivers/pcmcia/sa1100_jornada720.c b/drivers/pcmcia/sa1100_jornada720.c index 2167e6714d2d..15c31dbb0f3c 100644 --- a/drivers/pcmcia/sa1100_jornada720.c +++ b/drivers/pcmcia/sa1100_jornada720.c @@ -10,7 +10,7 @@ #include <linux/errno.h> #include <linux/init.h> -#include <asm/hardware.h> +#include <asm/arch/hardware.h> #include <asm/hardware/sa1111.h> #include <asm/mach-types.h> diff --git a/drivers/pcmcia/sa1100_neponset.c b/drivers/pcmcia/sa1100_neponset.c index 687492fcd5b4..ace391b69e96 100644 --- a/drivers/pcmcia/sa1100_neponset.c +++ b/drivers/pcmcia/sa1100_neponset.c @@ -9,7 +9,7 @@ #include <linux/errno.h> #include <linux/init.h> -#include <asm/hardware.h> +#include <asm/arch/hardware.h> #include <asm/mach-types.h> #include <asm/arch/neponset.h> #include <asm/hardware/sa1111.h> diff --git a/drivers/pcmcia/sa1100_shannon.c b/drivers/pcmcia/sa1100_shannon.c index 494912fccc0d..16b04270508a 100644 --- a/drivers/pcmcia/sa1100_shannon.c +++ b/drivers/pcmcia/sa1100_shannon.c @@ -9,7 +9,7 @@ #include <linux/device.h> #include <linux/init.h> -#include <asm/hardware.h> +#include <asm/arch/hardware.h> #include <asm/mach-types.h> #include <asm/arch/shannon.h> #include <asm/irq.h> diff --git a/drivers/pcmcia/sa1100_simpad.c b/drivers/pcmcia/sa1100_simpad.c index 42567de894b9..6e6e98654381 100644 --- a/drivers/pcmcia/sa1100_simpad.c +++ b/drivers/pcmcia/sa1100_simpad.c @@ -9,7 +9,7 @@ #include <linux/device.h> #include <linux/init.h> -#include <asm/hardware.h> +#include <asm/arch/hardware.h> #include <asm/mach-types.h> #include <asm/irq.h> #include <asm/arch/simpad.h> diff --git a/drivers/pcmcia/sa1111_generic.c b/drivers/pcmcia/sa1111_generic.c index 658cddfbcf29..432c0610582a 100644 --- a/drivers/pcmcia/sa1111_generic.c +++ b/drivers/pcmcia/sa1111_generic.c @@ -14,7 +14,7 @@ #include <pcmcia/ss.h> -#include <asm/hardware.h> +#include <asm/arch/hardware.h> #include <asm/hardware/sa1111.h> #include <asm/io.h> #include <asm/irq.h> diff --git a/drivers/pcmcia/sa11xx_base.c b/drivers/pcmcia/sa11xx_base.c index 31a7abc55b23..7d48201ae102 100644 --- a/drivers/pcmcia/sa11xx_base.c +++ b/drivers/pcmcia/sa11xx_base.c @@ -37,7 +37,7 @@ #include <linux/kernel.h> #include <linux/spinlock.h> -#include <asm/hardware.h> +#include <asm/arch/hardware.h> #include <asm/io.h> #include <asm/irq.h> #include <asm/system.h> diff --git a/drivers/pcmcia/soc_common.c b/drivers/pcmcia/soc_common.c index 8c21446996f2..95dff38e85f5 100644 --- a/drivers/pcmcia/soc_common.c +++ b/drivers/pcmcia/soc_common.c @@ -43,7 +43,7 @@ #include <linux/spinlock.h> #include <linux/cpufreq.h> -#include <asm/hardware.h> +#include <asm/arch/hardware.h> #include <asm/io.h> #include <asm/system.h> diff --git a/drivers/rtc/rtc-ep93xx.c b/drivers/rtc/rtc-ep93xx.c index 1e99325270df..9ab53ec63138 100644 --- a/drivers/rtc/rtc-ep93xx.c +++ b/drivers/rtc/rtc-ep93xx.c @@ -12,7 +12,7 @@ #include <linux/module.h> #include <linux/rtc.h> #include <linux/platform_device.h> -#include <asm/hardware.h> +#include <asm/arch/hardware.h> #define EP93XX_RTC_REG(x) (EP93XX_RTC_BASE + (x)) #define EP93XX_RTC_DATA EP93XX_RTC_REG(0x0000) diff --git a/drivers/rtc/rtc-s3c.c b/drivers/rtc/rtc-s3c.c index 54b1ebb01502..8054112fc041 100644 --- a/drivers/rtc/rtc-s3c.c +++ b/drivers/rtc/rtc-s3c.c @@ -22,7 +22,7 @@ #include <linux/clk.h> #include <linux/log2.h> -#include <asm/hardware.h> +#include <asm/arch/hardware.h> #include <asm/uaccess.h> #include <asm/io.h> #include <asm/irq.h> diff --git a/drivers/rtc/rtc-sa1100.c b/drivers/rtc/rtc-sa1100.c index f47294c60148..a0982d67e085 100644 --- a/drivers/rtc/rtc-sa1100.c +++ b/drivers/rtc/rtc-sa1100.c @@ -31,7 +31,7 @@ #include <linux/pm.h> #include <linux/bitops.h> -#include <asm/hardware.h> +#include <asm/arch/hardware.h> #include <asm/irq.h> #ifdef CONFIG_ARCH_PXA diff --git a/drivers/scsi/arm/acornscsi-io.S b/drivers/scsi/arm/acornscsi-io.S index 5cebe3105260..075df199cdec 100644 --- a/drivers/scsi/arm/acornscsi-io.S +++ b/drivers/scsi/arm/acornscsi-io.S @@ -8,7 +8,7 @@ #include <linux/linkage.h> #include <asm/assembler.h> -#include <asm/hardware.h> +#include <asm/arch/hardware.h> #if defined(__APCS_32__) #define LOADREGS(t,r,l...) ldm##t r, l diff --git a/drivers/serial/21285.c b/drivers/serial/21285.c index 6558a4037806..73d7773c8416 100644 --- a/drivers/serial/21285.c +++ b/drivers/serial/21285.c @@ -19,7 +19,7 @@ #include <asm/irq.h> #include <asm/mach-types.h> #include <asm/hardware/dec21285.h> -#include <asm/hardware.h> +#include <asm/arch/hardware.h> #define BAUD_BASE (mem_fclk_21285/64) diff --git a/drivers/serial/clps711x.c b/drivers/serial/clps711x.c index fc1fa9267c59..44d5d267ca17 100644 --- a/drivers/serial/clps711x.c +++ b/drivers/serial/clps711x.c @@ -39,7 +39,7 @@ #include <linux/serial_core.h> #include <linux/serial.h> -#include <asm/hardware.h> +#include <asm/arch/hardware.h> #include <asm/io.h> #include <asm/irq.h> #include <asm/hardware/clps7111.h> diff --git a/drivers/serial/imx.c b/drivers/serial/imx.c index e0da4dc7bbf6..db3a2df5e5c9 100644 --- a/drivers/serial/imx.c +++ b/drivers/serial/imx.c @@ -44,7 +44,7 @@ #include <asm/io.h> #include <asm/irq.h> -#include <asm/hardware.h> +#include <asm/arch/hardware.h> #include <asm/arch/imx-uart.h> /* Register definitions */ diff --git a/drivers/serial/netx-serial.c b/drivers/serial/netx-serial.c index 9f8ccb735c19..edbb85a2cc5b 100644 --- a/drivers/serial/netx-serial.c +++ b/drivers/serial/netx-serial.c @@ -35,7 +35,7 @@ #include <asm/io.h> #include <asm/irq.h> -#include <asm/hardware.h> +#include <asm/arch/hardware.h> #include <asm/arch/netx-regs.h> /* We've been assigned a range on the "Low-density serial ports" major */ diff --git a/drivers/serial/pxa.c b/drivers/serial/pxa.c index b9a93f326fb8..033767bed049 100644 --- a/drivers/serial/pxa.c +++ b/drivers/serial/pxa.c @@ -45,7 +45,7 @@ #include <linux/clk.h> #include <asm/io.h> -#include <asm/hardware.h> +#include <asm/arch/hardware.h> #include <asm/irq.h> #include <asm/arch/pxa-regs.h> diff --git a/drivers/serial/s3c2400.c b/drivers/serial/s3c2400.c index a1102053e553..525130d67f97 100644 --- a/drivers/serial/s3c2400.c +++ b/drivers/serial/s3c2400.c @@ -17,7 +17,7 @@ #include <asm/irq.h> -#include <asm/hardware.h> +#include <asm/arch/hardware.h> #include <asm/plat-s3c/regs-serial.h> #include <asm/arch/regs-gpio.h> diff --git a/drivers/serial/s3c2410.c b/drivers/serial/s3c2410.c index c5f03f41686f..f9630c6e6f7e 100644 --- a/drivers/serial/s3c2410.c +++ b/drivers/serial/s3c2410.c @@ -19,7 +19,7 @@ #include <linux/serial.h> #include <asm/irq.h> -#include <asm/hardware.h> +#include <asm/arch/hardware.h> #include <asm/plat-s3c/regs-serial.h> #include <asm/arch/regs-gpio.h> diff --git a/drivers/serial/s3c2412.c b/drivers/serial/s3c2412.c index ce0c220e3e92..b4c0bb5a0415 100644 --- a/drivers/serial/s3c2412.c +++ b/drivers/serial/s3c2412.c @@ -19,7 +19,7 @@ #include <linux/serial.h> #include <asm/irq.h> -#include <asm/hardware.h> +#include <asm/arch/hardware.h> #include <asm/plat-s3c/regs-serial.h> #include <asm/arch/regs-gpio.h> diff --git a/drivers/serial/s3c2440.c b/drivers/serial/s3c2440.c index 38f954bd39c6..ea34faa2f653 100644 --- a/drivers/serial/s3c2440.c +++ b/drivers/serial/s3c2440.c @@ -19,7 +19,7 @@ #include <linux/serial.h> #include <asm/irq.h> -#include <asm/hardware.h> +#include <asm/arch/hardware.h> #include <asm/plat-s3c/regs-serial.h> #include <asm/arch/regs-gpio.h> diff --git a/drivers/serial/sa1100.c b/drivers/serial/sa1100.c index a5e76cc18073..6c37a58652c2 100644 --- a/drivers/serial/sa1100.c +++ b/drivers/serial/sa1100.c @@ -39,7 +39,7 @@ #include <asm/io.h> #include <asm/irq.h> -#include <asm/hardware.h> +#include <asm/arch/hardware.h> #include <asm/mach/serial_sa1100.h> /* We've been assigned a range on the "Low-density serial ports" major */ diff --git a/drivers/serial/samsung.c b/drivers/serial/samsung.c index d852f83f8900..5b964d4bc04d 100644 --- a/drivers/serial/samsung.c +++ b/drivers/serial/samsung.c @@ -45,7 +45,7 @@ #include <asm/irq.h> -#include <asm/hardware.h> +#include <asm/arch/hardware.h> #include <asm/plat-s3c/regs-serial.h> #include <asm/arch/regs-gpio.h> diff --git a/drivers/spi/omap_uwire.c b/drivers/spi/omap_uwire.c index d9ae111c27ae..e7588e112ec6 100644 --- a/drivers/spi/omap_uwire.c +++ b/drivers/spi/omap_uwire.c @@ -47,7 +47,7 @@ #include <asm/system.h> #include <asm/irq.h> -#include <asm/hardware.h> +#include <asm/arch/hardware.h> #include <asm/io.h> #include <asm/mach-types.h> diff --git a/drivers/spi/pxa2xx_spi.c b/drivers/spi/pxa2xx_spi.c index 067299d6d192..70786f57cdcf 100644 --- a/drivers/spi/pxa2xx_spi.c +++ b/drivers/spi/pxa2xx_spi.c @@ -31,7 +31,6 @@ #include <asm/io.h> #include <asm/irq.h> -#include <asm/hardware.h> #include <asm/delay.h> #include <asm/dma.h> diff --git a/drivers/spi/spi_imx.c b/drivers/spi/spi_imx.c index 6fb77fcc4971..8d7c902c87c5 100644 --- a/drivers/spi/spi_imx.c +++ b/drivers/spi/spi_imx.c @@ -33,7 +33,6 @@ #include <asm/io.h> #include <asm/irq.h> -#include <asm/hardware.h> #include <asm/delay.h> #include <asm/arch/hardware.h> diff --git a/drivers/spi/spi_s3c24xx.c b/drivers/spi/spi_s3c24xx.c index 0885cc357a37..ec282aa92aaa 100644 --- a/drivers/spi/spi_s3c24xx.c +++ b/drivers/spi/spi_s3c24xx.c @@ -25,7 +25,7 @@ #include <asm/io.h> #include <asm/dma.h> -#include <asm/hardware.h> +#include <asm/arch/hardware.h> #include <asm/arch/regs-gpio.h> #include <asm/plat-s3c24xx/regs-spi.h> diff --git a/drivers/spi/spi_s3c24xx_gpio.c b/drivers/spi/spi_s3c24xx_gpio.c index e33f6145c560..d44fd0af0da1 100644 --- a/drivers/spi/spi_s3c24xx_gpio.c +++ b/drivers/spi/spi_s3c24xx_gpio.c @@ -23,7 +23,7 @@ #include <asm/arch/regs-gpio.h> #include <asm/arch/spi-gpio.h> -#include <asm/hardware.h> +#include <asm/arch/hardware.h> struct s3c2410_spigpio { struct spi_bitbang bitbang; diff --git a/drivers/usb/gadget/at91_udc.c b/drivers/usb/gadget/at91_udc.c index 895fb6b96aed..5b935e9ebf99 100644 --- a/drivers/usb/gadget/at91_udc.c +++ b/drivers/usb/gadget/at91_udc.c @@ -40,7 +40,7 @@ #include <linux/usb/gadget.h> #include <asm/byteorder.h> -#include <asm/hardware.h> +#include <asm/arch/hardware.h> #include <asm/io.h> #include <asm/irq.h> #include <asm/system.h> diff --git a/drivers/usb/gadget/lh7a40x_udc.h b/drivers/usb/gadget/lh7a40x_udc.h index 1ecfd6366b9a..fd43b90df03e 100644 --- a/drivers/usb/gadget/lh7a40x_udc.h +++ b/drivers/usb/gadget/lh7a40x_udc.h @@ -47,7 +47,7 @@ #include <asm/irq.h> #include <asm/system.h> #include <asm/unaligned.h> -#include <asm/hardware.h> +#include <asm/arch/hardware.h> #include <linux/usb/ch9.h> #include <linux/usb/gadget.h> diff --git a/drivers/usb/gadget/pxa27x_udc.c b/drivers/usb/gadget/pxa27x_udc.c index 9d447d8cfc0c..06c81a3c9277 100644 --- a/drivers/usb/gadget/pxa27x_udc.c +++ b/drivers/usb/gadget/pxa27x_udc.c @@ -33,7 +33,7 @@ #include <linux/irq.h> #include <asm/byteorder.h> -#include <asm/hardware.h> +#include <asm/arch/hardware.h> #include <linux/usb.h> #include <linux/usb/ch9.h> diff --git a/drivers/usb/host/ohci-at91.c b/drivers/usb/host/ohci-at91.c index 3eae40f8743f..389a8f1bbc69 100644 --- a/drivers/usb/host/ohci-at91.c +++ b/drivers/usb/host/ohci-at91.c @@ -15,7 +15,7 @@ #include <linux/clk.h> #include <linux/platform_device.h> -#include <asm/hardware.h> +#include <asm/arch/hardware.h> #include <asm/gpio.h> #include <asm/arch/board.h> diff --git a/drivers/usb/host/ohci-ep93xx.c b/drivers/usb/host/ohci-ep93xx.c index e19b07d35ea8..4d628a9c6d89 100644 --- a/drivers/usb/host/ohci-ep93xx.c +++ b/drivers/usb/host/ohci-ep93xx.c @@ -28,7 +28,7 @@ #include <linux/signal.h> #include <linux/platform_device.h> -#include <asm/hardware.h> +#include <asm/arch/hardware.h> static struct clk *usb_host_clock; diff --git a/drivers/usb/host/ohci-lh7a404.c b/drivers/usb/host/ohci-lh7a404.c index 1ef5d482c145..020769b69431 100644 --- a/drivers/usb/host/ohci-lh7a404.c +++ b/drivers/usb/host/ohci-lh7a404.c @@ -19,7 +19,7 @@ #include <linux/platform_device.h> #include <linux/signal.h> -#include <asm/hardware.h> +#include <asm/arch/hardware.h> extern int usb_disabled(void); diff --git a/drivers/usb/host/ohci-omap.c b/drivers/usb/host/ohci-omap.c index 6e5e5f81ac90..9b7e9102fb98 100644 --- a/drivers/usb/host/ohci-omap.c +++ b/drivers/usb/host/ohci-omap.c @@ -19,7 +19,7 @@ #include <linux/platform_device.h> #include <linux/clk.h> -#include <asm/hardware.h> +#include <asm/arch/hardware.h> #include <asm/io.h> #include <asm/mach-types.h> diff --git a/drivers/usb/host/ohci-pnx4008.c b/drivers/usb/host/ohci-pnx4008.c index 037956a60bfa..ff4d928eb117 100644 --- a/drivers/usb/host/ohci-pnx4008.c +++ b/drivers/usb/host/ohci-pnx4008.c @@ -21,7 +21,7 @@ #include <linux/platform_device.h> #include <linux/i2c.h> -#include <asm/hardware.h> +#include <asm/arch/hardware.h> #include <asm/io.h> #include <asm/arch/platform.h> diff --git a/drivers/usb/host/ohci-pxa27x.c b/drivers/usb/host/ohci-pxa27x.c index 1f516d6cf514..3eb2c28e608d 100644 --- a/drivers/usb/host/ohci-pxa27x.c +++ b/drivers/usb/host/ohci-pxa27x.c @@ -24,7 +24,7 @@ #include <linux/platform_device.h> #include <linux/clk.h> -#include <asm/hardware.h> +#include <asm/arch/hardware.h> #include <asm/arch/pxa-regs.h> #include <asm/arch/pxa2xx-regs.h> /* FIXME: for PSSR */ #include <asm/arch/ohci.h> diff --git a/drivers/usb/host/ohci-s3c2410.c b/drivers/usb/host/ohci-s3c2410.c index 3c7a740cfe0c..358100c8dfa3 100644 --- a/drivers/usb/host/ohci-s3c2410.c +++ b/drivers/usb/host/ohci-s3c2410.c @@ -22,7 +22,7 @@ #include <linux/platform_device.h> #include <linux/clk.h> -#include <asm/hardware.h> +#include <asm/arch/hardware.h> #include <asm/arch/usb-control.h> #define valid_port(idx) ((idx) == 1 || (idx) == 2) diff --git a/drivers/usb/host/ohci-sa1111.c b/drivers/usb/host/ohci-sa1111.c index 2e9dceb9bb99..a3a8fea6d363 100644 --- a/drivers/usb/host/ohci-sa1111.c +++ b/drivers/usb/host/ohci-sa1111.c @@ -13,7 +13,7 @@ * This file is licenced under the GPL. */ -#include <asm/hardware.h> +#include <asm/arch/hardware.h> #include <asm/mach-types.h> #include <asm/arch/assabet.h> #include <asm/arch/badge4.h> diff --git a/drivers/video/acornfb.c b/drivers/video/acornfb.c index 017233d0c481..bad26c65d9bf 100644 --- a/drivers/video/acornfb.c +++ b/drivers/video/acornfb.c @@ -29,7 +29,7 @@ #include <linux/platform_device.h> #include <linux/dma-mapping.h> -#include <asm/hardware.h> +#include <asm/arch/hardware.h> #include <asm/io.h> #include <asm/irq.h> #include <asm/mach-types.h> diff --git a/drivers/video/clps711xfb.c b/drivers/video/clps711xfb.c index 9f8a389dc7ae..3701caa367e4 100644 --- a/drivers/video/clps711xfb.c +++ b/drivers/video/clps711xfb.c @@ -27,7 +27,7 @@ #include <linux/proc_fs.h> #include <linux/delay.h> -#include <asm/hardware.h> +#include <asm/arch/hardware.h> #include <asm/mach-types.h> #include <linux/uaccess.h> diff --git a/drivers/video/imxfb.c b/drivers/video/imxfb.c index 0c5a475c1cae..d28879fd3a29 100644 --- a/drivers/video/imxfb.c +++ b/drivers/video/imxfb.c @@ -33,7 +33,7 @@ #include <linux/platform_device.h> #include <linux/dma-mapping.h> -#include <asm/hardware.h> +#include <asm/arch/hardware.h> #include <asm/io.h> #include <asm/arch/imxfb.h> diff --git a/drivers/video/pxafb.c b/drivers/video/pxafb.c index 69de2fed6c58..3169ea4831ef 100644 --- a/drivers/video/pxafb.c +++ b/drivers/video/pxafb.c @@ -45,7 +45,7 @@ #include <linux/kthread.h> #include <linux/freezer.h> -#include <asm/hardware.h> +#include <asm/arch/hardware.h> #include <asm/io.h> #include <asm/irq.h> #include <asm/div64.h> diff --git a/drivers/video/sa1100fb.c b/drivers/video/sa1100fb.c index 78bcdbc3f484..8fbcce6d069d 100644 --- a/drivers/video/sa1100fb.c +++ b/drivers/video/sa1100fb.c @@ -177,7 +177,7 @@ #include <linux/dma-mapping.h> #include <linux/mutex.h> -#include <asm/hardware.h> +#include <asm/arch/hardware.h> #include <asm/io.h> #include <asm/mach-types.h> #include <asm/arch/assabet.h> diff --git a/drivers/watchdog/davinci_wdt.c b/drivers/watchdog/davinci_wdt.c index 1782c79eff06..2ec36e0d8cfe 100644 --- a/drivers/watchdog/davinci_wdt.c +++ b/drivers/watchdog/davinci_wdt.c @@ -23,7 +23,7 @@ #include <linux/platform_device.h> #include <linux/spinlock.h> -#include <asm/hardware.h> +#include <asm/arch/hardware.h> #include <asm/uaccess.h> #include <asm/io.h> diff --git a/drivers/watchdog/ep93xx_wdt.c b/drivers/watchdog/ep93xx_wdt.c index 0e4787a0bb87..7476844dbac3 100644 --- a/drivers/watchdog/ep93xx_wdt.c +++ b/drivers/watchdog/ep93xx_wdt.c @@ -29,7 +29,7 @@ #include <linux/watchdog.h> #include <linux/timer.h> -#include <asm/hardware.h> +#include <asm/arch/hardware.h> #include <asm/uaccess.h> #define WDT_VERSION "0.3" diff --git a/drivers/watchdog/iop_wdt.c b/drivers/watchdog/iop_wdt.c index bbbd91af754d..d37146f11e47 100644 --- a/drivers/watchdog/iop_wdt.c +++ b/drivers/watchdog/iop_wdt.c @@ -32,7 +32,7 @@ #include <linux/miscdevice.h> #include <linux/watchdog.h> #include <linux/uaccess.h> -#include <asm/hardware.h> +#include <asm/arch/hardware.h> static int nowayout = WATCHDOG_NOWAYOUT; static unsigned long wdt_status; diff --git a/drivers/watchdog/ixp2000_wdt.c b/drivers/watchdog/ixp2000_wdt.c index dc7548dcaf35..884c2b435bea 100644 --- a/drivers/watchdog/ixp2000_wdt.c +++ b/drivers/watchdog/ixp2000_wdt.c @@ -26,7 +26,7 @@ #include <linux/init.h> #include <linux/bitops.h> -#include <asm/hardware.h> +#include <asm/arch/hardware.h> #include <asm/uaccess.h> static int nowayout = WATCHDOG_NOWAYOUT; diff --git a/drivers/watchdog/ixp4xx_wdt.c b/drivers/watchdog/ixp4xx_wdt.c index 5864bb865cfe..d4d37dac1072 100644 --- a/drivers/watchdog/ixp4xx_wdt.c +++ b/drivers/watchdog/ixp4xx_wdt.c @@ -23,7 +23,7 @@ #include <linux/init.h> #include <linux/bitops.h> -#include <asm/hardware.h> +#include <asm/arch/hardware.h> #include <asm/uaccess.h> static int nowayout = WATCHDOG_NOWAYOUT; diff --git a/drivers/watchdog/omap_wdt.c b/drivers/watchdog/omap_wdt.c index 74bc39aa1ce8..6dfb9cf15582 100644 --- a/drivers/watchdog/omap_wdt.c +++ b/drivers/watchdog/omap_wdt.c @@ -43,7 +43,7 @@ #include <asm/io.h> #include <asm/uaccess.h> -#include <asm/hardware.h> +#include <asm/arch/hardware.h> #include <asm/arch/prcm.h> diff --git a/drivers/watchdog/pnx4008_wdt.c b/drivers/watchdog/pnx4008_wdt.c index 6b8483d3c783..11a206781d0f 100644 --- a/drivers/watchdog/pnx4008_wdt.c +++ b/drivers/watchdog/pnx4008_wdt.c @@ -29,7 +29,7 @@ #include <linux/clk.h> #include <linux/spinlock.h> -#include <asm/hardware.h> +#include <asm/arch/hardware.h> #include <asm/uaccess.h> #include <asm/io.h> diff --git a/drivers/watchdog/sa1100_wdt.c b/drivers/watchdog/sa1100_wdt.c index 34a2b3b81800..d985cba40dde 100644 --- a/drivers/watchdog/sa1100_wdt.c +++ b/drivers/watchdog/sa1100_wdt.c @@ -31,7 +31,7 @@ #include <asm/arch/pxa-regs.h> #endif -#include <asm/hardware.h> +#include <asm/arch/hardware.h> #include <asm/uaccess.h> #define OSCR_FREQ CLOCK_TICK_RATE diff --git a/drivers/watchdog/wdt285.c b/drivers/watchdog/wdt285.c index e4cf661dc890..00cd6f21e769 100644 --- a/drivers/watchdog/wdt285.c +++ b/drivers/watchdog/wdt285.c @@ -29,7 +29,7 @@ #include <asm/irq.h> #include <asm/uaccess.h> -#include <asm/hardware.h> +#include <asm/arch/hardware.h> #include <asm/mach-types.h> #include <asm/hardware/dec21285.h> |