Automerge with /usr/src/ntfs-2.6.git.

2 files changed, 7 insertions, 7 deletions

diff --git a/scripts/Makefile.build b/scripts/Makefile.build
index 352d531ee3..76ba6be3df 100644
--- a/scripts/Makefile.build
+++ b/scripts/Makefile.build
@@ -176,10 +176,10 @@ endif
 define rule_cc_o_c
         $(if $($(quiet)cmd_checksrc),echo '  $($(quiet)cmd_checksrc)';)   \
         $(cmd_checksrc)                                                   \
-        $(if $($(quiet)cmd_cc_o_c),echo '  $($(quiet)cmd_cc_o_c)';)       \
+        $(if $($(quiet)cmd_cc_o_c),echo '  $(subst ','\'',$($(quiet)cmd_cc_o_c))';)  \
         $(cmd_cc_o_c);                                                    \
         $(cmd_modversions)                                                \
-        scripts/basic/fixdep $(depfile) $@ '$(cmd_cc_o_c)' > $(@D)/.$(@F).tmp;  \
+        scripts/basic/fixdep $(depfile) $@ '$(subst ','\'',$(cmd_cc_o_c))' > $(@D)/.$(@F).tmp;  \
         rm -f $(depfile);                                                 \
         mv -f $(@D)/.$(@F).tmp $(@D)/.$(@F).cmd
 endef
diff --git a/scripts/kconfig/gconf.glade b/scripts/kconfig/gconf.glade
index 1e1736d81e..ace4706ab2 100644
--- a/scripts/kconfig/gconf.glade
+++ b/scripts/kconfig/gconf.glade
@@ -432,8 +432,8 @@
           <child>
             <widget class="GtkScrolledWindow" id="scrolledwindow1">
               <property name="visible">True</property>
-              <property name="hscrollbar_policy">GTK_POLICY_ALWAYS</property>
-              <property name="vscrollbar_policy">GTK_POLICY_ALWAYS</property>
+              <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+              <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
               <property name="shadow_type">GTK_SHADOW_IN</property>
               <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
 
@@ -466,8 +466,8 @@
               <child>
                 <widget class="GtkScrolledWindow" id="scrolledwindow2">
                   <property name="visible">True</property>
-                  <property name="hscrollbar_policy">GTK_POLICY_ALWAYS</property>
-                  <property name="vscrollbar_policy">GTK_POLICY_ALWAYS</property>
+                  <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+                  <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
                   <property name="shadow_type">GTK_SHADOW_IN</property>
                   <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
 
@@ -496,7 +496,7 @@
                 <widget class="GtkScrolledWindow" id="scrolledwindow3">
                   <property name="visible">True</property>
                   <property name="hscrollbar_policy">GTK_POLICY_NEVER</property>
-                  <property name="vscrollbar_policy">GTK_POLICY_ALWAYS</property>
+                  <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
                   <property name="shadow_type">GTK_SHADOW_IN</property>
                   <property name="window_placement">GTK_CORNER_TOP_LEFT</property>