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-disk.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-disk.c')
| -rw-r--r-- | drivers/ide/ide-disk.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/ide/ide-disk.c b/drivers/ide/ide-disk.c index 449522f0540c..4e5767968d7f 100644 --- a/drivers/ide/ide-disk.c +++ b/drivers/ide/ide-disk.c | |||
| @@ -1271,6 +1271,7 @@ static int __init idedisk_init(void) | |||
| 1271 | return driver_register(&idedisk_driver.gen_driver); | 1271 | return driver_register(&idedisk_driver.gen_driver); |
| 1272 | } | 1272 | } |
| 1273 | 1273 | ||
| 1274 | MODULE_ALIAS("ide:*m-disk*"); | ||
| 1274 | module_init(idedisk_init); | 1275 | module_init(idedisk_init); |
| 1275 | module_exit(idedisk_exit); | 1276 | module_exit(idedisk_exit); |
| 1276 | MODULE_LICENSE("GPL"); | 1277 | MODULE_LICENSE("GPL"); |