diff --git a/[refs] b/[refs] index bbfd2f12dd42..270ddc203257 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: db3affc0b256162a957253b4eaedb202885bb38d +refs/heads/master: 31df9ee8c63a8d9459358e9d4be17e331f63de76 diff --git a/trunk/drivers/video/sis/osdef.h b/trunk/drivers/video/sis/osdef.h index f59568020eb2..d048bd39961b 100644 --- a/trunk/drivers/video/sis/osdef.h +++ b/trunk/drivers/video/sis/osdef.h @@ -100,11 +100,7 @@ #define SIS315H #endif -#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0) #define SIS_LINUX_KERNEL_26 -#else -#define SIS_LINUX_KERNEL_24 -#endif #if !defined(SIS300) && !defined(SIS315H) #warning Neither CONFIG_FB_SIS_300 nor CONFIG_FB_SIS_315 is set