History

Backmerge tag 'v4.11-rc6' into drm-next

Linux 4.11-rc6 drm-misc needs 4.11-rc5, may as well fix conflicts with rc6.

Dave Airlie committed 9 years ago

Commit b769fef2 parents 1420f63 39da7c5476 files · +6926 −2824Browse files

Showing the changes to scripts (3 of 476 files). Show all

Unified · Split

3 files
  1. scripts/Kbuild.include +4 −0
  2. scripts/Makefile.lib +1 −1
  3. scripts/kconfig/gconf.c +1 −1
scripts/Kbuild.include+4−0
@@ -148,6 +148,10 @@ cc-fullversion = $(shell $(CONFIG_SHELL) \ · 147 unmodified lines
148# Usage: EXTRA_CFLAGS += $(call cc-ifversion, -lt, 0402, -O1)148# Usage: EXTRA_CFLAGS += $(call cc-ifversion, -lt, 0402, -O1)
149cc-ifversion = $(shell [ $(cc-version) $(1) $(2) ] && echo $(3) || echo $(4))149cc-ifversion = $(shell [ $(cc-version) $(1) $(2) ] && echo $(3) || echo $(4))
150 150
151# cc-if-fullversion
152# Usage: EXTRA_CFLAGS += $(call cc-if-fullversion, -lt, 040502, -O1)
153cc-if-fullversion = $(shell [ $(cc-fullversion) $(1) $(2) ] && echo $(3) || echo $(4))
154
151# cc-ldoption155# cc-ldoption
152# Usage: ldflags += $(call cc-ldoption, -Wl$(comma)--hash-style=both)156# Usage: ldflags += $(call cc-ldoption, -Wl$(comma)--hash-style=both)
153cc-ldoption = $(call try-run,\157cc-ldoption = $(call try-run,\
scripts/Makefile.lib+1−1
@@ -155,7 +155,7 @@ else · 154 unmodified lines
155# $(call addtree,-I$(obj)) locates .h files in srctree, from generated .c files155# $(call addtree,-I$(obj)) locates .h files in srctree, from generated .c files
156# and locates generated .h files156# and locates generated .h files
157# FIXME: Replace both with specific CFLAGS* statements in the makefiles157# FIXME: Replace both with specific CFLAGS* statements in the makefiles
158__c_flags = $(if $(obj),-I$(srctree)/$(src) -I$(obj)) \158__c_flags = $(if $(obj),$(call addtree,-I$(src)) -I$(obj)) \
159 $(call flags,_c_flags)159 $(call flags,_c_flags)
160__a_flags = $(call flags,_a_flags)160__a_flags = $(call flags,_a_flags)
161__cpp_flags = $(call flags,_cpp_flags)161__cpp_flags = $(call flags,_cpp_flags)
scripts/kconfig/gconf.c+1−1
@@ -914,7 +914,7 @@ on_treeview2_button_press_event(GtkWidget * widget, · 913 unmodified lines
914 current = menu;914 current = menu;
915 display_tree_part();915 display_tree_part();
916 gtk_widget_set_sensitive(back_btn, TRUE);916 gtk_widget_set_sensitive(back_btn, TRUE);
917 } else if ((col == COL_OPTION)) {917 } else if (col == COL_OPTION) {
918 toggle_sym_value(menu);918 toggle_sym_value(menu);
919 gtk_tree_view_expand_row(view, path, TRUE);919 gtk_tree_view_expand_row(view, path, TRUE);
920 }920 }