diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2005-11-02 18:15:43 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2005-11-02 18:15:43 +1100 |
| commit | 2be7a906752abf8dce9350c23b6d1036049a5d3e (patch) | |
| tree | ef178fa5801bdce24938819086662bb747d8c0c2 /arch/arm/common | |
| parent | aaf8a7a2949481482200686c7bd3852e5be2e093 (diff) | |
| parent | fbf1769d08a8b085834dceb228540153ac2cd534 (diff) | |
Merge Paulus' tree
Diffstat (limited to 'arch/arm/common')
| -rw-r--r-- | arch/arm/common/locomo.c | 2 | ||||
| -rw-r--r-- | arch/arm/common/sa1111.c | 2 | ||||
| -rw-r--r-- | arch/arm/common/scoop.c | 3 |
3 files changed, 3 insertions, 4 deletions
diff --git a/arch/arm/common/locomo.c b/arch/arm/common/locomo.c index 5cdb4122f05..ad55680726e 100644 --- a/arch/arm/common/locomo.c +++ b/arch/arm/common/locomo.c @@ -22,7 +22,7 @@ #include <linux/delay.h> #include <linux/errno.h> #include <linux/ioport.h> -#include <linux/device.h> +#include <linux/platform_device.h> #include <linux/slab.h> #include <linux/spinlock.h> diff --git a/arch/arm/common/sa1111.c b/arch/arm/common/sa1111.c index 21e2a518ad3..174aa86ee81 100644 --- a/arch/arm/common/sa1111.c +++ b/arch/arm/common/sa1111.c @@ -22,7 +22,7 @@ #include <linux/ptrace.h> #include <linux/errno.h> #include <linux/ioport.h> -#include <linux/device.h> +#include <linux/platform_device.h> #include <linux/slab.h> #include <linux/spinlock.h> #include <linux/dma-mapping.h> diff --git a/arch/arm/common/scoop.c b/arch/arm/common/scoop.c index 4af0cf5f3bf..bb4eff61441 100644 --- a/arch/arm/common/scoop.c +++ b/arch/arm/common/scoop.c @@ -13,8 +13,7 @@ #include <linux/device.h> #include <linux/string.h> -#include <linux/slab.h> - +#include <linux/platform_device.h> #include <asm/io.h> #include <asm/hardware/scoop.h> |