lkml.org 
[lkml]   [2008]   [Mar]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[patch] radio-cadet: wrap PNP probe code in #ifdef CONFIG_PNP
Date
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>

Index: work7/drivers/media/radio/radio-cadet.c
===================================================================
--- work7.orig/drivers/media/radio/radio-cadet.c 2008-03-27 16:10:52.000000000 -0600
+++ work7/drivers/media/radio/radio-cadet.c 2008-03-27 17:02:20.000000000 -0600
@@ -587,6 +587,8 @@
.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 @@
.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};

\
 
 \ /
  Last update: 2008-03-28 00:11    [W:0.023 / U:0.552 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site