diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-04 18:53:53 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-04 18:53:53 -0400 |
| commit | aababb9766f0e874da26a17acbbec867bf9501f0 (patch) | |
| tree | 4dea1f04d8c6d66ce00bb0ab49b939c165c3f33b /include/linux | |
| parent | b2bc4782191cb574924a1d09f48083ea8b33a93b (diff) | |
| parent | 3e86f1d8e397b1ef59a97910089e16a99e8f31f7 (diff) | |
Merge branch 'fbdev-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/fbdev-3.x
* 'fbdev-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/fbdev-3.x:
vesafb: fix memory leak
fbdev: amba: Link fb device to its parent
fsl-diu-fb: remove check for pixel clock ranges
udlfb: Correct sub-optimal resolution selection.
hecubafb: add module_put on error path in hecubafb_probe()
sm501fb: fix section mismatch warning
gx1fb: Fix section mismatch warnings
fbdev: sh_mobile_meram: Correct pointer check for YCbCr chroma plane
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/fsl-diu-fb.h | 6 |
1 files changed, 0 insertions, 6 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 @@ | |||
| 24 | * See mpc8610fb_set_par(), map_video_memory(), and unmap_video_memory() | 24 | * See mpc8610fb_set_par(), map_video_memory(), and unmap_video_memory() |
| 25 | */ | 25 | */ |
| 26 | #define MEM_ALLOC_THRESHOLD (1024*768*4+32) | 26 | #define MEM_ALLOC_THRESHOLD (1024*768*4+32) |
| 27 | /* Minimum value that the pixel clock can be set to in pico seconds | ||
| 28 | * This is determined by platform clock/3 where the minimum platform | ||
| 29 | * clock is 533MHz. This gives 5629 pico seconds. | ||
| 30 | */ | ||
| 31 | #define MIN_PIX_CLK 5629 | ||
| 32 | #define MAX_PIX_CLK 96096 | ||
| 33 | 27 | ||
| 34 | #include <linux/types.h> | 28 | #include <linux/types.h> |
| 35 | 29 | ||