git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[ARM] cdb89712,clps7500,h720x: avoid namespace clash for FLASH_* constants
[safe/jmp/linux-2.6]
/
drivers
/
mtd
/
maps
/
scb2_flash.c
diff --git
a/drivers/mtd/maps/scb2_flash.c
b/drivers/mtd/maps/scb2_flash.c
index
97a8dfd
..
21169e6
100644
(file)
--- a/
drivers/mtd/maps/scb2_flash.c
+++ b/
drivers/mtd/maps/scb2_flash.c
@@
-1,6
+1,5
@@
/*
* 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.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
+52,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>
@@
-80,7
+78,7
@@
scb2_fixup_mtd(struct mtd_info *mtd)
struct cfi_private *cfi = map->fldrv_priv;
/* barf if this doesn't look right */
struct cfi_private *cfi = map->fldrv_priv;
/* barf if this doesn't look right */
- if (cfi->cfiq->InterfaceDesc !=
1
) {
+ if (cfi->cfiq->InterfaceDesc !=
CFI_INTERFACE_X16_ASYNC
) {
printk(KERN_ERR MODNAME ": unsupported InterfaceDesc: %#x\n",
cfi->cfiq->InterfaceDesc);
return -1;
printk(KERN_ERR MODNAME ": unsupported InterfaceDesc: %#x\n",
cfi->cfiq->InterfaceDesc);
return -1;