From a009555d3b8b9bbc985a8cb8ce2f834c7d77faf1 Mon Sep 17 00:00:00 2001 From: Michael Krufky Date: Tue, 23 May 2006 17:39:29 -0400 Subject: miropcm20: fix sub-optimal header inclusion for sound/oss/aci.h From: Michael Krufky Signed-off-by: Michael Krufky --- linux/drivers/media/radio/Makefile | 2 ++ linux/drivers/media/radio/miropcm20-radio.c | 6 +----- linux/drivers/media/radio/miropcm20-rds-core.c | 6 +----- 3 files changed, 4 insertions(+), 10 deletions(-) diff --git a/linux/drivers/media/radio/Makefile b/linux/drivers/media/radio/Makefile index 8b351945d..e95b6805e 100644 --- a/linux/drivers/media/radio/Makefile +++ b/linux/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/linux/drivers/media/radio/miropcm20-radio.c b/linux/drivers/media/radio/miropcm20-radio.c index 1a625e24c..5bf45ec4c 100644 --- a/linux/drivers/media/radio/miropcm20-radio.c +++ b/linux/drivers/media/radio/miropcm20-radio.c @@ -23,11 +23,7 @@ #include #include "compat.h" #include -#ifdef _COMPAT_H -#include "../sound/oss/aci.h" -#else -#include "../../../sound/oss/aci.h" -#endif +#include "oss/aci.h" #include "miropcm20-rds-core.h" static int radio_nr = -1; diff --git a/linux/drivers/media/radio/miropcm20-rds-core.c b/linux/drivers/media/radio/miropcm20-rds-core.c index a9972dfc1..a29942cdf 100644 --- a/linux/drivers/media/radio/miropcm20-rds-core.c +++ b/linux/drivers/media/radio/miropcm20-rds-core.c @@ -24,11 +24,7 @@ #endif #include -#ifdef _COMPAT_H -#include "../sound/oss/aci.h" -#else -#include "../../../sound/oss/aci.h" -#endif +#include "oss/aci.h" #include "miropcm20-rds-core.h" #define DEBUG 0 -- cgit v1.2.3