diff options
| author | Robert Richter <robert.richter@amd.com> | 2008-09-24 05:25:31 -0400 |
|---|---|---|
| committer | Robert Richter <robert.richter@amd.com> | 2008-09-24 05:25:31 -0400 |
| commit | f78e80209cf143be49f268c340431ae9fa3abb74 (patch) | |
| tree | 820fa64b688099dfdd93d27ba03252738ca5c7e2 /drivers/ide/pci/it821x.c | |
| parent | 4c168eaf7ea39f25a45a3d8c7eebc3fedb633a1d (diff) | |
| parent | 24342c34a022ee90839873d91396045e12ef1090 (diff) | |
Merge commit 'v2.6.27-rc5' into tip/oprofile
Conflicts:
arch/x86/oprofile/nmi_int.c
Diffstat (limited to 'drivers/ide/pci/it821x.c')
| -rw-r--r-- | drivers/ide/pci/it821x.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/ide/pci/it821x.c b/drivers/ide/pci/it821x.c index b6dc723de702..4a1508a707cc 100644 --- a/drivers/ide/pci/it821x.c +++ b/drivers/ide/pci/it821x.c | |||
| @@ -686,7 +686,7 @@ static struct pci_driver driver = { | |||
| 686 | .name = "ITE821x IDE", | 686 | .name = "ITE821x IDE", |
| 687 | .id_table = it821x_pci_tbl, | 687 | .id_table = it821x_pci_tbl, |
| 688 | .probe = it821x_init_one, | 688 | .probe = it821x_init_one, |
| 689 | .remove = it821x_remove, | 689 | .remove = __devexit_p(it821x_remove), |
| 690 | }; | 690 | }; |
| 691 | 691 | ||
| 692 | static int __init it821x_ide_init(void) | 692 | static int __init it821x_ide_init(void) |