diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-03-31 21:21:48 +0000 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-03-31 21:21:48 +0000 |
| commit | 4b455c2ad8e39901902e05f4ced044d714d4c7e1 (patch) | |
| tree | a3fae113be66f964ad40b42271091c8b972cabc8 | |
| parent | bad7da014e86f3c4650fcceb1a14dca288416768 (diff) | |
| download | mediapointer-dvb-s2-4b455c2ad8e39901902e05f4ced044d714d4c7e1.tar.gz mediapointer-dvb-s2-4b455c2ad8e39901902e05f4ced044d714d4c7e1.tar.bz2 | |
radio-cadet: wrap PNP probe code in #ifdef CONFIG_PNP
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>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
| -rw-r--r-- | linux/drivers/media/radio/radio-cadet.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/linux/drivers/media/radio/radio-cadet.c b/linux/drivers/media/radio/radio-cadet.c index b767c3117..007821aea 100644 --- a/linux/drivers/media/radio/radio-cadet.c +++ b/linux/drivers/media/radio/radio-cadet.c @@ -619,6 +619,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}, @@ -653,6 +655,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}; |