target/linux/brcm47xx/patches-3.8/043-mtd-bcm47xxnflash-use-pr_fmt-for-module-prefix-in-me.patch

   1 --- a/drivers/mtd/nand/bcm47xxnflash/bcm47xxnflash.h
   2 +++ b/drivers/mtd/nand/bcm47xxnflash/bcm47xxnflash.h
   3 @@ -1,6 +1,10 @@
   4  #ifndef __BCM47XXNFLASH_H
   5  #define __BCM47XXNFLASH_H
   6
   7 +#ifndef pr_fmt
   8 +#define pr_fmt(fmt)            KBUILD_MODNAME ": " fmt
   9 +#endif
  10 +
  11  #include <linux/mtd/mtd.h>
  12  #include <linux/mtd/nand.h>
  13
  14 --- a/drivers/mtd/nand/bcm47xxnflash/main.c
  15 +++ b/drivers/mtd/nand/bcm47xxnflash/main.c
  16 @@ -9,14 +9,14 @@
  17   *
  18   */
  19
  20 +#include "bcm47xxnflash.h"
  21 +
  22  #include <linux/module.h>
  23  #include <linux/kernel.h>
  24  #include <linux/slab.h>
  25  #include <linux/platform_device.h>
  26  #include <linux/bcma/bcma.h>
  27
  28 -#include "bcm47xxnflash.h"
  29 -
  30  MODULE_DESCRIPTION("NAND flash driver for BCMA bus");
  31  MODULE_LICENSE("GPL");
  32  MODULE_AUTHOR("Rafał Miłecki");
  33 --- a/drivers/mtd/nand/bcm47xxnflash/ops_bcm4706.c
  34 +++ b/drivers/mtd/nand/bcm47xxnflash/ops_bcm4706.c
  35 @@ -9,13 +9,13 @@
  36   *
  37   */
  38
  39 +#include "bcm47xxnflash.h"
  40 +
  41  #include <linux/module.h>
  42  #include <linux/kernel.h>
  43  #include <linux/slab.h>
  44  #include <linux/bcma/bcma.h>
  45
  46 -#include "bcm47xxnflash.h"
  47 -
  48  /* Broadcom uses 1'000'000 but it seems to be too many. Tests on WNDR4500 has
  49   * shown ~1000 retries as maxiumum. */
  50  #define NFLASH_READY_RETRIES           10000