diff options
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/agp_backend.h | 2 | ||||
| -rw-r--r-- | include/linux/compat.h | 4 | ||||
| -rw-r--r-- | include/linux/fb.h | 1 | ||||
| -rw-r--r-- | include/linux/pci_ids.h | 1 |
4 files changed, 7 insertions, 1 deletions
diff --git a/include/linux/agp_backend.h b/include/linux/agp_backend.h index e6fa886e8d82..90890f4e9e6d 100644 --- a/include/linux/agp_backend.h +++ b/include/linux/agp_backend.h @@ -60,8 +60,10 @@ enum chipset_type { VIA_APOLLO_KX133, VIA_APOLLO_KT133, VIA_APOLLO_KT400, + VIA_APOLLO_KT400_3, VIA_APOLLO_PRO_266, VIA_VT8605, + VIA_P4X400, SIS_GENERIC, AMD_GENERIC, AMD_IRONGATE, diff --git a/include/linux/compat.h b/include/linux/compat.h index 62daefb17672..3f634baef539 100644 --- a/include/linux/compat.h +++ b/include/linux/compat.h @@ -9,9 +9,11 @@ #ifdef CONFIG_COMPAT #include <linux/stat.h> +#include <linux/param.h> /* for HZ */ #include <asm/compat.h> -#define compat_jiffies_to_clock_t(x) ((x) / (HZ / COMPAT_USER_HZ)) +#define compat_jiffies_to_clock_t(x) \ + (((unsigned long)(x) * COMPAT_USER_HZ) / HZ) struct compat_utimbuf { compat_time_t actime; diff --git a/include/linux/fb.h b/include/linux/fb.h index 128e310b9f5d..8a4734f94463 100644 --- a/include/linux/fb.h +++ b/include/linux/fb.h @@ -425,6 +425,7 @@ struct fb_info { #define fb_readb __raw_readb #define fb_readw __raw_readw #define fb_readl __raw_readl +#define fb_readq __raw_readq #define fb_writeb __raw_writeb #define fb_writew __raw_writew #define fb_writel __raw_writel diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h index f9945ae00d7a..89874d8eeee7 100644 --- a/include/linux/pci_ids.h +++ b/include/linux/pci_ids.h @@ -1092,6 +1092,7 @@ #define PCI_DEVICE_ID_VIA_8233C_0 0x3109 #define PCI_DEVICE_ID_VIA_8361 0x3112 #define PCI_DEVICE_ID_VIA_8233A 0x3147 +#define PCI_DEVICE_ID_VIA_8235_0 0x3168 #define PCI_DEVICE_ID_VIA_8235 0x3177 #define PCI_DEVICE_ID_VIA_8377_0 0x3189 #define PCI_DEVICE_ID_VIA_86C100A 0x6100 |