diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2010-08-16 04:32:24 (GMT) |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2010-08-16 04:32:24 (GMT) |
| commit | bbcf6e8b66ab2fb5ddab4d0fe40c2e6a5ebe5301 (patch) | |
| tree | 071fa9f86dc04a16570be367d04cff3b00c694ad /drivers/mmc/host/sdricoh_cs.c | |
| parent | 57682827b9a5edb52e33af0be9082b51bffcd5c7 (diff) | |
| parent | da5cabf80e2433131bf0ed8993abc0f7ea618c73 (diff) | |
| download | linux-fsl-qoriq-bbcf6e8b66ab2fb5ddab4d0fe40c2e6a5ebe5301.tar.xz | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
arch/sh/include/asm/Kbuild
drivers/Makefile
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'drivers/mmc/host/sdricoh_cs.c')
| -rw-r--r-- | drivers/mmc/host/sdricoh_cs.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/mmc/host/sdricoh_cs.c b/drivers/mmc/host/sdricoh_cs.c index e7507af..7aa65bb 100644 --- a/drivers/mmc/host/sdricoh_cs.c +++ b/drivers/mmc/host/sdricoh_cs.c @@ -30,7 +30,6 @@ #include <linux/ioport.h> #include <linux/scatterlist.h> -#include <pcmcia/cs_types.h> #include <pcmcia/cs.h> #include <pcmcia/cistpl.h> #include <pcmcia/ds.h> |