Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 044dfc99 authored by Bjorn Helgaas's avatar Bjorn Helgaas Committed by Mauro Carvalho Chehab
Browse files

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: default avatarBjorn Helgaas <bjorn.helgaas@hp.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@infradead.org>
parent 19ac111c

drivers/media/radio/radio-cadet.c

+6 −0
Original line number Original line Diff line number Diff line
@@ -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};