projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/jk/spufs into...
[linux-2.6-block.git]
/
drivers
/
mfd
/
ucb1x00-core.c
diff --git
a/drivers/mfd/ucb1x00-core.c
b/drivers/mfd/ucb1x00-core.c
index f6b10dda31fdfd3f09bc070446956b1113b61f3f..a316f1b759332ff763e76b4a04f9d897daed3130 100644
(file)
--- a/
drivers/mfd/ucb1x00-core.c
+++ b/
drivers/mfd/ucb1x00-core.c
@@
-26,7
+26,7
@@
#include <linux/mutex.h>
#include <asm/dma.h>
-#include <
asm
/hardware.h>
+#include <
mach
/hardware.h>
#include "ucb1x00.h"