Skip to content

L
linux-davinci
Commit 8029db12 authored by Russell King's avatar Russell King Committed by Russell King
Browse files
Options

[ARM] Convert asm/delay.h to linux/delay.h 

Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent fced80c7
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
arch/arm/mach-ixp4xx/ixdp425-setup.c
View file @ 8029db12
...@@ -20,6 +20,7 @@ ...@@ -20,6 +20,7 @@
#include <linux/mtd/mtd.h> #include <linux/mtd/mtd.h>
#include <linux/mtd/nand.h> #include <linux/mtd/nand.h>
#include <linux/mtd/partitions.h> #include <linux/mtd/partitions.h>
#include <linux/delay.h>
#include <asm/types.h> #include <asm/types.h>
#include <asm/setup.h> #include <asm/setup.h>
...@@ -29,7 +30,6 @@ ...@@ -29,7 +30,6 @@
#include <asm/irq.h> #include <asm/irq.h>
#include <asm/mach/arch.h> #include <asm/mach/arch.h>
#include <asm/mach/flash.h> #include <asm/mach/flash.h>
#include <asm/delay.h>
static struct flash_platform_data ixdp425_flash_data = { static struct flash_platform_data ixdp425_flash_data = {
.map_name = "cfi_probe", .map_name = "cfi_probe",
......
arch/arm/plat-s3c24xx/cpu.c
View file @ 8029db12
...@@ -30,10 +30,10 @@ ...@@ -30,10 +30,10 @@
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <linux/delay.h> #include <linux/delay.h>
#include <linux/io.h> #include <linux/io.h>
#include <linux/delay.h>
#include <mach/hardware.h> #include <mach/hardware.h>
#include <asm/irq.h> #include <asm/irq.h>
#include <asm/delay.h>
#include <asm/cacheflush.h> #include <asm/cacheflush.h>
#include <asm/mach/arch.h> #include <asm/mach/arch.h>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment