summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2012-01-17 12:11:52 -0500
committerDavid S. Miller <davem@davemloft.net>2012-01-17 12:11:52 -0500
commit4144cb2ade46d97b9c41682fd2e9064a59f23a98 (patch)
tree4b5ef937b4d0dcede6b1669f03c3b6dccf57d5bc /include
parent59f608d84f937cb5e2fd3a0b9f848f200d47ba85 (diff)
parent604c4ef1c453a1b2ea2cdf04d2b49afec421ebfa (diff)
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.h2
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);