diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-12-09 12:41:59 -0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-12-09 12:41:59 -0200 |
| commit | fd42849371ad8f18a9ab72566dc53639a1ba37c3 (patch) | |
| tree | d6cd12ec3bcbb848305718c2d52b558afbc01f8d /linux/drivers/media/video/usbvision/usbvision-i2c.c | |
| parent | 5567495ad92482e3467abb0ca6fd91f4e71fdb6e (diff) | |
| download | mediapointer-dvb-s2-fd42849371ad8f18a9ab72566dc53639a1ba37c3.tar.gz mediapointer-dvb-s2-fd42849371ad8f18a9ab72566dc53639a1ba37c3.tar.bz2 | |
Fix identations around LINUX_VERSION_CODE
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media/video/usbvision/usbvision-i2c.c')
| -rw-r--r-- | linux/drivers/media/video/usbvision/usbvision-i2c.c | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/linux/drivers/media/video/usbvision/usbvision-i2c.c b/linux/drivers/media/video/usbvision/usbvision-i2c.c index 0ee2f155e..81bf4df65 100644 --- a/linux/drivers/media/video/usbvision/usbvision-i2c.c +++ b/linux/drivers/media/video/usbvision/usbvision-i2c.c @@ -29,8 +29,8 @@ #include <linux/delay.h> #include <linux/slab.h> #include <linux/version.h> -#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 14) - #include <linux/utsname.h> +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,14) +#include <linux/utsname.h> #endif #include <linux/init.h> #include <asm/uaccess.h> @@ -212,10 +212,8 @@ static void dec_use(struct i2c_adapter *adap) /* -----exported algorithm data: ------------------------------------- */ static struct i2c_algorithm i2c_usb_algo = { -#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0) - #if LINUX_VERSION_CODE > KERNEL_VERSION(2,4,30) +#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)) && (LINUX_VERSION_CODE > KERNEL_VERSION(2,4,30)) .owner = THIS_MODULE, - #endif #endif #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,14) .name = "USB algorithm", @@ -375,13 +373,13 @@ static int detach_inform(struct i2c_client *client) { struct usb_usbvision *usbvision; - #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0) - usbvision = (struct usb_usbvision *)client->adapter->data; - #else - usbvision = (struct usb_usbvision *)i2c_get_adapdata(client->adapter); - #endif +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0) + usbvision = (struct usb_usbvision *)client->adapter->data; +#else + usbvision = (struct usb_usbvision *)i2c_get_adapdata(client->adapter); +#endif - PDEBUG(DBG_I2C,"usbvision[%d] detaches %s", usbvision->nr, client->name); + PDEBUG(DBG_I2C,"usbvision[%d] detaches %s", usbvision->nr, client->name); return 0; } @@ -578,11 +576,13 @@ static struct i2c_adapter i2c_adap_template = { .algo_data = NULL, .client_register = attach_inform, .client_unregister = detach_inform, -#if defined (I2C_ADAP_CLASS_TV_ANALOG) +#ifdef I2C_ADAP_CLASS_TV_ANALOG .class = I2C_ADAP_CLASS_TV_ANALOG, -#elif defined (I2C_CLASS_TV_ANALOG) +#else +#ifdef I2C_CLASS_TV_ANALOG .class = I2C_CLASS_TV_ANALOG, #endif +#endif #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0) .data = NULL, #endif |