We want the USB fixes in here as well.
Showing the changes to include/uapi/linux (3 of 545 files). Show all
Unified · Split
| @@ -14,7 +14,6 @@ · 13 unmodified lines | |||
| 14 | 14 | ||
| 15 | #include <linux/atmapi.h> | 15 | #include <linux/atmapi.h> |
| 16 | #include <linux/atmioc.h> | 16 | #include <linux/atmioc.h> |
| 17 | #include <linux/time.h> | ||
| 18 | 17 | ||
| 19 | #define ZATM_GETPOOL _IOW('a',ATMIOC_SARPRV+1,struct atmif_sioc) | 18 | #define ZATM_GETPOOL _IOW('a',ATMIOC_SARPRV+1,struct atmif_sioc) |
| 20 | /* get pool statistics */ | 19 | /* get pool statistics */ |
| @@ -5,9 +5,7 @@ · 4 unmodified lines | |||
| 5 | * Defines for the BPQETHER pseudo device driver | 5 | * Defines for the BPQETHER pseudo device driver |
| 6 | */ | 6 | */ |
| 7 | 7 | ||
| 8 | #ifndef __LINUX_IF_ETHER_H | ||
| 9 | #include <linux/if_ether.h> | 8 | #include <linux/if_ether.h> |
| 10 | #endif | ||
| 11 | 9 | ||
| 12 | #define SIOCSBPQETHOPT (SIOCDEVPRIVATE+0) /* reserved */ | 10 | #define SIOCSBPQETHOPT (SIOCDEVPRIVATE+0) /* reserved */ |
| 13 | #define SIOCSBPQETHADDR (SIOCDEVPRIVATE+1) | 11 | #define SIOCSBPQETHADDR (SIOCDEVPRIVATE+1) |
| @@ -972,12 +972,19 @@ struct kvm_irqfd { · 971 unmodified lines | |||
| 972 | __u8 pad[16]; | 972 | __u8 pad[16]; |
| 973 | }; | 973 | }; |
| 974 | 974 | ||
| 975 | /* For KVM_CAP_ADJUST_CLOCK */ | ||
| 976 | |||
| 977 | /* Do not use 1, KVM_CHECK_EXTENSION returned it before we had flags. */ | ||
| 978 | #define KVM_CLOCK_TSC_STABLE 2 | ||
| 979 | |||
| 975 | struct kvm_clock_data { | 980 | struct kvm_clock_data { |
| 976 | __u64 clock; | 981 | __u64 clock; |
| 977 | __u32 flags; | 982 | __u32 flags; |
| 978 | __u32 pad[9]; | 983 | __u32 pad[9]; |
| 979 | }; | 984 | }; |
| 980 | 985 | ||
| 986 | /* For KVM_CAP_SW_TLB */ | ||
| 987 | |||
| 981 | #define KVM_MMU_FSL_BOOKE_NOHV 0 | 988 | #define KVM_MMU_FSL_BOOKE_NOHV 0 |
| 982 | #define KVM_MMU_FSL_BOOKE_HV 1 | 989 | #define KVM_MMU_FSL_BOOKE_HV 1 |
| 983 | 990 | ||