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/mainstone.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/mainstone.c')
| -rw-r--r-- | arch/arm/mach-pxa/mainstone.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-pxa/mainstone.c b/arch/arm/mach-pxa/mainstone.c index a6c8429e975f..f4dabf0273ca 100644 --- a/arch/arm/mach-pxa/mainstone.c +++ b/arch/arm/mach-pxa/mainstone.c | |||
| @@ -46,7 +46,7 @@ | |||
| 46 | #include <mach/mainstone.h> | 46 | #include <mach/mainstone.h> |
| 47 | #include <mach/audio.h> | 47 | #include <mach/audio.h> |
| 48 | #include <mach/pxafb.h> | 48 | #include <mach/pxafb.h> |
| 49 | #include <mach/i2c.h> | 49 | #include <plat/i2c.h> |
| 50 | #include <mach/mmc.h> | 50 | #include <mach/mmc.h> |
| 51 | #include <mach/irda.h> | 51 | #include <mach/irda.h> |
| 52 | #include <mach/ohci.h> | 52 | #include <mach/ohci.h> |