diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-11 21:18:18 +0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-11 21:18:18 +0400 |
| commit | 200d481f28be4522464bb849dd0eb5f8cb6be781 (patch) | |
| tree | 8cd00ead1b202dfd377cf34000a5193959aa2e8b /drivers/mtd/maps/scb2_flash.c | |
| parent | f43a64c5e1a65d12b9b53a35ed2d5db441fcb64c (diff) | |
| parent | 97f927a4d7dbccde0a854a62c3ea54d90bae8679 (diff) | |
| download | linux-200d481f28be4522464bb849dd0eb5f8cb6be781.tar.xz | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/tglx/mtd-2.6
Diffstat (limited to 'drivers/mtd/maps/scb2_flash.c')
| -rw-r--r-- | drivers/mtd/maps/scb2_flash.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/mtd/maps/scb2_flash.c b/drivers/mtd/maps/scb2_flash.c index 5bb3b600e5d0..97a8dfd69258 100644 --- a/drivers/mtd/maps/scb2_flash.c +++ b/drivers/mtd/maps/scb2_flash.c @@ -1,6 +1,6 @@ /* * MTD map driver for BIOS Flash on Intel SCB2 boards - * $Id: scb2_flash.c,v 1.11 2004/11/28 09:40:40 dwmw2 Exp $ + * $Id: scb2_flash.c,v 1.12 2005/03/18 14:04:35 gleixner Exp $ * Copyright (C) 2002 Sun Microsystems, Inc. * Tim Hockin <thockin@sun.com> * @@ -238,7 +238,7 @@ static struct pci_driver scb2_flash_driver = { static int __init scb2_flash_init(void) { - return pci_module_init(&scb2_flash_driver); + return pci_register_driver(&scb2_flash_driver); } static void __exit |