diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-07-30 11:52:08 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-07-30 11:52:08 +1000 |
| commit | 1a2d9afc9d3bff9579e2412bfbf215d112fe5c44 (patch) | |
| tree | 228ba8d1bf0ec40af6b9abdc46e7a46048ce53d8 /sound | |
| parent | c4fd2dcc4954fd84a1385dafeb7429e09bd999d6 (diff) | |
| parent | c65e5c72652d1084715fb0c918bad78e0a80face (diff) | |
Merge remote branch 'pcmcia/master'
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/pcmcia/pdaudiocf/pdaudiocf.h | 1 | ||||
| -rw-r--r-- | sound/pcmcia/vx/vxpocket.h | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/sound/pcmcia/pdaudiocf/pdaudiocf.h b/sound/pcmcia/pdaudiocf/pdaudiocf.h index a0a7ec64222a..5cc3e4573074 100644 --- a/sound/pcmcia/pdaudiocf/pdaudiocf.h +++ b/sound/pcmcia/pdaudiocf/pdaudiocf.h @@ -24,7 +24,6 @@ #include <sound/pcm.h> #include <asm/io.h> #include <linux/interrupt.h> -#include <pcmcia/cs_types.h> #include <pcmcia/cs.h> #include <pcmcia/cistpl.h> #include <pcmcia/ds.h> diff --git a/sound/pcmcia/vx/vxpocket.h b/sound/pcmcia/vx/vxpocket.h index ea4df16a28ef..d9110669d042 100644 --- a/sound/pcmcia/vx/vxpocket.h +++ b/sound/pcmcia/vx/vxpocket.h @@ -23,7 +23,6 @@ #include <sound/vx_core.h> -#include <pcmcia/cs_types.h> #include <pcmcia/cs.h> #include <pcmcia/cistpl.h> #include <pcmcia/ds.h> |