forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless

Browse source
This commit is contained in:
David S. Miller 2012-01-17 12:11:52 -05:00
commit 4144cb2ade
20 changed files with 109 additions and 113 deletions
Download patch file Download diff file Expand all files Collapse all files

2
include/linux/bcma/bcma.h
View file

@ -162,7 +162,7 @@ struct bcma_driver {
int (*probe)(struct bcma_device *dev);
void (*remove)(struct bcma_device *dev);
int (*suspend)(struct bcma_device *dev, pm_message_t state);
int (*suspend)(struct bcma_device *dev);
int (*resume)(struct bcma_device *dev);
void (*shutdown)(struct bcma_device *dev);