summaryrefslogtreecommitdiffstats
path: root/include/sound/snd_wavefront.h
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-10-13 10:52:30 +0200
committerIngo Molnar <mingo@elte.hu>2008-10-13 10:52:30 +0200
commitc493756e2a8a78bcaae30668317890dcfe86e7c3 (patch)
tree8fb40782e79472ed882ff2098d4dd295557278ee /include/sound/snd_wavefront.h
parent0d15504f16f68725e4635aa85411015d1c573b0a (diff)
parent4480f15b3306f43bbb0310d461142b4e897ca45b (diff)
downloadop-kernel-dev-c493756e2a8a78bcaae30668317890dcfe86e7c3.zip
op-kernel-dev-c493756e2a8a78bcaae30668317890dcfe86e7c3.tar.gz
Merge branch 'linus' into oprofile
Conflicts: arch/x86/kernel/apic_32.c include/linux/pci_ids.h
Diffstat (limited to 'include/sound/snd_wavefront.h')
-rw-r--r--include/sound/snd_wavefront.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/include/sound/snd_wavefront.h b/include/sound/snd_wavefront.h
index 9688d4b..fa149ca 100644
--- a/include/sound/snd_wavefront.h
+++ b/include/sound/snd_wavefront.h
@@ -1,7 +1,6 @@
#ifndef __SOUND_SND_WAVEFRONT_H__
#define __SOUND_SND_WAVEFRONT_H__
-#include "cs4231.h"
#include "mpu401.h"
#include "hwdep.h"
#include "rawmidi.h"
OpenPOWER on IntegriCloud