V4L/DVB (3381): Fix compilation with Alpha

[linux-2.6-omap-h63xx.git] / drivers / media / dvb / ttpci / av7110_hw.h

diff --git a/drivers/media/dvb/ttpci/av7110_hw.h b/drivers/media/dvb/ttpci/av7110_hw.h
index 84b83299b8bec7642c931ebf65177393860517e8..4e173c67fbb25e43efaf4425a7ed95c2edfed249 100644 (file)
--- a/drivers/media/dvb/ttpci/av7110_hw.h
+++ b/drivers/media/dvb/ttpci/av7110_hw.h
@@ -18,7 +18,7 @@ enum av7110_bootstate
 {
        BOOTSTATE_BUFFER_EMPTY  = 0,
        BOOTSTATE_BUFFER_FULL   = 1,
-       BOOTSTATE_BOOT_COMPLETE = 2
+       BOOTSTATE_AV7110_BOOT_COMPLETE  = 2
 };
 
 enum av7110_type_rec_play_format
@@ -295,11 +295,11 @@ enum av7110_command_type {
 #define        DPRAM_BASE 0x4000
 
 /* boot protocol area */
-#define BOOT_STATE     (DPRAM_BASE + 0x3F8)
-#define BOOT_SIZE      (DPRAM_BASE + 0x3FA)
-#define BOOT_BASE      (DPRAM_BASE + 0x3FC)
-#define BOOT_BLOCK     (DPRAM_BASE + 0x400)
-#define BOOT_MAX_SIZE  0xc00
+#define AV7110_BOOT_STATE      (DPRAM_BASE + 0x3F8)
+#define AV7110_BOOT_SIZE       (DPRAM_BASE + 0x3FA)
+#define AV7110_BOOT_BASE       (DPRAM_BASE + 0x3FC)
+#define AV7110_BOOT_BLOCK      (DPRAM_BASE + 0x400)
+#define AV7110_BOOT_MAX_SIZE   0xc00
 
 /* firmware command protocol area */
 #define IRQ_STATE      (DPRAM_BASE + 0x0F4)