At Wed, 01 Jun 2011 19:05:03 +0100, ralf@linux-mips.org wrote:

Signed-off-by: Ralf Baechle ralf@linux-mips.org To: linux-kernel@vger.kernel.org Cc: Jaroslav Kysela perex@perex.cz Cc: Takashi Iwai tiwai@suse.de Cc: alsa-devel@alsa-project.org

Acked-by: Takashi Iwai tiwai@suse.de

thanks,

Takashi

sound/drivers/pcsp/pcsp.h | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-)

Index: linux-mips/sound/drivers/pcsp/pcsp.h

--- linux-mips.orig/sound/drivers/pcsp/pcsp.h +++ linux-mips/sound/drivers/pcsp/pcsp.h @@ -10,14 +10,8 @@ #define __PCSP_H__

#include <linux/hrtimer.h> -#include <linux/timex.h> -#if defined(CONFIG_MIPS) || defined(CONFIG_X86) -/* Use the global PIT lock ! */ #include <linux/i8253.h> -#else -#include <asm/8253pit.h> -static DEFINE_RAW_SPINLOCK(i8253_lock); -#endif +#include <linux/timex.h>

#define PCSP_SOUND_VERSION 0x400 /* read 4.00 */ #define PCSP_DEBUG 0

---

Alsa-devel mailing list Alsa-devel@alsa-project.org http://mailman.alsa-project.org/mailman/listinfo/alsa-devel