diff --git a/[refs] b/[refs] index e4e165588ff3..f67e64609aaa 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 251b9b0d403f61f507155697a459038b2ee3336c +refs/heads/master: 2b7a905dd0d24d14a1099653ba63b7113a82fc54 diff --git a/trunk/include/linux/fsl-diu-fb.h b/trunk/include/linux/fsl-diu-fb.h index 35ac0c53975c..df23f599f5db 100644 --- a/trunk/include/linux/fsl-diu-fb.h +++ b/trunk/include/linux/fsl-diu-fb.h @@ -20,11 +20,6 @@ #ifndef __FSL_DIU_FB_H__ #define __FSL_DIU_FB_H__ -/* Arbitrary threshold to determine the allocation method - * See mpc8610fb_set_par(), map_video_memory(), and unmap_video_memory() - */ -#define MEM_ALLOC_THRESHOLD (1024*768*4+32) - #include struct mfb_chroma_key {