diff options
| author | Greg Kroah-Hartman <greg@kroah.com> | 2004-07-14 03:00:00 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <greg@kroah.com> | 2004-07-14 03:00:00 -0700 |
| commit | 36208530bd9ed3758095549d77542ddd2f932bf0 (patch) | |
| tree | 8a7703ac0095894567a6da5aa9c8b72445c95dfe /security | |
| parent | 9e9c96deae089852ac33db3066be53b1060355ac (diff) | |
| parent | 3b08aa6456c9046529ed38556b1950145eb7aa7a (diff) | |
| download | history-36208530bd9ed3758095549d77542ddd2f932bf0.tar.gz | |
Merge kroah.com:/home/greg/linux/BK/bleed-2.6
into kroah.com:/home/greg/linux/BK/driver-2.6
Diffstat (limited to 'security')
| -rw-r--r-- | security/root_plug.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/security/root_plug.c b/security/root_plug.c index ec8955dcba2940..07651def2f782c 100644 --- a/security/root_plug.c +++ b/security/root_plug.c @@ -36,16 +36,16 @@ static int secondary; static int vendor_id = 0x0557; static int product_id = 0x2008; -MODULE_PARM(vendor_id, "h"); +module_param(vendor_id, uint, 0400); MODULE_PARM_DESC(vendor_id, "USB Vendor ID of device to look for"); -MODULE_PARM(product_id, "h"); +module_param(product_id, uint, 0400); MODULE_PARM_DESC(product_id, "USB Product ID of device to look for"); /* should we print out debug messages */ static int debug = 0; -MODULE_PARM(debug, "i"); +module_param(debug, bool, 0600); MODULE_PARM_DESC(debug, "Debug enabled or not"); #if defined(CONFIG_SECURITY_ROOTPLUG_MODULE) |