diff --git a/[refs] b/[refs]
index 48a0c6005d3d..d6a0c7d4e995 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 54ca4123363f388ab724fc66da92b87dc05395c3
+refs/heads/master: 4fdadebc313f46a750e9ffca9c68c35c587ced9f
diff --git a/trunk/drivers/pci/msi.c b/trunk/drivers/pci/msi.c
index d9cbd586ae4b..f7f747016ecd 100644
--- a/trunk/drivers/pci/msi.c
+++ b/trunk/drivers/pci/msi.c
@@ -15,10 +15,10 @@
 #include <linux/pci.h>
 #include <linux/proc_fs.h>
 #include <linux/msi.h>
+#include <linux/smp.h>
 
 #include <asm/errno.h>
 #include <asm/io.h>
-#include <asm/smp.h>
 
 #include "pci.h"
 #include "msi.h"