diff options
| author | Keith Packard <keithp@keithp.com> | 2011-07-07 22:39:38 +0200 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2011-07-07 22:39:38 +0200 |
| commit | bc67f799e7667fb3c00286f2415c3cc44a253aec (patch) | |
| tree | 271ae5f17012caafe3d3ac3daf0776808b71cf48 /include | |
| parent | drm/i915: use pipe bpp in DP link bandwidth calculation (diff) | |
| parent | drm/i915/dp: manage sink power state if possible (diff) | |
| download | linux-bc67f799e7667fb3c00286f2415c3cc44a253aec.tar.xz linux-bc67f799e7667fb3c00286f2415c3cc44a253aec.zip | |
Merge branch 'drm-intel-fixes' into drm-intel-next
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/fsl-diu-fb.h | 6 | ||||
| -rw-r--r-- | include/sound/sb16_csp.h | 9 |
2 files changed, 8 insertions, 7 deletions
diff --git a/include/linux/fsl-diu-fb.h b/include/linux/fsl-diu-fb.h index 781d4671415f..daa9952d2174 100644 --- a/include/linux/fsl-diu-fb.h +++ b/include/linux/fsl-diu-fb.h @@ -24,12 +24,6 @@ * See mpc8610fb_set_par(), map_video_memory(), and unmap_video_memory() */ #define MEM_ALLOC_THRESHOLD (1024*768*4+32) -/* Minimum value that the pixel clock can be set to in pico seconds - * This is determined by platform clock/3 where the minimum platform - * clock is 533MHz. This gives 5629 pico seconds. - */ -#define MIN_PIX_CLK 5629 -#define MAX_PIX_CLK 96096 #include <linux/types.h> diff --git a/include/sound/sb16_csp.h b/include/sound/sb16_csp.h index 736eac71d053..af1b49e982df 100644 --- a/include/sound/sb16_csp.h +++ b/include/sound/sb16_csp.h @@ -99,7 +99,14 @@ struct snd_sb_csp_info { /* get CSP information */ #define SNDRV_SB_CSP_IOCTL_INFO _IOR('H', 0x10, struct snd_sb_csp_info) /* load microcode to CSP */ -#define SNDRV_SB_CSP_IOCTL_LOAD_CODE _IOW('H', 0x11, struct snd_sb_csp_microcode) +/* NOTE: struct snd_sb_csp_microcode overflows the max size (13 bits) + * defined for some architectures like MIPS, and it leads to build errors. + * (x86 and co have 14-bit size, thus it's valid, though.) + * As a workaround for skipping the size-limit check, here we don't use the + * normal _IOW() macro but _IOC() with the manual argument. + */ +#define SNDRV_SB_CSP_IOCTL_LOAD_CODE \ + _IOC(_IOC_WRITE, 'H', 0x11, sizeof(struct snd_sb_csp_microcode)) /* unload microcode from CSP */ #define SNDRV_SB_CSP_IOCTL_UNLOAD_CODE _IO('H', 0x12) /* start CSP */ |