diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-12-09 01:14:38 -0500 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-12-09 01:14:38 -0500 |
| commit | bcd6acd51f3d4d1ada201e9bc5c40a31d6d80c71 (patch) | |
| tree | 2f6dffd2d3e4dd67355a224de7e7a960335a92fd /drivers/atm/ambassador.c | |
| parent | 11c34c7deaeeebcee342cbc35e1bb2a6711b2431 (diff) | |
| parent | 3ff6a468b45b5dfeb0e903e56f4eb27d34b2437c (diff) | |
Merge commit 'origin/master' into next
Conflicts:
include/linux/kvm.h
Diffstat (limited to 'drivers/atm/ambassador.c')
| -rw-r--r-- | drivers/atm/ambassador.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/atm/ambassador.c b/drivers/atm/ambassador.c index 66e181345b3a..8af23411743c 100644 --- a/drivers/atm/ambassador.c +++ b/drivers/atm/ambassador.c | |||
| @@ -2351,6 +2351,7 @@ static void __init amb_check_args (void) { | |||
| 2351 | MODULE_AUTHOR(maintainer_string); | 2351 | MODULE_AUTHOR(maintainer_string); |
| 2352 | MODULE_DESCRIPTION(description_string); | 2352 | MODULE_DESCRIPTION(description_string); |
| 2353 | MODULE_LICENSE("GPL"); | 2353 | MODULE_LICENSE("GPL"); |
| 2354 | MODULE_FIRMWARE("atmsar11.fw"); | ||
| 2354 | module_param(debug, ushort, 0644); | 2355 | module_param(debug, ushort, 0644); |
| 2355 | module_param(cmds, uint, 0); | 2356 | module_param(cmds, uint, 0); |
| 2356 | module_param(txs, uint, 0); | 2357 | module_param(txs, uint, 0); |