From 5c26854b9898a44bb2fd80ecc0e581b6aefe158e Mon Sep 17 00:00:00 2001
From: Geert Uytterhoeven <geert@linux-m68k.org>
Date: Thu, 11 Nov 2010 14:05:06 -0800
Subject: [PATCH] --- yaml --- r: 221711 b: refs/heads/master c:
 38b7a2ae0ad3e29e1881b82c0f421ba5db148e3d h: refs/heads/master i:   221709:
 7bbb4f8a9f27f137da320088129091c1bb70eef8   221707:
 ed477c7618f0bd61ee92b02aab321da4d9ed3c91   221703:
 bb66565b057835bb9dee18c9f2087b06e543c88b   221695:
 b5656fafc1b8fd2a08b51f138033a12144491414 v: v3

---
 [refs]                            | 2 +-
 trunk/drivers/macintosh/adb-iop.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 0c51f27cd2d3..1c5ea367b6a4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8818b6719f1ecfdc1f27761704d0c9e2cbc48250
+refs/heads/master: 38b7a2ae0ad3e29e1881b82c0f421ba5db148e3d
diff --git a/trunk/drivers/macintosh/adb-iop.c b/trunk/drivers/macintosh/adb-iop.c
index 444696625171..f5f4da3d0b67 100644
--- a/trunk/drivers/macintosh/adb-iop.c
+++ b/trunk/drivers/macintosh/adb-iop.c
@@ -80,7 +80,7 @@ static void adb_iop_end_req(struct adb_request *req, int state)
 static void adb_iop_complete(struct iop_msg *msg)
 {
 	struct adb_request *req;
-	uint flags;
+	unsigned long flags;
 
 	local_irq_save(flags);
 
@@ -103,7 +103,7 @@ static void adb_iop_listen(struct iop_msg *msg)
 {
 	struct adb_iopmsg *amsg = (struct adb_iopmsg *) msg->message;
 	struct adb_request *req;
-	uint flags;
+	unsigned long flags;
 #ifdef DEBUG_ADB_IOP
 	int i;
 #endif