diff options
| author | David S. Miller <davem@davemloft.net> | 2010-04-13 03:28:45 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-04-13 03:28:45 -0400 |
| commit | 9343af084c7e8911897b0883042ee690cee3aaef (patch) | |
| tree | 6211a4bdc84690bec6530d27a3abb19f5e8bb8f3 /arch/arm/mach-versatile | |
| parent | e182c77cc291456eed127b1472952ddb59a81a9d (diff) | |
| parent | 0d0fb0f9c5fddef4a10242fe3337f00f528a3099 (diff) | |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Conflicts:
lib/Kconfig.debug
Diffstat (limited to 'arch/arm/mach-versatile')
| -rw-r--r-- | arch/arm/mach-versatile/core.c | 1 | ||||
| -rw-r--r-- | arch/arm/mach-versatile/pci.c | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-versatile/core.c b/arch/arm/mach-versatile/core.c index 9ddb49b1cb71..3b1a4ee01815 100644 --- a/arch/arm/mach-versatile/core.c +++ b/arch/arm/mach-versatile/core.c | |||
| @@ -32,6 +32,7 @@ | |||
| 32 | #include <linux/clockchips.h> | 32 | #include <linux/clockchips.h> |
| 33 | #include <linux/cnt32_to_63.h> | 33 | #include <linux/cnt32_to_63.h> |
| 34 | #include <linux/io.h> | 34 | #include <linux/io.h> |
| 35 | #include <linux/gfp.h> | ||
| 35 | 36 | ||
| 36 | #include <asm/clkdev.h> | 37 | #include <asm/clkdev.h> |
| 37 | #include <asm/system.h> | 38 | #include <asm/system.h> |
diff --git a/arch/arm/mach-versatile/pci.c b/arch/arm/mach-versatile/pci.c index 7161ba23b58a..334f0df4e948 100644 --- a/arch/arm/mach-versatile/pci.c +++ b/arch/arm/mach-versatile/pci.c | |||
| @@ -16,7 +16,6 @@ | |||
| 16 | */ | 16 | */ |
| 17 | #include <linux/kernel.h> | 17 | #include <linux/kernel.h> |
| 18 | #include <linux/pci.h> | 18 | #include <linux/pci.h> |
| 19 | #include <linux/slab.h> | ||
| 20 | #include <linux/ioport.h> | 19 | #include <linux/ioport.h> |
| 21 | #include <linux/interrupt.h> | 20 | #include <linux/interrupt.h> |
| 22 | #include <linux/spinlock.h> | 21 | #include <linux/spinlock.h> |