OpenE2K/linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

V4L/DVB (7486): radio-cadet: wrap PNP probe code in #ifdef CONFIG_PNP

Browse Source 
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>
This commit is contained in:
Bjorn Helgaas 2008-03-31 21:21:48 -03:00 committed by Mauro Carvalho Chehab
parent 19ac111c03
commit 044dfc99fe
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/media/radio/radio-cadet.c
View File

@ -587,6 +587,8 @@ static struct video_device cadet_radio=
.vidioc_s_input = vidioc_s_input, .vidioc_s_input = vidioc_s_input,
}; };
#ifdef CONFIG_PNP
static struct pnp_device_id cadet_pnp_devices[] = { static struct pnp_device_id cadet_pnp_devices[] = {
/* ADS Cadet AM/FM Radio Card */ /* ADS Cadet AM/FM Radio Card */
{.id = "MSM0c24", .driver_data = 0}, {.id = "MSM0c24", .driver_data = 0},
@ -621,6 +623,10 @@ static struct pnp_driver cadet_pnp_driver = {
.remove = NULL, .remove = NULL,
}; };
#else
static struct pnp_driver cadet_pnp_driver;
#endif
static int cadet_probe(void) static int cadet_probe(void)
{ {
static int iovals[8]={0x330,0x332,0x334,0x336,0x338,0x33a,0x33c,0x33e}; static int iovals[8]={0x330,0x332,0x334,0x336,0x338,0x33a,0x33c,0x33e};