git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
drivers
/
mtd
/
maps
/
scb2_flash.c
diff --git
a/drivers/mtd/maps/scb2_flash.c
b/drivers/mtd/maps/scb2_flash.c
index
ff2328d
..
dcfb858
100644
(file)
--- 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
/*
* MTD map driver for BIOS Flash on Intel SCB2 boards
- * $Id: scb2_flash.c,v 1.
8 2004/07/12 21:59:45 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>
*
* Copyright (C) 2002 Sun Microsystems, Inc.
* Tim Hockin <thockin@sun.com>
*
@@
-53,7
+53,6
@@
#include <linux/mtd/mtd.h>
#include <linux/mtd/map.h>
#include <linux/mtd/cfi.h>
#include <linux/mtd/mtd.h>
#include <linux/mtd/map.h>
#include <linux/mtd/cfi.h>
-#include <linux/config.h>
#include <linux/pci.h>
#include <linux/pci_ids.h>
#include <linux/pci.h>
#include <linux/pci_ids.h>
@@
-62,9
+61,9
@@
#define SCB2_WINDOW 0x00100000
#define SCB2_WINDOW 0x00100000
-static void *scb2_ioaddr;
+static void
__iomem
*scb2_ioaddr;
static struct mtd_info *scb2_mtd;
static struct mtd_info *scb2_mtd;
-struct map_info scb2_map = {
+st
atic st
ruct map_info scb2_map = {
.name = "SCB2 BIOS Flash",
.size = 0,
.bankwidth = 1,
.name = "SCB2 BIOS Flash",
.size = 0,
.bankwidth = 1,
@@
-163,7
+162,7
@@
scb2_flash_probe(struct pci_dev *dev, const struct pci_device_id *ent)
}
scb2_map.phys = SCB2_ADDR;
}
scb2_map.phys = SCB2_ADDR;
- scb2_map.virt =
(unsigned long)
scb2_ioaddr;
+ scb2_map.virt = scb2_ioaddr;
scb2_map.size = SCB2_WINDOW;
simple_map_init(&scb2_map);
scb2_map.size = SCB2_WINDOW;
simple_map_init(&scb2_map);
@@
-238,7
+237,7
@@
static struct pci_driver scb2_flash_driver = {
static int __init
scb2_flash_init(void)
{
static int __init
scb2_flash_init(void)
{
- return pci_
module_init
(&scb2_flash_driver);
+ return pci_
register_driver
(&scb2_flash_driver);
}
static void __exit
}
static void __exit