diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-05-17 12:24:04 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-05-17 12:24:04 -0400 |
| commit | ac1d426e825ab5778995f2f6f053ca2e6b45c622 (patch) | |
| tree | 75b91356ca39463e0112931aa6790802fb1e07a2 /arch/arm/mach-u300 | |
| parent | fda0e18c8a7a3e02747c2b045b4fcd2c920410b9 (diff) | |
| parent | a3685f00652af83f12b63e3b4ef48f29581ba48b (diff) | |
Merge branch 'devel-stable' into devel
Conflicts:
arch/arm/Kconfig
arch/arm/include/asm/system.h
arch/arm/mm/Kconfig
Diffstat (limited to 'arch/arm/mach-u300')
| -rw-r--r-- | arch/arm/mach-u300/dummyspichip.c | 1 | ||||
| -rw-r--r-- | arch/arm/mach-u300/mmc.c | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-u300/dummyspichip.c b/arch/arm/mach-u300/dummyspichip.c index 962f9de454de..5f55012b7c9e 100644 --- a/arch/arm/mach-u300/dummyspichip.c +++ b/arch/arm/mach-u300/dummyspichip.c | |||
| @@ -15,6 +15,7 @@ | |||
| 15 | #include <linux/mutex.h> | 15 | #include <linux/mutex.h> |
| 16 | #include <linux/spi/spi.h> | 16 | #include <linux/spi/spi.h> |
| 17 | #include <linux/dma-mapping.h> | 17 | #include <linux/dma-mapping.h> |
| 18 | #include <linux/slab.h> | ||
| 18 | /* | 19 | /* |
| 19 | * WARNING! Do not include this pl022-specific controller header | 20 | * WARNING! Do not include this pl022-specific controller header |
| 20 | * for any generic driver. It is only done in this dummy chip | 21 | * for any generic driver. It is only done in this dummy chip |
diff --git a/arch/arm/mach-u300/mmc.c b/arch/arm/mach-u300/mmc.c index 783f1236fe1b..88506d030596 100644 --- a/arch/arm/mach-u300/mmc.c +++ b/arch/arm/mach-u300/mmc.c | |||
| @@ -20,6 +20,7 @@ | |||
| 20 | #include <linux/regulator/machine.h> | 20 | #include <linux/regulator/machine.h> |
| 21 | #include <linux/gpio.h> | 21 | #include <linux/gpio.h> |
| 22 | #include <linux/amba/mmci.h> | 22 | #include <linux/amba/mmci.h> |
| 23 | #include <linux/slab.h> | ||
| 23 | 24 | ||
| 24 | #include "mmc.h" | 25 | #include "mmc.h" |
| 25 | #include "padmux.h" | 26 | #include "padmux.h" |