summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJon Smirl <jonsmirl@yahoo.com>2004-11-06 16:55:41 +0000
committerJon Smirl <jonsmirl@yahoo.com>2004-11-06 16:55:41 +0000
commit069f53a93b2c47c55c54dc8092ef23a9e7461033 (patch)
tree36348b692f8595322491a08bf54ce74a2bd2c7be
parent642a8106d270e74ec8ee1a809657d66f4fe6f542 (diff)
Move radeon i2c include to top of file
-rw-r--r--shared-core/radeon_drv.h12
1 files changed, 4 insertions, 8 deletions
diff --git a/shared-core/radeon_drv.h b/shared-core/radeon_drv.h
index b62580e9..617a7eda 100644
--- a/shared-core/radeon_drv.h
+++ b/shared-core/radeon_drv.h
@@ -31,6 +31,10 @@
#ifndef __RADEON_DRV_H__
#define __RADEON_DRV_H__
+#ifdef __linux__
+#include "radeon_i2c.h"
+#endif /* __linux__ */
+
/* General customization:
*/
@@ -103,12 +107,6 @@ enum radeon_cp_microcode_version {
UCODE_R300,
};
-#ifdef __linux__
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-#include "radeon_i2c.h"
-#endif
-#endif /* __linux__ */
-
/*
* Chip flags
*/
@@ -243,9 +241,7 @@ typedef struct drm_radeon_private {
/* starting from here on, data is preserved accross an open */
uint32_t flags; /* see radeon_chip_flags */
#ifdef __linux__
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
struct radeon_i2c_chan i2c[4];
-#endif
#endif /* __linux__ */
} drm_radeon_private_t;