Hi!
Here are fixes for drivers/media. [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/media/dvb/cinergyT2/cinergyT2.c 2005-03-29 13:29:54.000000000 +0200
+++ linux-cvs/drivers/media/dvb/cinergyT2/cinergyT2.c 2005-03-31 23:54:45.000000000 +0200
@@ -879,7 +879,7 @@
kfree(cinergyt2);
}
-static int cinergyt2_suspend (struct usb_interface *intf, u32 state)
+static int cinergyt2_suspend (struct usb_interface *intf, pm_message_t state)
{
struct cinergyt2 *cinergyt2 = usb_get_intfdata (intf);
--- clean-cvs/drivers/media/video/meye.c 2005-03-29 13:29:56.000000000 +0200
+++ linux-cvs/drivers/media/video/meye.c 2005-03-31 23:54:45.000000000 +0200
@@ -1768,7 +1768,7 @@
};
#ifdef CONFIG_PM
-static int meye_suspend(struct pci_dev *pdev, u32 state)
+static int meye_suspend(struct pci_dev *pdev, pm_message_t state)
{
pci_save_state(pdev);
meye.pm_mchip_mode = meye.mchip_mode;
--- clean-cvs/drivers/media/video/msp3400.c 2005-03-31 23:33:35.000000000 +0200
+++ linux-cvs/drivers/media/video/msp3400.c 2005-03-31 23:54:45.000000000 +0200
@@ -1426,7 +1426,7 @@
static int msp_probe(struct i2c_adapter *adap);
static int msp_command(struct i2c_client *client, unsigned int cmd, void *arg);
-static int msp_suspend(struct device * dev, u32 state, u32 level);
+static int msp_suspend(struct device * dev, pm_message_t state, u32 level);
static int msp_resume(struct device * dev, u32 level);
static void msp_wake_thread(struct i2c_client *client);
@@ -1834,7 +1834,7 @@
return 0;
}
-static int msp_suspend(struct device * dev, u32 state, u32 level)
+static int msp_suspend(struct device * dev, pm_message_t state, u32 level)
{
struct i2c_client *c = container_of(dev, struct i2c_client, dev);
--- clean-cvs/drivers/media/video/tda9887.c 2005-03-29 13:29:58.000000000 +0200
+++ linux-cvs/drivers/media/video/tda9887.c 2005-03-31 23:54:45.000000000 +0200
@@ -741,7 +741,7 @@
return 0;
}
-static int tda9887_suspend(struct device * dev, u32 state, u32 level)
+static int tda9887_suspend(struct device * dev, pm_message_t state, u32 level)
{
dprintk("tda9887: suspend\n");
return 0;
--- clean-cvs/drivers/media/video/tuner-core.c 2005-03-08 18:55:38.000000000 +0100
+++ linux-cvs/drivers/media/video/tuner-core.c 2005-03-31 23:54:45.000000000 +0200
@@ -378,7 +378,7 @@
return 0;
}
-static int tuner_suspend(struct device * dev, u32 state, u32 level)
+static int tuner_suspend(struct device * dev, pm_message_t state, u32 level)
{
struct i2c_client *c = container_of(dev, struct i2c_client, dev);
struct tuner *t = i2c_get_clientdata(c);
--
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/
[Index of Archives]
[Kernel Newbies]
[Netfilter]
[Bugtraq]
[Photo]
[Stuff]
[Gimp]
[Yosemite News]
[MIPS Linux]
[ARM Linux]
[Linux Security]
[Linux RAID]
[Video 4 Linux]
[Linux for the blind]
[Linux Resources]
