From: Michael Krufky <mkrufky@linuxtv.org>
Date: Tue, 23 May 2006 21:39:29 +0000 (-0300)
Subject: V4L/DVB (4043): Miropcm20: fix sub-optimal header inclusion for sound/oss/aci.h
X-Git-Tag: v2.6.18-rc1~862^2~102
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=2938d7800f2ea2f8ad88d5b241cbda868875e965;p=~emulex%2Finfiniband.git

V4L/DVB (4043): Miropcm20: fix sub-optimal header inclusion for sound/oss/aci.h

Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
---

diff --git a/drivers/media/radio/Makefile b/drivers/media/radio/Makefile
index 8b351945d06..e95b6805e00 100644
--- a/drivers/media/radio/Makefile
+++ b/drivers/media/radio/Makefile
@@ -20,3 +20,5 @@ obj-$(CONFIG_RADIO_GEMTEK) += radio-gemtek.o
 obj-$(CONFIG_RADIO_GEMTEK_PCI) += radio-gemtek-pci.o
 obj-$(CONFIG_RADIO_TRUST) += radio-trust.o
 obj-$(CONFIG_RADIO_MAESTRO) += radio-maestro.o
+
+EXTRA_CFLAGS += -Isound
diff --git a/drivers/media/radio/miropcm20-radio.c b/drivers/media/radio/miropcm20-radio.c
index ba1f0c10509..7765c6a0cfe 100644
--- a/drivers/media/radio/miropcm20-radio.c
+++ b/drivers/media/radio/miropcm20-radio.c
@@ -22,7 +22,7 @@
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/videodev.h>
-#include "../../../sound/oss/aci.h"
+#include "oss/aci.h"
 #include "miropcm20-rds-core.h"
 
 static int radio_nr = -1;
diff --git a/drivers/media/radio/miropcm20-rds-core.c b/drivers/media/radio/miropcm20-rds-core.c
index dfb8252b23e..9428d8b2642 100644
--- a/drivers/media/radio/miropcm20-rds-core.c
+++ b/drivers/media/radio/miropcm20-rds-core.c
@@ -21,7 +21,7 @@
 #include <linux/mutex.h>
 
 #include <asm/io.h>
-#include "../../../sound/oss/aci.h"
+#include "oss/aci.h"
 #include "miropcm20-rds-core.h"
 
 #define DEBUG 0