aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBjorn Helgaas <bjorn.helgaas@hp.com>2008-03-31 21:21:48 -0300
committerMauro Carvalho Chehab <mchehab@infradead.org>2008-04-01 19:35:47 -0300
commit044dfc99fe3e1e0fa85bbdd1936ee229e399250c (patch)
tree867fc2488c083796bec12b88bfb46d54ac6f9a08
parent19ac111c038537b73c9a0bca24bad123c2ba5f42 (diff)
downloadkernel_samsung_tuna-044dfc99fe3e1e0fa85bbdd1936ee229e399250c.zip
kernel_samsung_tuna-044dfc99fe3e1e0fa85bbdd1936ee229e399250c.tar.gz
kernel_samsung_tuna-044dfc99fe3e1e0fa85bbdd1936ee229e399250c.tar.bz2
V4L/DVB (7486): radio-cadet: wrap PNP probe code in #ifdef CONFIG_PNP
Wrap PNP probe code in #ifdef CONFIG_PNP. Without this change, we'll have unresolved references to pnp_get_resource() function when CONFIG_PNP=n. (This is a new interface that's not in mainline yet.) Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
-rw-r--r--drivers/media/radio/radio-cadet.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/media/radio/radio-cadet.c b/drivers/media/radio/radio-cadet.c
index 34e317c..57b9e3a 100644
--- a/drivers/media/radio/radio-cadet.c
+++ b/drivers/media/radio/radio-cadet.c
@@ -587,6 +587,8 @@ static struct video_device cadet_radio=
.vidioc_s_input = vidioc_s_input,
};
+#ifdef CONFIG_PNP
+
static struct pnp_device_id cadet_pnp_devices[] = {
/* ADS Cadet AM/FM Radio Card */
{.id = "MSM0c24", .driver_data = 0},
@@ -621,6 +623,10 @@ static struct pnp_driver cadet_pnp_driver = {
.remove = NULL,
};
+#else
+static struct pnp_driver cadet_pnp_driver;
+#endif
+
static int cadet_probe(void)
{
static int iovals[8]={0x330,0x332,0x334,0x336,0x338,0x33a,0x33c,0x33e};