Merge branch 'for-3.2/drivers' of git://git.kernel.dk/linux-block

[karo-tx-linux.git] / drivers / video / via / ioctl.h

diff --git a/drivers/video/via/ioctl.h b/drivers/video/via/ioctl.h
index c430fa23008ae1861d14362ce82e61de6844ab93..6010d10b59e8834677b4ddc880e87f372a616e5a 100644 (file)
--- a/drivers/video/via/ioctl.h
+++ b/drivers/video/via/ioctl.h
@@ -35,11 +35,9 @@
 #define VIAFB_GET_SAMM_INFO            0x56494107      /* 'VIA\07' */
 #define VIAFB_TURN_ON_OUTPUT_DEVICE     0x56494108     /* 'VIA\08' */
 #define VIAFB_TURN_OFF_OUTPUT_DEVICE    0x56494109     /* 'VIA\09' */
-#define VIAFB_SET_DEVICE               0x5649410A
 #define VIAFB_GET_DEVICE               0x5649410B
 #define VIAFB_GET_DRIVER_VERSION       0x56494112      /* 'VIA\12' */
 #define VIAFB_GET_CHIP_INFO            0x56494113      /* 'VIA\13' */
-#define VIAFB_SET_DEVICE_INFO           0x56494114
 #define VIAFB_GET_DEVICE_INFO           0x56494115
 
 #define VIAFB_GET_DEVICE_SUPPORT       0x56494118
@@ -50,7 +48,6 @@
 #define VIAFB_GET_GAMMA_LUT            0x56494124
 #define VIAFB_SET_GAMMA_LUT            0x56494125
 #define VIAFB_GET_GAMMA_SUPPORT_STATE  0x56494126
-#define VIAFB_SET_SECOND_MODE          0x56494129
 #define VIAFB_SYNC_SURFACE             0x56494130
 #define VIAFB_GET_DRIVER_CAPS          0x56494131
 #define VIAFB_GET_IGA_SCALING_INFO     0x56494132