From 327c60eb39adce14e54b565cb9ce0f657e8c58e4 Mon Sep 17 00:00:00 2001
From: Michael Krufky <mkrufky@linuxtv.org>
Date: Tue, 23 May 2006 18:39:29 -0300
Subject: [PATCH] --- yaml --- r: 29975 b: refs/heads/master c:
 2938d7800f2ea2f8ad88d5b241cbda868875e965 h: refs/heads/master i:   29973:
 a51aadccf609fe8d198c75e54020881dfeb9c581   29971:
 4fc61dc59a31125d65db760bf843484cba5ddcab   29967:
 9a0322119ca110ce35f5aaa7d5e7bdf2b35ad9ee v: v3

---
 [refs]                                         | 2 +-
 trunk/drivers/media/radio/Makefile             | 2 ++
 trunk/drivers/media/radio/miropcm20-radio.c    | 2 +-
 trunk/drivers/media/radio/miropcm20-rds-core.c | 2 +-
 4 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 06c15cea27ae..4e8b41e4389e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6e2040900467f3a80a3be558c7094ff022fb8cb4
+refs/heads/master: 2938d7800f2ea2f8ad88d5b241cbda868875e965
diff --git a/trunk/drivers/media/radio/Makefile b/trunk/drivers/media/radio/Makefile
index 8b351945d066..e95b6805e002 100644
--- a/trunk/drivers/media/radio/Makefile
+++ b/trunk/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/trunk/drivers/media/radio/miropcm20-radio.c b/trunk/drivers/media/radio/miropcm20-radio.c
index ba1f0c105099..7765c6a0cfe6 100644
--- a/trunk/drivers/media/radio/miropcm20-radio.c
+++ b/trunk/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/trunk/drivers/media/radio/miropcm20-rds-core.c b/trunk/drivers/media/radio/miropcm20-rds-core.c
index dfb8252b23ef..9428d8b2642c 100644
--- a/trunk/drivers/media/radio/miropcm20-rds-core.c
+++ b/trunk/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