summaryrefslogtreecommitdiffstats
path: root/drivers/fmc
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-03-03 04:53:09 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-03-03 04:53:09 +0100
commitaa074c1c805a38c01c0dfe56f78d409e33be28a2 (patch)
tree5a361535d8df880af24e02b1508c2a6b44ae17c5 /drivers/fmc
parentmemory: ti-aemif: add bindings for AEMIF driver (diff)
parentLinux 3.14-rc5 (diff)
downloadlinux-aa074c1c805a38c01c0dfe56f78d409e33be28a2.tar.xz
linux-aa074c1c805a38c01c0dfe56f78d409e33be28a2.zip
Merge 3.14-rc5 into char-misc-next
We want these fixes in here as well.
Diffstat (limited to 'drivers/fmc')
-rw-r--r--drivers/fmc/fmc-write-eeprom.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/fmc/fmc-write-eeprom.c b/drivers/fmc/fmc-write-eeprom.c
index ee5b47904130..9bb2cbd5c9f2 100644
--- a/drivers/fmc/fmc-write-eeprom.c
+++ b/drivers/fmc/fmc-write-eeprom.c
@@ -27,7 +27,7 @@ FMC_PARAM_BUSID(fwe_drv);
/* The "file=" is like the generic "gateware=" used elsewhere */
static char *fwe_file[FMC_MAX_CARDS];
static int fwe_file_n;
-module_param_array_named(file, fwe_file, charp, &fwe_file_n, 444);
+module_param_array_named(file, fwe_file, charp, &fwe_file_n, 0444);
static int fwe_run_tlv(struct fmc_device *fmc, const struct firmware *fw,
int write)