diff options
| author | Michael Krufky <devnull@localhost> | 2005-07-30 19:47:02 +0000 |
|---|---|---|
| committer | Michael Krufky <devnull@localhost> | 2005-07-30 19:47:02 +0000 |
| commit | c698da52c95f1058073a0f10b8477a0a86105125 (patch) | |
| tree | 0b5bc92724605b30a3f7ba13e067e55b018e21ef /linux/drivers/media/video/msp3400-driver.c | |
| parent | cc9ca28525b2125ef6139caf341dca98201d011c (diff) | |
| download | mediapointer-dvb-s2-c698da52c95f1058073a0f10b8477a0a86105125.tar.gz mediapointer-dvb-s2-c698da52c95f1058073a0f10b8477a0a86105125.tar.bz2 | |
* bttv-driver.c, msp3400.c, tda9887.c, tuner-core.c:
* Makefile, scripts/merge-trees.sh, scripts/unmerge-trees.sh:
- Fix cvs compile to work for both latest -linus and -mm trees.
Signed-off-by: Michael Krufky <mkrufky@m1k.net>
Diffstat (limited to 'linux/drivers/media/video/msp3400-driver.c')
| -rw-r--r-- | linux/drivers/media/video/msp3400-driver.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/linux/drivers/media/video/msp3400-driver.c b/linux/drivers/media/video/msp3400-driver.c index 9b5d929e8..4d81952ff 100644 --- a/linux/drivers/media/video/msp3400-driver.c +++ b/linux/drivers/media/video/msp3400-driver.c @@ -1444,7 +1444,7 @@ static int msp_detach(struct i2c_client *client); static int msp_probe(struct i2c_adapter *adap); static int msp_command(struct i2c_client *client, unsigned int cmd, void *arg); -#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,13) +#ifdef MM_KERNEL static int msp_suspend(struct device * dev, pm_message_t state, u32 level); #else static int msp_suspend(struct device * dev, u32 state, u32 level); @@ -1853,7 +1853,7 @@ static int msp_command(struct i2c_client *client, unsigned int cmd, void *arg) return 0; } -#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,13) +#ifdef MM_KERNEL static int msp_suspend(struct device * dev, pm_message_t state, u32 level) #else static int msp_suspend(struct device * dev, u32 state, u32 level) |