diff --git a/[refs] b/[refs] index cea7157a7e12..a4ffda48e51e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4b455e0dabbe5f023ce906741295d64c4234672f +refs/heads/master: 9fada0a0c5d4f51064e20b3a4fb15437992757cd diff --git a/trunk/drivers/staging/vt6655/device.h b/trunk/drivers/staging/vt6655/device.h index 2e7c2fd7b7e6..780205c0a88b 100644 --- a/trunk/drivers/staging/vt6655/device.h +++ b/trunk/drivers/staging/vt6655/device.h @@ -396,7 +396,7 @@ typedef struct __device_info { struct pci_dev* pcid; -#if CONFIG_PM +#ifdef CONFIG_PM u32 pci_state[16]; #endif