diff options
| author | Tony Luck <tony.luck@intel.com> | 2005-07-08 11:52:42 -0400 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2005-07-08 11:52:42 -0400 |
| commit | 88c3cdfdde3cf87e1831265ea4246430bef34fc9 (patch) | |
| tree | caea510ffb2f81a5ea13b00ecb8a4146ad462048 /drivers/pcmcia/soc_common.h | |
| parent | 2b2c3750330325ae5071582b5c4dbdf1c8bc1e51 (diff) | |
| parent | a92b7b80579fe68fe229892815c750f6652eb6a9 (diff) | |
Auto merge with /home/aegl/GIT/linus
Diffstat (limited to 'drivers/pcmcia/soc_common.h')
| -rw-r--r-- | drivers/pcmcia/soc_common.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/pcmcia/soc_common.h b/drivers/pcmcia/soc_common.h index 700a155fbc78..6f14126889b3 100644 --- a/drivers/pcmcia/soc_common.h +++ b/drivers/pcmcia/soc_common.h | |||
| @@ -11,7 +11,6 @@ | |||
| 11 | 11 | ||
| 12 | /* include the world */ | 12 | /* include the world */ |
| 13 | #include <linux/cpufreq.h> | 13 | #include <linux/cpufreq.h> |
| 14 | #include <pcmcia/version.h> | ||
| 15 | #include <pcmcia/cs_types.h> | 14 | #include <pcmcia/cs_types.h> |
| 16 | #include <pcmcia/cs.h> | 15 | #include <pcmcia/cs.h> |
| 17 | #include <pcmcia/ss.h> | 16 | #include <pcmcia/ss.h> |