Merge git://git.infradead.org/mtd-2.6

* git://git.infradead.org/mtd-2.6: (120 commits)
  [MTD] Fix mtdoops.c compilation
  [MTD] [NOR] fix startup lock when using multiple nor flash chips
  [MTD] [DOC200x] eccbuf is statically defined and always evaluate to true
  [MTD] Fix maps/physmap.c compilation with CONFIG_PM
  [MTD] onenand: Add panic_write function to the onenand driver
  [MTD] mtdoops: Use the panic_write function when present
  [MTD] Add mtd panic_write function pointer
  [MTD] [NAND] Freescale enhanced Local Bus Controller FCM NAND support.
  [MTD] physmap.c: Add support for multiple resources
  [MTD] [NAND] Fix misparenthesization introduced by commit 78b65179...
  [MTD] [NAND] Fix Blackfin NFC ECC calculating bug with page size 512 bytes
  [MTD] [NAND] Remove wrong operation in PM function of the BF54x NFC driver
  [MTD] [NAND] Remove unused variable in plat_nand_remove
  [MTD] Unlocking all Intel flash that is locked on power up.
  [MTD] [NAND] at91_nand: Make mtdparts option can override board info
  [MTD] mtdoops: Various minor cleanups
  [MTD] mtdoops: Ensure sequential write to the buffer
  [MTD] mtdoops: Perform write operations in a workqueue
  [MTD] mtdoops: Add further error return code checking
  [MTD] [NOR] Test devtype, not definition in flash_probe(), drivers/mtd/devices/lart.c
  ...

1 files changed, 6 insertions, 6 deletions

diff --git a/drivers/mtd/chips/cfi_probe.c b/drivers/mtd/chips/cfi_probe.c
index 60e11a0ada97..f651b6ef1c5d 100644
--- a/drivers/mtd/chips/cfi_probe.c
+++ b/drivers/mtd/chips/cfi_probe.c
@@ -370,27 +370,27 @@ static void print_cfi_ident(struct cfi_ident *cfip)
         printk("Device size: 0x%X bytes (%d MiB)\n", 1 << cfip->DevSize, 1<< (cfip->DevSize - 20));
         printk("Flash Device Interface description: 0x%4.4X\n", cfip->InterfaceDesc);
         switch(cfip->InterfaceDesc) {
-        case 0:
+        case CFI_INTERFACE_X8_ASYNC:
                 printk("  - x8-only asynchronous interface\n");
                 break;
 
-        case 1:
+        case CFI_INTERFACE_X16_ASYNC:
                 printk("  - x16-only asynchronous interface\n");
                 break;
 
-        case 2:
+        case CFI_INTERFACE_X8_BY_X16_ASYNC:
                 printk("  - supports x8 and x16 via BYTE# with asynchronous interface\n");
                 break;
 
-        case 3:
+        case CFI_INTERFACE_X32_ASYNC:
                 printk("  - x32-only asynchronous interface\n");
                 break;
 
-        case 4:
+        case CFI_INTERFACE_X16_BY_X32_ASYNC:
                 printk("  - supports x16 and x32 via Word# with asynchronous interface\n");
                 break;
 
-        case 65535:
+        case CFI_INTERFACE_NOT_ALLOWED:
                 printk("  - Not Allowed / Reserved\n");
                 break;