diff options
author | Tony Luck <tony.luck@intel.com> | 2005-07-08 08:52:42 -0700 |
---|---|---|
committer | Tony Luck <tony.luck@intel.com> | 2005-07-08 08:52:42 -0700 |
commit | 88c3cdfdde3cf87e1831265ea4246430bef34fc9 (patch) | |
tree | caea510ffb2f81a5ea13b00ecb8a4146ad462048 /drivers/pcmcia/m32r_cfc.c | |
parent | [PATCH] Documentation (diff) | |
parent | [PATCH] Add MAINTAINERS entry for audit subsystem (diff) | |
download | linux-dev-88c3cdfdde3cf87e1831265ea4246430bef34fc9.tar.xz linux-dev-88c3cdfdde3cf87e1831265ea4246430bef34fc9.zip |
Auto merge with /home/aegl/GIT/linus
Diffstat (limited to 'drivers/pcmcia/m32r_cfc.c')
-rw-r--r-- | drivers/pcmcia/m32r_cfc.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/pcmcia/m32r_cfc.c b/drivers/pcmcia/m32r_cfc.c index b1111c6bf062..65f3ee3d4d3c 100644 --- a/drivers/pcmcia/m32r_cfc.c +++ b/drivers/pcmcia/m32r_cfc.c @@ -29,7 +29,6 @@ #include <asm/io.h> #include <asm/system.h> -#include <pcmcia/version.h> #include <pcmcia/cs_types.h> #include <pcmcia/ss.h> #include <pcmcia/cs.h> |