From patchwork Tue Nov 17 22:44:56 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Morton X-Patchwork-Id: 60821 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id nAHMk7wq007166 for ; Tue, 17 Nov 2009 22:46:07 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756579AbZKQWpv (ORCPT ); Tue, 17 Nov 2009 17:45:51 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1756565AbZKQWpu (ORCPT ); Tue, 17 Nov 2009 17:45:50 -0500 Received: from smtp1.linux-foundation.org ([140.211.169.13]:48015 "EHLO smtp1.linux-foundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756457AbZKQWps (ORCPT ); Tue, 17 Nov 2009 17:45:48 -0500 Received: from imap1.linux-foundation.org (imap1.linux-foundation.org [140.211.169.55]) by smtp1.linux-foundation.org (8.14.2/8.13.5/Debian-3ubuntu1.1) with ESMTP id nAHMivYR016416 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Tue, 17 Nov 2009 14:44:58 -0800 Received: from localhost.localdomain (localhost [127.0.0.1]) by imap1.linux-foundation.org (8.13.5.20060308/8.13.5/Debian-3ubuntu1.1) with ESMTP id nAHMiutB032282; Tue, 17 Nov 2009 14:44:56 -0800 Message-Id: <200911172244.nAHMiutB032282@imap1.linux-foundation.org> Subject: [patch 2/3] input: bcm5974: retract efi-broken suspend_resume To: dtor@mail.ru Cc: linux-input@vger.kernel.org, akpm@linux-foundation.org, rydberg@euromail.se From: akpm@linux-foundation.org Date: Tue, 17 Nov 2009 14:44:56 -0800 MIME-Version: 1.0 X-Spam-Status: No, hits=-3.518 required=5 tests=AWL, BAYES_00, OSDL_HEADER_SUBJECT_BRACKETED X-Spam-Checker-Version: SpamAssassin 3.2.4-osdl_revision__1.47__ X-MIMEDefang-Filter: lf$Revision: 1.188 $ X-Scanned-By: MIMEDefang 2.63 on 140.211.169.13 Sender: linux-input-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org diff -puN drivers/input/mouse/bcm5974.c~input-bcm5974-retract-efi-broken-suspend_resume drivers/input/mouse/bcm5974.c --- a/drivers/input/mouse/bcm5974.c~input-bcm5974-retract-efi-broken-suspend_resume +++ a/drivers/input/mouse/bcm5974.c @@ -761,7 +761,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, };