projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
[cascardo/linux.git]
/
include
/
asm-arm
/
arch-pxa
/
mmc.h
diff --git
a/include/asm-arm/arch-pxa/mmc.h
b/include/asm-arm/arch-pxa/mmc.h
index
a38a28c
..
ef4f570
100644
(file)
--- a/
include/asm-arm/arch-pxa/mmc.h
+++ b/
include/asm-arm/arch-pxa/mmc.h
@@
-1,7
+1,7
@@
#ifndef ASMARM_ARCH_MMC_H
#define ASMARM_ARCH_MMC_H
-#include <linux/mmc/
protocol
.h>
+#include <linux/mmc/
host
.h>
#include <linux/interrupt.h>
struct device;