diff options
| author | David S. Miller <davem@davemloft.net> | 2012-01-17 18:11:52 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-01-17 18:11:52 +0100 |
| commit | 4144cb2ade46d97b9c41682fd2e9064a59f23a98 (patch) | |
| tree | 4b5ef937b4d0dcede6b1669f03c3b6dccf57d5bc /include | |
| parent | caif: Remove bad WARN_ON in caif_dev (diff) | |
| parent | mwl8k: Fixing Sparse ENDIAN CHECK warning (diff) | |
| download | linux-4144cb2ade46d97b9c41682fd2e9064a59f23a98.tar.xz linux-4144cb2ade46d97b9c41682fd2e9064a59f23a98.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/bcma/bcma.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/bcma/bcma.h b/include/linux/bcma/bcma.h index f4b8346b1a33..83c209f39493 100644 --- a/include/linux/bcma/bcma.h +++ b/include/linux/bcma/bcma.h @@ -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); |