diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-04 21:44:12 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-04 21:44:12 -0500 |
| commit | db9edfd7e339ca4113153d887e782dd05be5a9eb (patch) | |
| tree | 0a4ba12447a0cabc800adc7e9667d284777b0181 /drivers/ide/ide-floppy.c | |
| parent | 631b034724364b413e8a52e7c2e03a9d77e4c2b4 (diff) | |
| parent | fd586bacf439f36dea9b9bf6e6133ac87df2730c (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-2.6
Trivial manual merge fixup for usb_find_interface clashes.
Diffstat (limited to 'drivers/ide/ide-floppy.c')
| -rw-r--r-- | drivers/ide/ide-floppy.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/ide/ide-floppy.c b/drivers/ide/ide-floppy.c index 9e293c8063dc..fba3fffc2d66 100644 --- a/drivers/ide/ide-floppy.c +++ b/drivers/ide/ide-floppy.c | |||
| @@ -2197,6 +2197,7 @@ static int __init idefloppy_init(void) | |||
| 2197 | return driver_register(&idefloppy_driver.gen_driver); | 2197 | return driver_register(&idefloppy_driver.gen_driver); |
| 2198 | } | 2198 | } |
| 2199 | 2199 | ||
| 2200 | MODULE_ALIAS("ide:*m-floppy*"); | ||
| 2200 | module_init(idefloppy_init); | 2201 | module_init(idefloppy_init); |
| 2201 | module_exit(idefloppy_exit); | 2202 | module_exit(idefloppy_exit); |
| 2202 | MODULE_LICENSE("GPL"); | 2203 | MODULE_LICENSE("GPL"); |