diff --git a/[refs] b/[refs]
index 653e28d5bd5d..a71a4a371e8c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 40fb29a777d23b1161271ec88fd21739835e4f6a
+refs/heads/master: c7afa08d80dbcfdbd7fd04388f7bc475ec8acf69
diff --git a/trunk/drivers/staging/ti-st/ti_wilink_st.h b/trunk/drivers/staging/ti-st/ti_wilink_st.h
index afb0cc644c1f..2a5acf599598 100644
--- a/trunk/drivers/staging/ti-st/ti_wilink_st.h
+++ b/trunk/drivers/staging/ti-st/ti_wilink_st.h
@@ -25,7 +25,6 @@
 #ifndef TI_WILINK_ST_H
 #define TI_WILINK_ST_H
 
-#ifdef __KERNEL__
 /**
  * enum kim_gpio_state - Few protocols such as FM have ACTIVE LOW
  *	gpio states for their chip/core enable gpios
@@ -400,5 +399,4 @@ struct gps_event_hdr {
 	u16 plen;
 } __attribute__ ((packed));
 
-#endif /* __KERNEL__ */
 #endif /* TI_WILINK_ST_H */