diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-10-28 18:48:57 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-10-28 18:48:57 -0400 |
| commit | 596c96ba06e5d56e72451e02f93f4e15e17458df (patch) | |
| tree | 78bc640acacb8faeb621c51296e99dbb0533a147 /drivers/mmc/wbsd.c | |
| parent | ad18b0ea089928367185e13d11424aea91d4b41f (diff) | |
| parent | 20731945ae743034353a88c307920d1f16cf8ac8 (diff) | |
Merge branch 'master'
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 | ||