diff options
author | Olof Johansson <olof@lixom.net> | 2016-06-19 01:59:07 -0400 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2016-06-19 01:59:07 -0400 |
commit | 8fd0976702f05042c776848819e5fd2a835f23c9 (patch) | |
tree | 8a87b0e33bf39adcc53b3ee4be61155dab86417b /scripts/mod/file2alias.c | |
parent | 58935f24a996cb55595c29dd5303bd9b778c8b00 (diff) | |
parent | 8f50b8e57442d28e41bb736c173d8a2490549a82 (diff) |
Merge tag 'gpmc-omap-fixes-for-v4.7' of https://github.com/rogerq/linux into fixes
OMAP-GPMC: Fixes for for v4.7-rc cycle:
- Fix omap gpmc EXTRADELAY timing. The DT provided timings
were wrongly used causing devices requiring extra delay timing
to fail.
* tag 'gpmc-omap-fixes-for-v4.7' of https://github.com/rogerq/linux:
memory: omap-gpmc: Fix omap gpmc EXTRADELAY timing
+ Linux 4.7-rc3
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'scripts/mod/file2alias.c')
-rw-r--r-- | scripts/mod/file2alias.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/mod/file2alias.c b/scripts/mod/file2alias.c index a9155077feef..fec75786f75b 100644 --- a/scripts/mod/file2alias.c +++ b/scripts/mod/file2alias.c | |||
@@ -384,7 +384,7 @@ static void do_of_entry_multi(void *symval, struct module *mod) | |||
384 | len = sprintf(alias, "of:N%sT%s", (*name)[0] ? *name : "*", | 384 | len = sprintf(alias, "of:N%sT%s", (*name)[0] ? *name : "*", |
385 | (*type)[0] ? *type : "*"); | 385 | (*type)[0] ? *type : "*"); |
386 | 386 | ||
387 | if (compatible[0]) | 387 | if ((*compatible)[0]) |
388 | sprintf(&alias[len], "%sC%s", (*type)[0] ? "*" : "", | 388 | sprintf(&alias[len], "%sC%s", (*type)[0] ? "*" : "", |
389 | *compatible); | 389 | *compatible); |
390 | 390 | ||