diff --git a/[refs] b/[refs]
index c8be07bb3be9..3e0d80a2cb9f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 968c6595e7a3905f55a024e8e743dd823b26cdf8
+refs/heads/master: be0d54ae39fa5817a70cb002839f9cff6730849a
diff --git a/trunk/drivers/staging/usbip/userspace/configure.ac b/trunk/drivers/staging/usbip/userspace/configure.ac
index 7b93d2902258..d5f6d8e87f87 100644
--- a/trunk/drivers/staging/usbip/userspace/configure.ac
+++ b/trunk/drivers/staging/usbip/userspace/configure.ac
@@ -18,7 +18,7 @@ LT_INIT
 # Silent build for automake >= 1.11
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
 
-AC_SUBST([EXTRA_CFLAGS])
+AC_SUBST([EXTRA_CFLAGS], ["-Wall -W -Wstrict-prototypes -std=gnu99"])
 
 # Checks for programs.
 AC_PROG_CC
diff --git a/trunk/drivers/staging/usbip/userspace/libsrc/Makefile.am b/trunk/drivers/staging/usbip/userspace/libsrc/Makefile.am
index 6abe7fcd9b35..77ecf6b844b7 100644
--- a/trunk/drivers/staging/usbip/userspace/libsrc/Makefile.am
+++ b/trunk/drivers/staging/usbip/userspace/libsrc/Makefile.am
@@ -1,5 +1,5 @@
 libusbip_la_CPPFLAGS := -DUSBIDS_FILE='"@USBIDS_DIR@/usb.ids"'
-libusbip_la_CFLAGS   := @EXTRA_CFLAGS@ -Wall -W -Wstrict-prototypes -std=gnu99
+libusbip_la_CFLAGS   := @EXTRA_CFLAGS@
 libusbip_la_LDFLAGS  := -version-info @LIBUSBIP_VERSION@
 
 lib_LTLIBRARIES := libusbip.la
diff --git a/trunk/drivers/staging/usbip/userspace/src/Makefile.am b/trunk/drivers/staging/usbip/userspace/src/Makefile.am
index a2f0ab2fe420..05a7aa50d42f 100644
--- a/trunk/drivers/staging/usbip/userspace/src/Makefile.am
+++ b/trunk/drivers/staging/usbip/userspace/src/Makefile.am
@@ -1,5 +1,5 @@
 AM_CPPFLAGS := -I$(top_srcdir)/libsrc -DUSBIDS_FILE='"@USBIDS_DIR@/usb.ids"'
-AM_CFLAGS   := @EXTRA_CFLAGS@ -Wall -W -Wstrict-prototypes -std=gnu99 @PACKAGE_CFLAGS@
+AM_CFLAGS   := @EXTRA_CFLAGS@ @PACKAGE_CFLAGS@
 LDADD       := $(top_srcdir)/libsrc/libusbip.la @PACKAGE_LIBS@
 
 sbin_PROGRAMS := usbip usbipd usbip_bind_driver