Hi!
Here are fixes for drivers/char. [These patches are independend and
change no object code; therefore not numbered].
Please apply,
Signed-off-by: Pavel Machek <[EMAIL PROTECTED]>
Pavel
--- clean-cvs/drivers/char/agp/efficeon-agp.c 2005-03-29 13:29:41.000000000
+0200
+++ linux-cvs/drivers/char/agp/efficeon-agp.c 2005-03-31 23:54:43.000000000
+0200
@@ -408,7 +408,7 @@
agp_put_bridge(bridge);
}
-static int agp_efficeon_suspend(struct pci_dev *dev, u32 state)
+static int agp_efficeon_suspend(struct pci_dev *dev, pm_message_t state)
{
return 0;
}
--- clean-cvs/drivers/char/s3c2410-rtc.c 2005-03-29 13:29:40.000000000
+0200
+++ linux-cvs/drivers/char/s3c2410-rtc.c 2005-03-31 23:54:43.000000000
+0200
@@ -515,7 +515,7 @@
static int ticnt_save;
-static int s3c2410_rtc_suspend(struct device *dev, u32 state, u32 level)
+static int s3c2410_rtc_suspend(struct device *dev, pm_message_t state, u32
level)
{
struct rtc_time tm;
struct timespec time;
--- clean-cvs/drivers/char/sonypi.c 2005-03-29 13:29:40.000000000 +0200
+++ linux-cvs/drivers/char/sonypi.c 2005-03-31 23:54:43.000000000 +0200
@@ -1103,7 +1103,7 @@
#ifdef CONFIG_PM
static int old_camera_power;
-static int sonypi_suspend(struct device *dev, u32 state, u32 level)
+static int sonypi_suspend(struct device *dev, pm_message_t state, u32 level)
{
if (level == SUSPEND_DISABLE) {
old_camera_power = sonypi_device.camera_power;
--- clean-cvs/drivers/char/tpm/tpm.c 2005-03-31 23:33:09.000000000 +0200
+++ linux-cvs/drivers/char/tpm/tpm.c 2005-03-31 23:54:43.000000000 +0200
@@ -567,7 +567,7 @@
* We are about to suspend. Save the TPM state
* so that it can be restored.
*/
-int tpm_pm_suspend(struct pci_dev *pci_dev, u32 pm_state)
+int tpm_pm_suspend(struct pci_dev *pci_dev, pm_message_t pm_state)
{
struct tpm_chip *chip = pci_get_drvdata(pci_dev);
if (chip == NULL)
--- clean-cvs/drivers/char/tpm/tpm.h 2005-03-31 23:33:09.000000000 +0200
+++ linux-cvs/drivers/char/tpm/tpm.h 2005-03-31 23:54:43.000000000 +0200
@@ -89,5 +89,5 @@
loff_t *);
extern ssize_t tpm_read(struct file *, char __user *, size_t, loff_t *);
extern void __devexit tpm_remove(struct pci_dev *);
-extern int tpm_pm_suspend(struct pci_dev *, u32);
+extern int tpm_pm_suspend(struct pci_dev *, pm_message_t);
extern int tpm_pm_resume(struct pci_dev *);
--
People were complaining that M$ turns users into beta-testers...
...jr ghea gurz vagb qrirybcref, naq gurl frrz gb yvxr vg gung jnl!
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
