This fixes a bunch of conflicts prior to merging i915 tree. Linux 3.18-rc7
Showing the changes to include/uapi (3 of 590 files). Show all
Unified · Split
| @@ -125,6 +125,7 @@ header-y += filter.h · 124 unmodified lines | ||
| 125 | 125 | header-y += firewire-cdev.h |
| 126 | 126 | header-y += firewire-constants.h |
| 127 | 127 | header-y += flat.h |
| 128 | +header-y += fou.h | |
| 128 | 129 | header-y += fs.h |
| 129 | 130 | header-y += fsl_hypervisor.h |
| 130 | 131 | header-y += fuse.h |
| @@ -141,6 +142,7 @@ header-y += hid.h · 10 unmodified lines | ||
| 141 | 142 | header-y += hiddev.h |
| 142 | 143 | header-y += hidraw.h |
| 143 | 144 | header-y += hpet.h |
| 145 | +header-y += hsr_netlink.h | |
| 144 | 146 | header-y += hyperv.h |
| 145 | 147 | header-y += hysdn_if.h |
| 146 | 148 | header-y += i2c-dev.h |
| @@ -251,6 +253,7 @@ header-y += mii.h · 104 unmodified lines | ||
| 251 | 253 | header-y += minix_fs.h |
| 252 | 254 | header-y += mman.h |
| 253 | 255 | header-y += mmtimer.h |
| 256 | +header-y += mpls.h | |
| 254 | 257 | header-y += mqueue.h |
| 255 | 258 | header-y += mroute.h |
| 256 | 259 | header-y += mroute6.h |
| @@ -424,6 +427,7 @@ header-y += virtio_net.h · 167 unmodified lines | ||
| 424 | 427 | header-y += virtio_pci.h |
| 425 | 428 | header-y += virtio_ring.h |
| 426 | 429 | header-y += virtio_rng.h |
| 430 | +header=y += vm_sockets.h | |
| 427 | 431 | header-y += vt.h |
| 428 | 432 | header-y += wait.h |
| 429 | 433 | header-y += wanrouter.h |
| @@ -15,6 +15,7 @@ · 14 unmodified lines | ||
| 15 | 15 | |
| 16 | 16 | #include <linux/types.h> |
| 17 | 17 | #include <linux/if_ether.h> |
| 18 | +#include <linux/in6.h> | |
| 18 | 19 | |
| 19 | 20 | #define SYSFS_BRIDGE_ATTR "bridge" |
| 20 | 21 | #define SYSFS_BRIDGE_FDB "brforward" |
| @@ -220,7 +220,9 @@ typedef int __bitwise snd_pcm_format_t; · 219 unmodified lines | ||
| 220 | 220 | #define SNDRV_PCM_FORMAT_DSD_U8 ((__force snd_pcm_format_t) 48) /* DSD, 1-byte samples DSD (x8) */ |
| 221 | 221 | #define SNDRV_PCM_FORMAT_DSD_U16_LE ((__force snd_pcm_format_t) 49) /* DSD, 2-byte samples DSD (x16), little endian */ |
| 222 | 222 | #define SNDRV_PCM_FORMAT_DSD_U32_LE ((__force snd_pcm_format_t) 50) /* DSD, 4-byte samples DSD (x32), little endian */ |
| 223 | −#define SNDRV_PCM_FORMAT_LAST SNDRV_PCM_FORMAT_DSD_U32_LE | |
| 223 | +#define SNDRV_PCM_FORMAT_DSD_U16_BE ((__force snd_pcm_format_t) 51) /* DSD, 2-byte samples DSD (x16), big endian */ | |
| 224 | +#define SNDRV_PCM_FORMAT_DSD_U32_BE ((__force snd_pcm_format_t) 52) /* DSD, 4-byte samples DSD (x32), big endian */ | |
| 225 | +#define SNDRV_PCM_FORMAT_LAST SNDRV_PCM_FORMAT_DSD_U32_BE | |
| 224 | 226 | |
| 225 | 227 | #ifdef SNDRV_LITTLE_ENDIAN |
| 226 | 228 | #define SNDRV_PCM_FORMAT_S16 SNDRV_PCM_FORMAT_S16_LE |