git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
[pandora-kernel.git]
/
drivers
/
mtd
/
nand
/
jz4740_nand.c
diff --git
a/drivers/mtd/nand/jz4740_nand.c
b/drivers/mtd/nand/jz4740_nand.c
index
8d415f0
..
b76460e
100644
(file)
--- a/
drivers/mtd/nand/jz4740_nand.c
+++ b/
drivers/mtd/nand/jz4740_nand.c
@@
-326,7
+326,8
@@
static inline void jz_nand_iounmap_resource(struct resource *res,
static int jz_nand_detect_bank(struct platform_device *pdev,
struct jz_nand *nand, unsigned char bank,
size_t chipnr, uint8_t *nand_maf_id,
- uint8_t *nand_dev_id) {
+ uint8_t *nand_dev_id)
+{
int ret;
int gpio;
char gpio_name[9];