diff options
| author | Mauro Carvalho Chehab <devnull@localhost> | 2005-12-07 12:30:28 +0000 |
|---|---|---|
| committer | Mauro Carvalho Chehab <devnull@localhost> | 2005-12-07 12:30:28 +0000 |
| commit | fcca0bf9fe4f592088e2263cc8586ea6cf10cec9 (patch) | |
| tree | 7a98f3bd2c6e24ffbe01794c0f4a6a6eadbe20bc /linux/drivers/media/video/tuner-core.c | |
| parent | 18f9f36ea729d7c6017dcfaaca08d7a8ed5a4935 (diff) | |
| download | mediapointer-dvb-s2-fcca0bf9fe4f592088e2263cc8586ea6cf10cec9.tar.gz mediapointer-dvb-s2-fcca0bf9fe4f592088e2263cc8586ea6cf10cec9.tar.bz2 | |
kernel-sync patches.
kernel-sync
Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
Diffstat (limited to 'linux/drivers/media/video/tuner-core.c')
| -rw-r--r-- | linux/drivers/media/video/tuner-core.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/linux/drivers/media/video/tuner-core.c b/linux/drivers/media/video/tuner-core.c index 62b1a9fe5..ccc3b1af9 100644 --- a/linux/drivers/media/video/tuner-core.c +++ b/linux/drivers/media/video/tuner-core.c @@ -1,5 +1,5 @@ /* - * $Id: tuner-core.c,v 1.88 2005/12/04 12:21:15 hverkuil Exp $ + * $Id: tuner-core.c,v 1.89 2005/12/07 12:30:28 mchehab Exp $ * * i2c tv tuner chip device driver * core core, i.e. kernel interfaces, registering and so on @@ -757,11 +757,13 @@ static int tuner_command(struct i2c_client *client, unsigned int cmd, void *arg) #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0) #if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,14) static int tuner_suspend(struct device *dev, pm_message_t state) -#elif LINUX_VERSION_CODE > KERNEL_VERSION(2,6,13) +#else +#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,13) static int tuner_suspend(struct device *dev, pm_message_t state, u32 level) #else static int tuner_suspend(struct device *dev, u32 state, u32 level) #endif +#endif { struct i2c_client *c = container_of (dev, struct i2c_client, dev); struct tuner *t = i2c_get_clientdata (c); |