diff options
| author | Dan Williams <dan.j.williams@intel.com> | 2009-09-08 20:55:21 -0400 |
|---|---|---|
| committer | Dan Williams <dan.j.williams@intel.com> | 2009-09-08 20:55:21 -0400 |
| commit | bbb20089a3275a19e475dbc21320c3742e3ca423 (patch) | |
| tree | 216fdc1cbef450ca688135c5b8969169482d9a48 /arch/arm/mach-pxa/tosa.c | |
| parent | 3e48e656903e9fd8bc805c6a2c4264d7808d315b (diff) | |
| parent | 657a77fa7284d8ae28dfa48f1dc5d919bf5b2843 (diff) | |
Merge branch 'dmaengine' into async-tx-next
Conflicts:
crypto/async_tx/async_xor.c
drivers/dma/ioat/dma_v2.h
drivers/dma/ioat/pci.c
drivers/md/raid5.c
Diffstat (limited to 'arch/arm/mach-pxa/tosa.c')
| -rw-r--r-- | arch/arm/mach-pxa/tosa.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/mach-pxa/tosa.c b/arch/arm/mach-pxa/tosa.c index a0bd46ef5d30..117ad5920e53 100644 --- a/arch/arm/mach-pxa/tosa.c +++ b/arch/arm/mach-pxa/tosa.c | |||
| @@ -31,7 +31,6 @@ | |||
| 31 | #include <linux/input.h> | 31 | #include <linux/input.h> |
| 32 | #include <linux/gpio.h> | 32 | #include <linux/gpio.h> |
| 33 | #include <linux/pda_power.h> | 33 | #include <linux/pda_power.h> |
| 34 | #include <linux/rfkill.h> | ||
| 35 | #include <linux/spi/spi.h> | 34 | #include <linux/spi/spi.h> |
| 36 | 35 | ||
| 37 | #include <asm/setup.h> | 36 | #include <asm/setup.h> |
| @@ -40,7 +39,7 @@ | |||
| 40 | #include <mach/pxa25x.h> | 39 | #include <mach/pxa25x.h> |
| 41 | #include <mach/reset.h> | 40 | #include <mach/reset.h> |
| 42 | #include <mach/irda.h> | 41 | #include <mach/irda.h> |
| 43 | #include <mach/i2c.h> | 42 | #include <plat/i2c.h> |
| 44 | #include <mach/mmc.h> | 43 | #include <mach/mmc.h> |
| 45 | #include <mach/udc.h> | 44 | #include <mach/udc.h> |
| 46 | #include <mach/tosa_bt.h> | 45 | #include <mach/tosa_bt.h> |