diff --git a/[refs] b/[refs] index 7a66bcae45d4..20da5a285d9b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4ec4aa4ae079d0a495a29c8e7ba5936a666a0bfb +refs/heads/master: 74533af4b6867bd4cc38bffec4e8ff7247dd89c8 diff --git a/trunk/drivers/staging/vt6655/device_cfg.h b/trunk/drivers/staging/vt6655/device_cfg.h index 408edc27075f..145457ba768d 100644 --- a/trunk/drivers/staging/vt6655/device_cfg.h +++ b/trunk/drivers/staging/vt6655/device_cfg.h @@ -34,9 +34,9 @@ typedef struct _version { - unsigned char major; - unsigned char minor; - unsigned char build; + unsigned char major; + unsigned char minor; + unsigned char build; } version_t, *pversion_t; #define VID_TABLE_SIZE 64 @@ -76,20 +76,20 @@ struct _version { -typedef enum _chip_type{ - VT3253=1 +typedef enum _chip_type { + VT3253 = 1 } CHIP_TYPE, *PCHIP_TYPE; #ifdef VIAWET_DEBUG -#define ASSERT(x) { \ - if (!(x)) { \ - printk(KERN_ERR "assertion %s failed: file %s line %d\n", #x,\ - __FUNCTION__, __LINE__);\ - *(int*) 0=0;\ - }\ -} +#define ASSERT(x) { \ + if (!(x)) { \ + printk(KERN_ERR "assertion %s failed: file %s line %d\n", #x, \ + __FUNCTION__, __LINE__); \ + *(int *)0 = 0; \ + } \ + } #define DBG_PORT80(value) outb(value, 0x80) #else #define ASSERT(x)