Linux 4.11-rc6 drm-misc needs 4.11-rc5, may as well fix conflicts with rc6.
Showing the changes to scripts (3 of 476 files). Show all
Unified · Split
| @@ -148,6 +148,10 @@ cc-fullversion = $(shell $(CONFIG_SHELL) \ · 147 unmodified lines | ||
| 148 | 148 | # Usage: EXTRA_CFLAGS += $(call cc-ifversion, -lt, 0402, -O1) |
| 149 | 149 | cc-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) | |
| 153 | +cc-if-fullversion = $(shell [ $(cc-fullversion) $(1) $(2) ] && echo $(3) || echo $(4)) | |
| 154 | + | |
| 151 | 155 | # cc-ldoption |
| 152 | 156 | # Usage: ldflags += $(call cc-ldoption, -Wl$(comma)--hash-style=both) |
| 153 | 157 | cc-ldoption = $(call try-run,\ |
| @@ -155,7 +155,7 @@ else · 154 unmodified lines | ||
| 155 | 155 | # $(call addtree,-I$(obj)) locates .h files in srctree, from generated .c files |
| 156 | 156 | # and locates generated .h files |
| 157 | 157 | # 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 | 159 | $(call flags,_c_flags) |
| 160 | 160 | __a_flags = $(call flags,_a_flags) |
| 161 | 161 | __cpp_flags = $(call flags,_cpp_flags) |
| @@ -914,7 +914,7 @@ on_treeview2_button_press_event(GtkWidget * widget, · 913 unmodified lines | ||
| 914 | 914 | current = menu; |
| 915 | 915 | display_tree_part(); |
| 916 | 916 | gtk_widget_set_sensitive(back_btn, TRUE); |
| 917 | − } else if ((col == COL_OPTION)) { | |
| 917 | + } else if (col == COL_OPTION) { | |
| 918 | 918 | toggle_sym_value(menu); |
| 919 | 919 | gtk_tree_view_expand_row(view, path, TRUE); |
| 920 | 920 | } |