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
Merge to Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...
[linux-2.6.git]
/
drivers
/
mtd
/
maps
/
amd76xrom.c
diff --git
a/drivers/mtd/maps/amd76xrom.c
b/drivers/mtd/maps/amd76xrom.c
index
c350878
..
447955b
100644
(file)
--- a/
drivers/mtd/maps/amd76xrom.c
+++ b/
drivers/mtd/maps/amd76xrom.c
@@
-14,7
+14,6
@@
#include <linux/mtd/map.h>
#include <linux/mtd/cfi.h>
#include <linux/mtd/flashchip.h>
#include <linux/mtd/map.h>
#include <linux/mtd/cfi.h>
#include <linux/mtd/flashchip.h>
-#include <linux/config.h>
#include <linux/pci.h>
#include <linux/pci_ids.h>
#include <linux/list.h>
#include <linux/pci.h>
#include <linux/pci_ids.h>
#include <linux/list.h>
@@
-123,9
+122,10
@@
static int __devinit amd76xrom_init_one (struct pci_dev *pdev,
window->rsrc.parent = NULL;
printk(KERN_ERR MOD_NAME
" %s(): Unable to register resource"
window->rsrc.parent = NULL;
printk(KERN_ERR MOD_NAME
" %s(): Unable to register resource"
- " 0x%.
08lx-0x%.08
lx - kernel bug?\n",
+ " 0x%.
16llx-0x%.16l
lx - kernel bug?\n",
__func__,
__func__,
- window->rsrc.start, window->rsrc.end);
+ (unsigned long long)window->rsrc.start,
+ (unsigned long long)window->rsrc.end);
}
#if 0
}
#if 0