From 4db383c9497ab3cfcac5a1c47f68978004bd3b12 Mon Sep 17 00:00:00 2001
From: Geert Uytterhoeven <geert@linux-m68k.org>
Date: Sat, 13 Oct 2007 14:31:30 +0200
Subject: [PATCH] --- yaml --- r: 68180 b: refs/heads/master c:
 50e36ebe65ff1b96e35a703fab28314ee4f984f7 h: refs/heads/master v: v3

---
 [refs]                                 | 2 +-
 trunk/drivers/net/wireless/b43/phy.c   | 1 +
 trunk/drivers/net/wireless/b43/pio.h   | 1 +
 trunk/drivers/net/wireless/b43/sysfs.c | 5 +++--
 4 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index a2504b71d84b..fff9ed1592ba 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3649ba001b5d037e2cead173b6cff54d32ef154a
+refs/heads/master: 50e36ebe65ff1b96e35a703fab28314ee4f984f7
diff --git a/trunk/drivers/net/wireless/b43/phy.c b/trunk/drivers/net/wireless/b43/phy.c
index 5f7ffa0a76c0..3d4ed647c311 100644
--- a/trunk/drivers/net/wireless/b43/phy.c
+++ b/trunk/drivers/net/wireless/b43/phy.c
@@ -26,6 +26,7 @@
 */
 
 #include <linux/delay.h>
+#include <linux/io.h>
 #include <linux/types.h>
 
 #include "b43.h"
diff --git a/trunk/drivers/net/wireless/b43/pio.h b/trunk/drivers/net/wireless/b43/pio.h
index 34a44c1b6314..3488f2447bbf 100644
--- a/trunk/drivers/net/wireless/b43/pio.h
+++ b/trunk/drivers/net/wireless/b43/pio.h
@@ -4,6 +4,7 @@
 #include "b43.h"
 
 #include <linux/interrupt.h>
+#include <linux/io.h>
 #include <linux/list.h>
 #include <linux/skbuff.h>
 
diff --git a/trunk/drivers/net/wireless/b43/sysfs.c b/trunk/drivers/net/wireless/b43/sysfs.c
index fcb777383e70..f4faff6a7d6c 100644
--- a/trunk/drivers/net/wireless/b43/sysfs.c
+++ b/trunk/drivers/net/wireless/b43/sysfs.c
@@ -23,13 +23,14 @@
 
 */
 
+#include <linux/capability.h>
+#include <linux/io.h>
+
 #include "b43.h"
 #include "sysfs.h"
 #include "main.h"
 #include "phy.h"
 
-#include <linux/capability.h>
-
 #define GENERIC_FILESIZE	64
 
 static int get_integer(const char *buf, size_t count)