From: Bjorn Helgaas <bjorn.helgaas@hp.com>

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>
Cc: Mauro Carvalho Chehab <mchehab@infradead.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 drivers/media/radio/radio-cadet.c |    6 ++++++
 1 file changed, 6 insertions(+)

diff -puN drivers/media/radio/radio-cadet.c~radio-cadet-wrap-pnp-probe-code-in-ifdef-config_pnp drivers/media/radio/radio-cadet.c
--- a/drivers/media/radio/radio-cadet.c~radio-cadet-wrap-pnp-probe-code-in-ifdef-config_pnp
+++ a/drivers/media/radio/radio-cadet.c
@@ -589,6 +589,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},
@@ -623,6 +625,10 @@ static struct pnp_driver cadet_pnp_drive
 	.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};
_