From 4727e85669083c7f750dc76655dc31f65a937494 Mon Sep 17 00:00:00 2001
From: Henrik Rydberg <rydberg@euromail.se>
Date: Sat, 20 Mar 2010 00:06:40 -0700
Subject: [PATCH] --- yaml --- r: 189921 b: refs/heads/master c:
 d90e6f6aad0ffdc674bc3a05c85c40dcc18e604c h: refs/heads/master i:   189919:
 c94e85534cc3045883cf75d01d0a7479a74a9ce3 v: v3

---
 [refs]                              | 2 +-
 trunk/drivers/input/mouse/bcm5974.c | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 0272a5678022..e77a4e5b5055 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 88fcf710c13bd41f2b98c5411e4f21ab98da4fb4
+refs/heads/master: d90e6f6aad0ffdc674bc3a05c85c40dcc18e604c
diff --git a/trunk/drivers/input/mouse/bcm5974.c b/trunk/drivers/input/mouse/bcm5974.c
index 4f8fe0886b2a..b89879bd860f 100644
--- a/trunk/drivers/input/mouse/bcm5974.c
+++ b/trunk/drivers/input/mouse/bcm5974.c
@@ -803,7 +803,6 @@ static struct usb_driver bcm5974_driver = {
 	.disconnect		= bcm5974_disconnect,
 	.suspend		= bcm5974_suspend,
 	.resume			= bcm5974_resume,
-	.reset_resume		= bcm5974_resume,
 	.id_table		= bcm5974_table,
 	.supports_autosuspend	= 1,
 };