diff options
| author | Paul Mackerras <paulus@samba.org> | 2007-10-03 01:33:17 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2007-10-03 01:33:17 -0400 |
| commit | 70f227d8846a8a9b1f36f71c42e11cc7c6e9408d (patch) | |
| tree | fb4dd5c8240bdaada819fb569c01a392b52847b9 /drivers/ieee1394/ohci1394.c | |
| parent | a0c7ce9c877ceef8428798ac91fb794f83609aed (diff) | |
| parent | f778089cb2445dfc6dfd30a7a567925fd8589f1e (diff) | |
Merge branch 'linux-2.6' into for-2.6.24
Diffstat (limited to 'drivers/ieee1394/ohci1394.c')
| -rw-r--r-- | drivers/ieee1394/ohci1394.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/ieee1394/ohci1394.c b/drivers/ieee1394/ohci1394.c index 5667c8102efc..372c5c16eb31 100644 --- a/drivers/ieee1394/ohci1394.c +++ b/drivers/ieee1394/ohci1394.c | |||
| @@ -3537,7 +3537,5 @@ static int __init ohci1394_init(void) | |||
| 3537 | return pci_register_driver(&ohci1394_pci_driver); | 3537 | return pci_register_driver(&ohci1394_pci_driver); |
| 3538 | } | 3538 | } |
| 3539 | 3539 | ||
| 3540 | /* Register before most other device drivers. | 3540 | module_init(ohci1394_init); |
| 3541 | * Useful for remote debugging via physical DMA, e.g. using firescope. */ | ||
| 3542 | fs_initcall(ohci1394_init); | ||
| 3543 | module_exit(ohci1394_cleanup); | 3541 | module_exit(ohci1394_cleanup); |