From 8d603345359fae3fdc45c03f4599c9a869f2fa0d Mon Sep 17 00:00:00 2001
From: Bjorn Helgaas <bjorn.helgaas@hp.com>
Date: Mon, 31 Mar 2008 21:21:48 -0300
Subject: [PATCH] --- yaml --- r: 88072 b: refs/heads/master c:
 044dfc99fe3e1e0fa85bbdd1936ee229e399250c h: refs/heads/master v: v3

---
 [refs]                                  | 2 +-
 trunk/drivers/media/radio/radio-cadet.c | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index a4c0d7b6aa34..735be727513f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 19ac111c038537b73c9a0bca24bad123c2ba5f42
+refs/heads/master: 044dfc99fe3e1e0fa85bbdd1936ee229e399250c
diff --git a/trunk/drivers/media/radio/radio-cadet.c b/trunk/drivers/media/radio/radio-cadet.c
index 34e317ced5a3..57b9e3adc8f0 100644
--- a/trunk/drivers/media/radio/radio-cadet.c
+++ b/trunk/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};