aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Krufky <mkrufky@linuxtv.org>2006-05-23 17:39:29 -0400
committerMauro Carvalho Chehab <mchehab@infradead.org>2006-06-25 01:00:39 -0400
commit2938d7800f2ea2f8ad88d5b241cbda868875e965 (patch)
tree28b796cc6329ad761a6620670f3173f2acdc767d
parent6e2040900467f3a80a3be558c7094ff022fb8cb4 (diff)
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>
-rw-r--r--drivers/media/radio/Makefile2
-rw-r--r--drivers/media/radio/miropcm20-radio.c2
-rw-r--r--drivers/media/radio/miropcm20-rds-core.c2
3 files changed, 4 insertions, 2 deletions
diff --git a/drivers/media/radio/Makefile b/drivers/media/radio/Makefile
index 8b351945d066..e95b6805e002 100644
--- a/drivers/media/radio/Makefile
+++ b/drivers/media/radio/Makefile
@@ -20,3 +20,5 @@ obj-$(CONFIG_RADIO_GEMTEK) += radio-gemtek.o
20obj-$(CONFIG_RADIO_GEMTEK_PCI) += radio-gemtek-pci.o 20obj-$(CONFIG_RADIO_GEMTEK_PCI) += radio-gemtek-pci.o
21obj-$(CONFIG_RADIO_TRUST) += radio-trust.o 21obj-$(CONFIG_RADIO_TRUST) += radio-trust.o
22obj-$(CONFIG_RADIO_MAESTRO) += radio-maestro.o 22obj-$(CONFIG_RADIO_MAESTRO) += radio-maestro.o
23
24EXTRA_CFLAGS += -Isound
diff --git a/drivers/media/radio/miropcm20-radio.c b/drivers/media/radio/miropcm20-radio.c
index ba1f0c105099..7765c6a0cfe6 100644
--- a/drivers/media/radio/miropcm20-radio.c
+++ b/drivers/media/radio/miropcm20-radio.c
@@ -22,7 +22,7 @@
22#include <linux/module.h> 22#include <linux/module.h>
23#include <linux/init.h> 23#include <linux/init.h>
24#include <linux/videodev.h> 24#include <linux/videodev.h>
25#include "../../../sound/oss/aci.h" 25#include "oss/aci.h"
26#include "miropcm20-rds-core.h" 26#include "miropcm20-rds-core.h"
27 27
28static int radio_nr = -1; 28static int radio_nr = -1;
diff --git a/drivers/media/radio/miropcm20-rds-core.c b/drivers/media/radio/miropcm20-rds-core.c
index dfb8252b23ef..9428d8b2642c 100644
--- a/drivers/media/radio/miropcm20-rds-core.c
+++ b/drivers/media/radio/miropcm20-rds-core.c
@@ -21,7 +21,7 @@
21#include <linux/mutex.h> 21#include <linux/mutex.h>
22 22
23#include <asm/io.h> 23#include <asm/io.h>
24#include "../../../sound/oss/aci.h" 24#include "oss/aci.h"
25#include "miropcm20-rds-core.h" 25#include "miropcm20-rds-core.h"
26 26
27#define DEBUG 0 27#define DEBUG 0