diff options
author | Paul Mackerras <paulus@samba.org> | 2008-09-10 11:36:13 +1000 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2008-09-10 11:36:13 +1000 |
commit | 7e392f8c29ee045c6a29d50193d2fb10712eceb0 (patch) | |
tree | c84097fe644c50c82f087ab7fa2d75167b8c0e16 /drivers/media/video/pms.c | |
parent | powerpc: Remove include of linux/of_device.h from asm/of_device.h (diff) | |
parent | Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip (diff) | |
download | linux-dev-7e392f8c29ee045c6a29d50193d2fb10712eceb0.tar.xz linux-dev-7e392f8c29ee045c6a29d50193d2fb10712eceb0.zip |
Merge branch 'linux-2.6'
Diffstat (limited to 'drivers/media/video/pms.c')
-rw-r--r-- | drivers/media/video/pms.c | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/drivers/media/video/pms.c b/drivers/media/video/pms.c index 00425d743656..7c84f795db54 100644 --- a/drivers/media/video/pms.c +++ b/drivers/media/video/pms.c @@ -1019,10 +1019,23 @@ static int init_mediavision(void) * Initialization and module stuff */ +#ifndef MODULE +static int enable; +module_param(enable, int, 0); +#endif + static int __init init_pms_cards(void) { printk(KERN_INFO "Mediavision Pro Movie Studio driver 0.02\n"); +#ifndef MODULE + if (!enable) { + printk(KERN_INFO "PMS: not enabled, use pms.enable=1 to " + "probe\n"); + return -ENODEV; + } +#endif + data_port = io_port +1; if(init_mediavision()) |