projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'perfcounters-core-for-linus' of git://git.kernel.org/pub/scm/linux...
[cascardo/linux.git]
/
drivers
/
mfd
/
mcp-sa11x0.c
diff --git
a/drivers/mfd/mcp-sa11x0.c
b/drivers/mfd/mcp-sa11x0.c
index
28380b2
..
62b32da
100644
(file)
--- a/
drivers/mfd/mcp-sa11x0.c
+++ b/
drivers/mfd/mcp-sa11x0.c
@@
-20,7
+20,7
@@
#include <linux/slab.h>
#include <linux/platform_device.h>
-#include <
asm
/dma.h>
+#include <
mach
/dma.h>
#include <mach/hardware.h>
#include <asm/mach-types.h>
#include <asm/system.h>