diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-28 16:09:47 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-28 16:09:47 -0400 |
commit | 84860bf0644d7c45afe7ddbd30731c3e3c371fae (patch) | |
tree | d6c4b98a9c3fd9981e7fcc5d7729c9e01e327767 /drivers/mmc/wbsd.c | |
parent | 8caf89157d64f1eedba37113afb4b303b2b3e301 (diff) | |
parent | 6fbfddcb52d8d9fa2cd209f5ac2a1c87497d55b5 (diff) |
Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6
Diffstat (limited to 'drivers/mmc/wbsd.c')
-rw-r--r-- | drivers/mmc/wbsd.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/mmc/wbsd.c b/drivers/mmc/wbsd.c index 3cbca7cbea80..25f7ce7b3bc0 100644 --- a/drivers/mmc/wbsd.c +++ b/drivers/mmc/wbsd.c | |||
@@ -1955,14 +1955,14 @@ static void __devexit wbsd_pnp_remove(struct pnp_dev * dev) | |||
1955 | */ | 1955 | */ |
1956 | 1956 | ||
1957 | #ifdef CONFIG_PM | 1957 | #ifdef CONFIG_PM |
1958 | static int wbsd_suspend(struct device *dev, pm_message_t state, u32 level) | 1958 | static int wbsd_suspend(struct device *dev, pm_message_t state) |
1959 | { | 1959 | { |
1960 | DBGF("Not yet supported\n"); | 1960 | DBGF("Not yet supported\n"); |
1961 | 1961 | ||
1962 | return 0; | 1962 | return 0; |
1963 | } | 1963 | } |
1964 | 1964 | ||
1965 | static int wbsd_resume(struct device *dev, u32 level) | 1965 | static int wbsd_resume(struct device *dev) |
1966 | { | 1966 | { |
1967 | DBGF("Not yet supported\n"); | 1967 | DBGF("Not yet supported\n"); |
1968 | 1968 | ||