diff options
author | Anton Vorontsov <cbouatmailru@gmail.com> | 2010-04-26 19:56:19 +0200 |
---|---|---|
committer | Anton Vorontsov <cbouatmailru@gmail.com> | 2010-04-26 19:56:19 +0200 |
commit | 8ef1bb539203629f77a61976e4f25415e1083bff (patch) | |
tree | 4fee25aca0928f112716fb02d27b1b355d0843b4 /sound/pcmcia/pdaudiocf/pdaudiocf_pcm.c | |
parent | pda_power: Add function callbacks for suspend and resume (diff) | |
parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 (diff) | |
download | linux-8ef1bb539203629f77a61976e4f25415e1083bff.tar.xz linux-8ef1bb539203629f77a61976e4f25415e1083bff.zip |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'sound/pcmcia/pdaudiocf/pdaudiocf_pcm.c')
-rw-r--r-- | sound/pcmcia/pdaudiocf/pdaudiocf_pcm.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/sound/pcmcia/pdaudiocf/pdaudiocf_pcm.c b/sound/pcmcia/pdaudiocf/pdaudiocf_pcm.c index 0d668f471620..43f995a3f960 100644 --- a/sound/pcmcia/pdaudiocf/pdaudiocf_pcm.c +++ b/sound/pcmcia/pdaudiocf/pdaudiocf_pcm.c @@ -20,7 +20,6 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include <linux/slab.h> #include <linux/delay.h> #include <sound/core.h> #include <sound/asoundef.h> |