diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-12-04 10:15:28 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-12-04 10:15:28 +1100 |
| commit | f092c1eacebcaa1c0e85cd358ccde6aa27343aee (patch) | |
| tree | 013543715ab100a2fad2166616f8d55bade3bc73 /drivers/mfd/ucb1x00-ts.c | |
| parent | b197ce48f5c7f0ab9d9273a7dd87d9ef8add65dc (diff) | |
| parent | 7ec80ddf0455ff3854a5ca524952d91b5eb676b2 (diff) | |
Merge commit 'arm/devel'
Diffstat (limited to 'drivers/mfd/ucb1x00-ts.c')
| -rw-r--r-- | drivers/mfd/ucb1x00-ts.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mfd/ucb1x00-ts.c b/drivers/mfd/ucb1x00-ts.c index 44762ca86a8d..61b7d3eb9a2f 100644 --- a/drivers/mfd/ucb1x00-ts.c +++ b/drivers/mfd/ucb1x00-ts.c @@ -31,7 +31,7 @@ #include <linux/slab.h> #include <linux/kthread.h> -#include <asm/dma.h> +#include <mach/dma.h> #include <mach/collie.h> #include <asm/mach-types.h> |