diff options
| author | David S. Miller <davem@davemloft.net> | 2010-04-21 04:14:25 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-04-21 04:14:25 -0400 |
| commit | 87eb367003887cdc81a5d183efea227b5b488961 (patch) | |
| tree | 40f617e25a9364d573e3cd2189c9e7fa56c8a0fe /drivers/input/mouse/bcm5974.c | |
| parent | ccb7c7732e2ceb4e81a7806faf1670be9681ccd2 (diff) | |
| parent | 05d17608a69b3ae653ea5c9857283bef3439c733 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/wireless/iwlwifi/iwl-6000.c
net/core/dev.c
Diffstat (limited to 'drivers/input/mouse/bcm5974.c')
| -rw-r--r-- | drivers/input/mouse/bcm5974.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/input/mouse/bcm5974.c b/drivers/input/mouse/bcm5974.c index 4f8fe0886b2a..b89879bd860f 100644 --- a/drivers/input/mouse/bcm5974.c +++ b/drivers/input/mouse/bcm5974.c | |||
| @@ -803,7 +803,6 @@ static struct usb_driver bcm5974_driver = { | |||
| 803 | .disconnect = bcm5974_disconnect, | 803 | .disconnect = bcm5974_disconnect, |
| 804 | .suspend = bcm5974_suspend, | 804 | .suspend = bcm5974_suspend, |
| 805 | .resume = bcm5974_resume, | 805 | .resume = bcm5974_resume, |
| 806 | .reset_resume = bcm5974_resume, | ||
| 807 | .id_table = bcm5974_table, | 806 | .id_table = bcm5974_table, |
| 808 | .supports_autosuspend = 1, | 807 | .supports_autosuspend = 1, |
| 809 | }; | 808 | }; |