Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / include / video / s1d13xxxfb.h

diff --git a/include/video/s1d13xxxfb.h b/include/video/s1d13xxxfb.h
index f0736cff2ca3f15f2762634726f55a6f27af22e7..55f534491a3d1daac6f6c2ec9bc83ccc33082c38 100644 (file)
--- a/include/video/s1d13xxxfb.h
+++ b/include/video/s1d13xxxfb.h
@@ -136,12 +136,6 @@
 #define S1DREG_DELAYOFF                        0xFFFE
 #define S1DREG_DELAYON                 0xFFFF
 
-#define BBLT_FIFO_EMPTY                        0x00
-#define BBLT_FIFO_NOT_EMPTY            0x40
-#define BBLT_FIFO_NOT_FULL             0x30
-#define BBLT_FIFO_HALF_FULL            0x20
-#define BBLT_FIFO_FULL                 0x10
-
 #define BBLT_SOLID_FILL                        0x0c