lkml.org 
[lkml]   [2001]   [Aug]   [21]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject2.4.9 emu10k1 circular dependency
Date
2.4.9 drivers/sound/emu10k1/passthrough.h includes hwaccess.h which
includes passthrough.h. Since passthrough.h is only called from two
sources, both of which already include hwaccess.h, remove hwaccess.h
from passthrough.h and remove passthrough.h from the sources.

Index: 9.1/drivers/sound/emu10k1/audio.c
--- 9.1/drivers/sound/emu10k1/audio.c Tue, 21 Aug 2001 16:48:26 +1000 kaos (linux-2.4/M/b/33_audio.c 1.3.2.1.1.1.1.4 644)
+++ 9.1(w)/drivers/sound/emu10k1/audio.c Tue, 21 Aug 2001 20:07:15 +1000 kaos (linux-2.4/M/b/33_audio.c 1.3.2.1.1.1.1.4 644)
@@ -49,7 +49,6 @@
#include "irqmgr.h"
#include "audio.h"
#include "8010.h"
-#include "passthrough.h"

static void calculate_ofrag(struct woinst *);
static void calculate_ifrag(struct wiinst *);
Index: 9.1/drivers/sound/emu10k1/passthrough.h
--- 9.1/drivers/sound/emu10k1/passthrough.h Mon, 13 Aug 2001 14:14:10 +1000 kaos (linux-2.4/Q/e/0_passthroug 1.1.1.1 644)
+++ 9.1(w)/drivers/sound/emu10k1/passthrough.h Tue, 21 Aug 2001 20:07:33 +1000 kaos (linux-2.4/Q/e/0_passthroug 1.1.1.1 644)
@@ -32,7 +32,6 @@
#ifndef _PASSTHROUGH_H
#define _PASSTHROUGH_H

-#include "hwaccess.h"
#include "audio.h"

/* number of 16-bit stereo samples in XTRAM buffer */
Index: 9.1/drivers/sound/emu10k1/passthrough.c
--- 9.1/drivers/sound/emu10k1/passthrough.c Sat, 11 Aug 2001 14:45:11 +1000 kaos (linux-2.4/Q/e/1_passthroug 1.1 644)
+++ 9.1(w)/drivers/sound/emu10k1/passthrough.c Tue, 21 Aug 2001 20:07:25 +1000 kaos (linux-2.4/Q/e/1_passthroug 1.1 644)
@@ -47,7 +47,6 @@
#include "irqmgr.h"
#include "audio.h"
#include "8010.h"
-#include "passthrough.h"

static void pt_putsamples(struct pt_data *pt, u16 *ptr, u16 left, u16 right)
{
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

\
 
 \ /
  Last update: 2005-03-22 12:57    [from the cache]
©2003-2011 Jasper Spaans