diff options
author | Dave Airlie <airlied@redhat.com> | 2018-05-18 00:08:53 -0400 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2018-05-18 00:08:53 -0400 |
commit | 1fafef9dfe127bdd4600eeaca302f0c1cb4ee5d0 (patch) | |
tree | f829e8a26fc768666eb5f827bf5817892ea7e46c /scripts/mod/sumversion.c | |
parent | 315852b422972e6ebb1dfddaadada09e46a2681a (diff) | |
parent | 76ef6b28ea4f81c3d511866a9b31392caa833126 (diff) |
Merge drm-fixes-for-v4.17-rc6-urgent into drm-next
Need to backmerge some nouveau fixes to reduce
the nouveau -next conflicts a lot.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'scripts/mod/sumversion.c')
-rw-r--r-- | scripts/mod/sumversion.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/scripts/mod/sumversion.c b/scripts/mod/sumversion.c index 944418da9fe3..0f6dcb4011a8 100644 --- a/scripts/mod/sumversion.c +++ b/scripts/mod/sumversion.c | |||
@@ -330,14 +330,7 @@ static int parse_source_files(const char *objfile, struct md4_ctx *md) | |||
330 | goto out; | 330 | goto out; |
331 | } | 331 | } |
332 | 332 | ||
333 | /* There will be a line like so: | 333 | /* Sum all files in the same dir or subdirs. */ |
334 | deps_drivers/net/dummy.o := \ | ||
335 | drivers/net/dummy.c \ | ||
336 | $(wildcard include/config/net/fastroute.h) \ | ||
337 | include/linux/module.h \ | ||
338 | |||
339 | Sum all files in the same dir or subdirs. | ||
340 | */ | ||
341 | while ((line = get_next_line(&pos, file, flen)) != NULL) { | 334 | while ((line = get_next_line(&pos, file, flen)) != NULL) { |
342 | char* p = line; | 335 | char* p = line; |
343 | 336 | ||