diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-18 16:39:59 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-18 16:39:59 -0400 |
| commit | 0679c2f47d50651018dd5e0bf35330f6e6ae35ec (patch) | |
| tree | 2df65ebb958f930abf0b7ad35fd6e528398b1679 /drivers/pci/proc.c | |
| parent | 76fbc263ff7e42ce8b21b8aee176e3c74b45f81a (diff) | |
| parent | 5b664cb235e97afbf34db9c4d77f08ebd725335e (diff) | |
Merge branch 'linus' into pci-for-jesse
Diffstat (limited to 'drivers/pci/proc.c')
| -rw-r--r-- | drivers/pci/proc.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/pci/proc.c b/drivers/pci/proc.c index 963a97642ae9..4400dffbd93a 100644 --- a/drivers/pci/proc.c +++ b/drivers/pci/proc.c | |||
| @@ -1,6 +1,4 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * $Id: proc.c,v 1.13 1998/05/12 07:36:07 mj Exp $ | ||
| 3 | * | ||
| 4 | * Procfs interface for the PCI bus. | 2 | * Procfs interface for the PCI bus. |
| 5 | * | 3 | * |
| 6 | * Copyright (c) 1997--1999 Martin Mares <mj@ucw.cz> | 4 | * Copyright (c) 1997--1999 Martin Mares <mj@ucw.cz> |
| @@ -482,5 +480,5 @@ static int __init pci_proc_init(void) | |||
| 482 | return 0; | 480 | return 0; |
| 483 | } | 481 | } |
| 484 | 482 | ||
| 485 | __initcall(pci_proc_init); | 483 | device_initcall(pci_proc_init); |
| 486 | 484 | ||