diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-30 17:39:56 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-30 17:39:56 +0200 |
| commit | 1dd465cac8d3ba18a9840d032f6604147269c031 (patch) | |
| tree | 78f00fdeae26d018def75e7517aa50e56f4994df /drivers/pcmcia | |
| parent | Merge master.kernel.org:/pub/scm/linux/kernel/git/chrisw/lsm-2.6 (diff) | |
| parent | [ARM] 2940/1: Fix BTB entry flush in arch/arm/mm/cache-v6.S (diff) | |
| download | linux-1dd465cac8d3ba18a9840d032f6604147269c031.tar.xz linux-1dd465cac8d3ba18a9840d032f6604147269c031.zip | |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
Diffstat (limited to 'drivers/pcmcia')
| -rw-r--r-- | drivers/pcmcia/omap_cf.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/pcmcia/omap_cf.c b/drivers/pcmcia/omap_cf.c index 08d1c9288264..94be9e51654e 100644 --- a/drivers/pcmcia/omap_cf.c +++ b/drivers/pcmcia/omap_cf.c @@ -22,7 +22,6 @@ #include <asm/hardware.h> #include <asm/io.h> -#include <asm/mach-types.h> #include <asm/sizes.h> #include <asm/arch/mux.h> |