diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2014-10-02 08:54:42 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2014-10-02 08:54:42 +0200 |
| commit | 8c746628fe6ab2cba89ef440b2895cbf3d67846b (patch) | |
| tree | e1aaf4c57155003560f6dfed9a15dc08259acfcb /drivers/mtd | |
| parent | 08d86870b2346290e94ea1d604437a1b441850e5 (diff) | |
| parent | 25bffd8a9a1c15a2676b3b128af05c8c66981a5a (diff) | |
| download | barebox-8c746628fe6ab2cba89ef440b2895cbf3d67846b.tar.gz barebox-8c746628fe6ab2cba89ef440b2895cbf3d67846b.tar.xz | |
Merge branch 'for-next/misc'
Diffstat (limited to 'drivers/mtd')
| -rw-r--r-- | drivers/mtd/nand/Kconfig | 2 | ||||
| -rw-r--r-- | drivers/mtd/nor/cfi_flash.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/mtd/nand/Kconfig b/drivers/mtd/nand/Kconfig index ccf1f9c110..c345847d8f 100644 --- a/drivers/mtd/nand/Kconfig +++ b/drivers/mtd/nand/Kconfig @@ -93,7 +93,7 @@ config NAND_OMAP_GPMC config NAND_ORION bool prompt "Orion NAND driver" - depends on ARCH_MVEBU + depends on ARCH_KIRKWOOD help Support for the Orion NAND controller, present in Kirkwood SoCs. diff --git a/drivers/mtd/nor/cfi_flash.c b/drivers/mtd/nor/cfi_flash.c index a8118cb434..e09b6c3837 100644 --- a/drivers/mtd/nor/cfi_flash.c +++ b/drivers/mtd/nor/cfi_flash.c @@ -996,8 +996,8 @@ static int cfi_probe (struct device_d *dev) return -ENODEV; } - dev_info(dev, "found cfi flash at %p, size %ld\n", - info->base, info->size); + dev_info(dev, "found cfi flash at 0x%p, size %s\n", + info->base, size_human_readable(info->size)); dev->info = cfi_info; |