diff --git a/[refs] b/[refs] index 48aec59d81f1..209a94c0d92f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2d8ab6ad6edf0e8709da9ad24e3f023503f76cee +refs/heads/master: fd2e54b35bd70d11c160ded4834e2378e915356e diff --git a/trunk/include/linux/mod_devicetable.h b/trunk/include/linux/mod_devicetable.h index 4ed2107bc020..2f0299a448f6 100644 --- a/trunk/include/linux/mod_devicetable.h +++ b/trunk/include/linux/mod_devicetable.h @@ -183,7 +183,7 @@ struct of_device_id char name[32]; char type[32]; char compatible[128]; -#if __KERNEL__ +#ifdef __KERNEL__ void *data; #else kernel_ulong_t data;