Merge tag 'v3.7-rc3' into next to sync up with recent USB and MFD changes

1 files changed, 15 insertions, 0 deletions

diff --git a/include/uapi/linux/radeonfb.h b/include/uapi/linux/radeonfb.h
new file mode 100644
index 000000000000..8c4bbdecc44f
--- /dev/null
+++ b/include/uapi/linux/radeonfb.h
@@ -0,0 +1,15 @@
+#ifndef __LINUX_RADEONFB_H__
+#define __LINUX_RADEONFB_H__
+
+#include <asm/ioctl.h>
+#include <linux/types.h>
+
+#define ATY_RADEON_LCD_ON       0x00000001
+#define ATY_RADEON_CRT_ON       0x00000002
+
+
+#define FBIO_RADEON_GET_MIRROR  _IOR('@', 3, size_t)
+#define FBIO_RADEON_SET_MIRROR  _IOW('@', 4, size_t)
+
+#endif
+