diff --git a/[refs] b/[refs]
index dec21adb8fcc..5317a364bc81 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 25dd85120424d9f0d6ee1144233ce3e20930110f
+refs/heads/master: 86bc9ebb4dda92aa225fef20dd3b1f23dfd1a794
diff --git a/trunk/drivers/staging/silicom/bp_mod.c b/trunk/drivers/staging/silicom/bp_mod.c
index 2722da91dea3..8b7298fda9a2 100644
--- a/trunk/drivers/staging/silicom/bp_mod.c
+++ b/trunk/drivers/staging/silicom/bp_mod.c
@@ -10,9 +10,6 @@
 /*                                                                            */
 /******************************************************************************/
 #include <linux/version.h>
-#if defined(CONFIG_SMP) && ! defined(__SMP__)
-#define __SMP__
-#endif
 
 #include <linux/kernel.h>	/* We're doing kernel work */
 #include <linux/module.h>	/* Specifically, a module */
@@ -24,7 +21,7 @@
 #include <linux/rcupdate.h>
 #include <linux/etherdevice.h>
 
-#include <asm/uaccess.h>	/* for get_user and put_user */
+#include <linux/uaccess.h>	/* for get_user and put_user */
 #include <linux/sched.h>
 #include <linux/ethtool.h>
 #include <linux/proc_fs.h>