- remove enumeration typedefs

- change some includes

25 files changed, 65 insertions, 77 deletions

diff --git a/linux/drivers/media/dvb/dvb-core/demux.h b/linux/drivers/media/dvb/dvb-core/demux.h
index e1b3f88b6..550a5db83 100644
--- a/linux/drivers/media/dvb/dvb-core/demux.h
+++ b/linux/drivers/media/dvb/dvb-core/demux.h
@@ -26,7 +26,7 @@
 #define __DEMUX_H 
 
 #include <asm/types.h>
-#include <asm/errno.h>
+#include <linux/errno.h>
 #include <linux/list.h> 
 #include <linux/time.h> 
 
@@ -43,10 +43,10 @@
 #endif 
 
 /*
- * dmx_success_t: Success codes for the Demux Callback API. 
+ * enum dmx_success: Success codes for the Demux Callback API. 
  */ 
 
-typedef enum { 
+enum dmx_success { 
   DMX_OK = 0, /* Received Ok */ 
   DMX_LENGTH_ERROR, /* Incorrect length */ 
   DMX_OVERRUN_ERROR, /* Receiver ring buffer overrun */ 
@@ -54,7 +54,7 @@ typedef enum {
   DMX_FRAME_ERROR, /* Frame alignment error */ 
   DMX_FIFO_ERROR, /* Receiver FIFO overrun */ 
   DMX_MISSED_ERROR /* Receiver missed packet */ 
-} dmx_success_t; 
+} ; 
 
 /*--------------------------------------------------------------------------*/ 
 /* TS packet reception */ 
@@ -70,7 +70,7 @@ typedef enum {
 /* PES type for filters which write to built-in decoder */
 /* these should be kept identical to the types in dmx.h */
 
-typedef enum
+enum dmx_ts_pes
 {  /* also send packets to decoder (if it exists) */
         DMX_TS_PES_AUDIO0,
 	DMX_TS_PES_VIDEO0,
@@ -97,7 +97,7 @@ typedef enum
 	DMX_TS_PES_PCR3,
 
 	DMX_TS_PES_OTHER
-} dmx_ts_pes_t;
+};
 
 #define DMX_TS_PES_AUDIO    DMX_TS_PES_AUDIO0
 #define DMX_TS_PES_VIDEO    DMX_TS_PES_VIDEO0
@@ -113,7 +113,7 @@ struct dmx_ts_feed {
         int (*set) (struct dmx_ts_feed *feed, 
 		    u16 pid,
 		    int type, 
-		    dmx_ts_pes_t pes_type,
+		    enum dmx_ts_pes pes_type,
 		    size_t callback_length, 
 		    size_t circular_buffer_size, 
 		    int descramble, 
@@ -168,20 +168,20 @@ typedef int (*dmx_ts_cb) ( const u8 * buffer1,
 			   const u8 * buffer2, 
 			   size_t buffer2_length,
 			   struct dmx_ts_feed* source, 
-			   dmx_success_t success); 
+			   enum dmx_success success); 
 
 typedef int (*dmx_section_cb) (	const u8 * buffer1,
 				size_t buffer1_len,
 				const u8 * buffer2, 
 				size_t buffer2_len,
 			       	struct dmx_section_filter * source,
-			       	dmx_success_t success);
+			       	enum dmx_success success);
 
 /*--------------------------------------------------------------------------*/ 
 /* DVB Front-End */
 /*--------------------------------------------------------------------------*/ 
 
-typedef enum { 
+enum dmx_frontend_source { 
 	DMX_MEMORY_FE,
 	DMX_FRONTEND_0,
 	DMX_FRONTEND_1,
@@ -191,14 +191,14 @@ typedef enum {
 	DMX_STREAM_1,
 	DMX_STREAM_2,
 	DMX_STREAM_3
-} dmx_frontend_source_t; 
+}; 
 
 struct dmx_frontend { 
         struct list_head connectivity_list; /* List of front-ends that can 
 					       be connected to a particular 
 					       demux */ 
         void* priv;     /* Pointer to private data of the API client */ 
-        dmx_frontend_source_t source;
+        enum dmx_frontend_source source;
 };
 
 /*--------------------------------------------------------------------------*/ 
diff --git a/linux/drivers/media/dvb/dvb-core/dmxdev.c b/linux/drivers/media/dvb/dvb-core/dmxdev.c
index 61f801f0c..74f6d9698 100644
--- a/linux/drivers/media/dvb/dvb-core/dmxdev.c
+++ b/linux/drivers/media/dvb/dvb-core/dmxdev.c
@@ -358,7 +358,7 @@ dvb_dmxdev_filter_timer(struct dmxdev_filter *dmxdevfilter)
 static int 
 dvb_dmxdev_section_callback(const u8 *buffer1, size_t buffer1_len,
 			    const u8 *buffer2, size_t buffer2_len,
-			    struct dmx_section_filter *filter, dmx_success_t success)
+			    struct dmx_section_filter *filter, enum dmx_success success)
 {
 	struct dmxdev_filter *dmxdevfilter=(struct dmxdev_filter *) filter->priv;
 	int ret;
@@ -395,7 +395,7 @@ dvb_dmxdev_section_callback(const u8 *buffer1, size_t buffer1_len,
 static int 
 dvb_dmxdev_ts_callback(const u8 *buffer1, size_t buffer1_len,
 		       const u8 *buffer2, size_t buffer2_len,
-		       struct dmx_ts_feed *feed, dmx_success_t success)
+		       struct dmx_ts_feed *feed, enum dmx_success success)
 {
 	struct dmxdev_filter *dmxdevfilter=(struct dmxdev_filter *) feed->priv;
 	struct dmxdev_buffer *buffer;
@@ -654,13 +654,13 @@ dvb_dmxdev_filter_start(struct dmxdev_filter *filter)
 		dmx_output_t otype;
 		int ret;
 		int ts_type;
-		dmx_ts_pes_t ts_pes;
+		enum dmx_ts_pes ts_pes;
 		struct dmx_ts_feed **tsfeed = &filter->feed.ts;
 		
 		filter->feed.ts = 0;
 		otype=para->output;
 		
-		ts_pes=(dmx_ts_pes_t) para->pes_type;
+		ts_pes=(enum dmx_ts_pes) para->pes_type;
 		
 		if (ts_pes<DMX_PES_OTHER) 
 			ts_type=TS_DECODER;
diff --git a/linux/drivers/media/dvb/dvb-core/dmxdev.h b/linux/drivers/media/dvb/dvb-core/dmxdev.h
index c491f1e37..b448cda04 100644
--- a/linux/drivers/media/dvb/dvb-core/dmxdev.h
+++ b/linux/drivers/media/dvb/dvb-core/dmxdev.h
@@ -38,20 +38,20 @@
 #include "dvbdev.h"
 #include "demux.h"
 
-typedef enum {
+enum dmxdevype {
 	DMXDEV_TYPE_NONE,
 	DMXDEV_TYPE_SEC,
 	DMXDEV_TYPE_PES,
-} dmxdevype_t;
+};
 
-typedef enum {
+enum dmxdev_state {
 	DMXDEV_STATE_FREE,
 	DMXDEV_STATE_ALLOCATED,
 	DMXDEV_STATE_SET,
 	DMXDEV_STATE_GO,
 	DMXDEV_STATE_DONE,
 	DMXDEV_STATE_TIMEDOUT
-} dmxdev_state_t;
+};
 
 struct dmxdev_buffer {
         u8 *data;
@@ -80,7 +80,7 @@ struct dmxdev_filter {
 	} params;
 
         int type;
-        dmxdev_state_t state;
+        enum dmxdev_state state;
         struct dmxdev *dev;
         struct dmxdev_buffer buffer;
 
diff --git a/linux/drivers/media/dvb/dvb-core/dvb_demux.c b/linux/drivers/media/dvb/dvb-core/dvb_demux.c
index 973f3ba7a..bce746b5e 100644
--- a/linux/drivers/media/dvb/dvb-core/dvb_demux.c
+++ b/linux/drivers/media/dvb/dvb-core/dvb_demux.c
@@ -509,7 +509,7 @@ int dmx_pid_set (u16 pid, struct dvb_demux_feed *feed)
 
 static
 int dmx_ts_feed_set (struct dmx_ts_feed* ts_feed, u16 pid, int ts_type, 
-		     dmx_ts_pes_t pes_type, size_t callback_length, 
+		     enum dmx_ts_pes pes_type, size_t callback_length, 
 		     size_t circular_buffer_size, int descramble, 
 		     struct timespec timeout)
 {
diff --git a/linux/drivers/media/dvb/dvb-core/dvb_demux.h b/linux/drivers/media/dvb/dvb-core/dvb_demux.h
index 35dc8d4b3..135af1031 100644
--- a/linux/drivers/media/dvb/dvb-core/dvb_demux.h
+++ b/linux/drivers/media/dvb/dvb-core/dvb_demux.h
@@ -91,7 +91,7 @@ struct dvb_demux_feed {
         int cb_length;
   
         int ts_type;
-        dmx_ts_pes_t pes_type;
+        enum dmx_ts_pes pes_type;
 
         int cc;
 
diff --git a/linux/drivers/media/dvb/dvb-core/dvb_frontend.c b/linux/drivers/media/dvb/dvb-core/dvb_frontend.c
index f18c70c56..ebc550147 100644
--- a/linux/drivers/media/dvb/dvb-core/dvb_frontend.c
+++ b/linux/drivers/media/dvb/dvb-core/dvb_frontend.c
@@ -24,7 +24,6 @@
 
 #include <asm/processor.h>
 #include <asm/semaphore.h>
-#include <asm/errno.h>
 #include <linux/string.h>
 #include <linux/kernel.h>
 #include <linux/sched.h>
diff --git a/linux/drivers/media/dvb/dvb-core/dvb_frontend.h b/linux/drivers/media/dvb/dvb-core/dvb_frontend.h
index 03a37b946..789ef57db 100644
--- a/linux/drivers/media/dvb/dvb-core/dvb_frontend.h
+++ b/linux/drivers/media/dvb/dvb-core/dvb_frontend.h
@@ -30,10 +30,7 @@
 #include <linux/ioctl.h>
 #include <linux/i2c.h>
 #include <linux/module.h>
-
-#ifndef MODULE_LICENSE
-#define MODULE_LICENSE(x)
-#endif
+#include <linux/errno.h>
 
 #include <linux/dvb/frontend.h>
 
diff --git a/linux/drivers/media/dvb/dvb-core/dvb_functions.c b/linux/drivers/media/dvb/dvb-core/dvb_functions.c
index a2bc3ac15..5dd60df0f 100644
--- a/linux/drivers/media/dvb/dvb-core/dvb_functions.c
+++ b/linux/drivers/media/dvb/dvb-core/dvb_functions.c
@@ -6,7 +6,7 @@
 #include <linux/version.h>
 #include <linux/fs.h>
 #include <asm/uaccess.h>
-#include <asm/errno.h>
+#include <linux/errno.h>
 #include <linux/module.h>
 #include <linux/ioctl.h>
 #include <linux/slab.h>
diff --git a/linux/drivers/media/dvb/dvb-core/dvb_i2c.c b/linux/drivers/media/dvb/dvb-core/dvb_i2c.c
index c0d45e8bc..2d6e5c20d 100644
--- a/linux/drivers/media/dvb/dvb-core/dvb_i2c.c
+++ b/linux/drivers/media/dvb/dvb-core/dvb_i2c.c
@@ -20,7 +20,7 @@
  */
 
 #include <asm/semaphore.h>
-#include <asm/errno.h>
+#include <linux/errno.h>
 #include <linux/slab.h>
 #include <linux/list.h>
 #include <linux/module.h>
diff --git a/linux/drivers/media/dvb/dvb-core/dvb_ksyms.c b/linux/drivers/media/dvb/dvb-core/dvb_ksyms.c
index af43e441a..32a615a76 100644
--- a/linux/drivers/media/dvb/dvb-core/dvb_ksyms.c
+++ b/linux/drivers/media/dvb/dvb-core/dvb_ksyms.c
@@ -1,5 +1,5 @@
 #include <asm/uaccess.h>
-#include <asm/errno.h>
+#include <linux/errno.h>
 #include <linux/module.h>
 #include <linux/ioctl.h>
 #include <linux/slab.h>
diff --git a/linux/drivers/media/dvb/dvb-core/dvb_net.c b/linux/drivers/media/dvb/dvb-core/dvb_net.c
index 82bf226e7..a98258794 100644
--- a/linux/drivers/media/dvb/dvb-core/dvb_net.c
+++ b/linux/drivers/media/dvb/dvb-core/dvb_net.c
@@ -24,8 +24,8 @@
  * 
  */
 
-#include <asm/errno.h>
 #include <asm/uaccess.h>
+#include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
 #include <linux/ioctl.h>
@@ -139,7 +139,7 @@ static int
 dvb_net_callback(const u8 *buffer1, size_t buffer1_len,
 		 const u8 *buffer2, size_t buffer2_len,
 		 struct dmx_section_filter *filter,
-		 dmx_success_t success)
+		 enum dmx_success success)
 {
         struct net_device *dev=(struct net_device *) filter->priv;
 
diff --git a/linux/drivers/media/dvb/dvb-core/dvb_ringbuffer.c b/linux/drivers/media/dvb/dvb-core/dvb_ringbuffer.c
index fa1970619..fb5248c98 100644
--- a/linux/drivers/media/dvb/dvb-core/dvb_ringbuffer.c
+++ b/linux/drivers/media/dvb/dvb-core/dvb_ringbuffer.c
@@ -33,7 +33,7 @@
 
 #define __KERNEL_SYSCALLS__
 #include <asm/uaccess.h>
-#include <asm/errno.h>
+#include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/sched.h>
diff --git a/linux/drivers/media/dvb/dvb-core/dvbdev.c b/linux/drivers/media/dvb/dvb-core/dvbdev.c
index dedba56d7..3848c873f 100644
--- a/linux/drivers/media/dvb/dvb-core/dvbdev.c
+++ b/linux/drivers/media/dvb/dvb-core/dvbdev.c
@@ -22,8 +22,8 @@
  */
 
 #include <asm/types.h>
-#include <asm/errno.h>
 #include <asm/semaphore.h>
+#include <linux/errno.h>
 #include <linux/string.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
diff --git a/linux/drivers/media/dvb/frontends/alps_bsrv2.c b/linux/drivers/media/dvb/frontends/alps_bsrv2.c
index 2d540742e..b3b65130e 100644
--- a/linux/drivers/media/dvb/frontends/alps_bsrv2.c
+++ b/linux/drivers/media/dvb/frontends/alps_bsrv2.c
@@ -20,7 +20,6 @@
 
 */    
 
-#include <asm/errno.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/init.h>
diff --git a/linux/drivers/media/dvb/frontends/alps_tdmb7.c b/linux/drivers/media/dvb/frontends/alps_tdmb7.c
index f44db8e20..b5fa11878 100644
--- a/linux/drivers/media/dvb/frontends/alps_tdmb7.c
+++ b/linux/drivers/media/dvb/frontends/alps_tdmb7.c
@@ -20,7 +20,6 @@
 
 */    
 
-#include <asm/errno.h>
 #include <linux/kernel.h>
 #include <linux/init.h>
 #include <linux/module.h>
diff --git a/linux/drivers/media/dvb/frontends/at76c651.c b/linux/drivers/media/dvb/frontends/at76c651.c
index bd2a29599..c1b798da2 100644
--- a/linux/drivers/media/dvb/frontends/at76c651.c
+++ b/linux/drivers/media/dvb/frontends/at76c651.c
@@ -22,7 +22,6 @@
  *
  */
 
-#include <asm/errno.h>
 #include <linux/init.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
diff --git a/linux/drivers/media/dvb/frontends/cx24110.c b/linux/drivers/media/dvb/frontends/cx24110.c
index 0ff6ceae1..8220ddfe0 100644
--- a/linux/drivers/media/dvb/frontends/cx24110.c
+++ b/linux/drivers/media/dvb/frontends/cx24110.c
@@ -32,7 +32,6 @@
    Oct-2002: Migrate to API V3 (formerly known as NEWSTRUCT)
 */
 
-#include <asm/errno.h>
 #include <linux/slab.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
diff --git a/linux/drivers/media/dvb/frontends/grundig_29504-401.c b/linux/drivers/media/dvb/frontends/grundig_29504-401.c
index bb4338434..7a244b428 100644
--- a/linux/drivers/media/dvb/frontends/grundig_29504-401.c
+++ b/linux/drivers/media/dvb/frontends/grundig_29504-401.c
@@ -22,7 +22,6 @@
 
 */    
 
-#include <asm/errno.h>
 #include <linux/init.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
diff --git a/linux/drivers/media/dvb/frontends/grundig_29504-491.c b/linux/drivers/media/dvb/frontends/grundig_29504-491.c
index 88307b702..38e13f765 100644
--- a/linux/drivers/media/dvb/frontends/grundig_29504-491.c
+++ b/linux/drivers/media/dvb/frontends/grundig_29504-491.c
@@ -24,7 +24,6 @@
 
 */    
 
-#include <asm/errno.h>
 #include <linux/init.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
diff --git a/linux/drivers/media/dvb/frontends/nxt6000.c b/linux/drivers/media/dvb/frontends/nxt6000.c
index 39453abc9..058424a38 100644
--- a/linux/drivers/media/dvb/frontends/nxt6000.c
+++ b/linux/drivers/media/dvb/frontends/nxt6000.c
@@ -25,7 +25,6 @@
 
 */    
 
-#include <asm/errno.h>
 #include <linux/init.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
diff --git a/linux/drivers/media/dvb/frontends/stv0299.c b/linux/drivers/media/dvb/frontends/stv0299.c
index 0ebcb8fc1..60d49a788 100644
--- a/linux/drivers/media/dvb/frontends/stv0299.c
+++ b/linux/drivers/media/dvb/frontends/stv0299.c
@@ -35,7 +35,6 @@
 
 */    
 
-#include <asm/errno.h>
 #include <linux/init.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
diff --git a/linux/drivers/media/dvb/frontends/ves1820.c b/linux/drivers/media/dvb/frontends/ves1820.c
index d5d1303be..7a0c4b9b2 100644
--- a/linux/drivers/media/dvb/frontends/ves1820.c
+++ b/linux/drivers/media/dvb/frontends/ves1820.c
@@ -19,7 +19,7 @@
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */    
 
-#include <asm/errno.h>
+#include <linux/errno.h>
 #include <linux/init.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
diff --git a/linux/drivers/media/dvb/ttpci/av7110.c b/linux/drivers/media/dvb/ttpci/av7110.c
index c84fbd584..99714ad94 100644
--- a/linux/drivers/media/dvb/ttpci/av7110.c
+++ b/linux/drivers/media/dvb/ttpci/av7110.c
@@ -617,7 +617,7 @@ static inline int
 DvbDmxFilterCallback(u8 * buffer1, size_t buffer1_len,
                      u8 * buffer2, size_t buffer2_len,
                      struct dvb_demux_filter *dvbdmxfilter,
-                     dmx_success_t success,
+                     enum dmx_success success,
                      struct av7110 *av7110)
 {
 	DEB_EE(("av7110: %p\n",av7110));
@@ -1422,14 +1422,14 @@ inline static int SetWindowBlend(struct av7110 *av7110, u8 windownr, u8 blending
 }
 
 inline static int SetBlend_(struct av7110 *av7110, u8 windownr,
-                     OSDPALTYPE colordepth, u16 index, u8 blending)
+                     enum av7110_osd_palette_type colordepth, u16 index, u8 blending)
 {
         return outcom(av7110, COMTYPE_OSD, SetBlend, 4,
                       windownr, colordepth, index, blending);
 } 
 
 inline static int SetColor_(struct av7110 *av7110, u8 windownr,
-                     OSDPALTYPE colordepth, u16 index, u16 colorhi, u16 colorlo)
+                     enum av7110_osd_palette_type colordepth, u16 index, u16 colorhi, u16 colorlo)
 {
         return outcom(av7110, COMTYPE_OSD, SetColor, 5,
                       windownr, colordepth, index, colorhi, colorlo);
@@ -1554,15 +1554,15 @@ static void DestroyOSDWindows(struct av7110 *av7110)
 
 static inline int 
 CreateOSDWindow(struct av7110 *av7110, u8 windownr,
-                           DISPTYPE disptype, u16 width, u16 height)
+                           enum av7110_window_display_type disptype, u16 width, u16 height)
 {
         return outcom(av7110, COMTYPE_OSD, WCreate, 4,
                       windownr, disptype, width, height);
 } 
 
 
-static OSDPALTYPE bpp2pal[8]={Pal1Bit, Pal2Bit, 0, Pal4Bit, 0, 0, 0, Pal8Bit}; 
-static DISPTYPE   bpp2bit[8]={BITMAP1, BITMAP2, 0, BITMAP4, 0, 0, 0, BITMAP8}; 
+static enum av7110_osd_palette_type bpp2pal[8]={Pal1Bit, Pal2Bit, 0, Pal4Bit, 0, 0, 0, Pal8Bit}; 
+static enum av7110_window_display_type   bpp2bit[8]={BITMAP1, BITMAP2, 0, BITMAP4, 0, 0, 0, BITMAP8}; 
 
 static inline int 
 LoadBitmap(struct av7110 *av7110, u16 format, u16 dx, u16 dy, int inc, u8* data)
diff --git a/linux/drivers/media/dvb/ttpci/av7110.h b/linux/drivers/media/dvb/ttpci/av7110.h
index 944ff7c1b..ac42c6e16 100644
--- a/linux/drivers/media/dvb/ttpci/av7110.h
+++ b/linux/drivers/media/dvb/ttpci/av7110.h
@@ -40,32 +40,32 @@
 #include "dvb_net.h"
 #include "dvb_ringbuffer.h"
 
-typedef enum BOOTSTATES
+enum av7110_bootstate
 {
 	BOOTSTATE_BUFFER_EMPTY	= 0,
 	BOOTSTATE_BUFFER_FULL	= 1,
 	BOOTSTATE_BOOT_COMPLETE	= 2
-} BOOTSTATES;
+};
 
-typedef enum
+enum av7110_type_rec_play_format
 {	RP_None,
 	AudioPES,
 	AudioMp2,
 	AudioPCM,
 	VideoPES,
 	AV_PES
-} TYPE_REC_PLAY_FORMAT;
+};
 
-typedef enum OSDPALTYPE
+enum av7110_osd_palette_type
 {
 	NoPalet =  0,      /* No palette */
 	Pal1Bit =  2,      /* 2 colors for 1 Bit Palette    */
 	Pal2Bit =  4,      /* 4 colors for 2 bit palette    */
 	Pal4Bit =  16,     /* 16 colors for 4 bit palette   */
 	Pal8Bit =  256     /* 256 colors for 16 bit palette */
-} OSDPALTYPE, *POSDPALTYPE;
+};
 
-typedef enum {
+enum av7110_window_display_type {
    BITMAP1,           /* 1 bit bitmap */
    BITMAP2,           /* 2 bit bitmap */
    BITMAP4,           /* 4 bit bitmap */
@@ -86,7 +86,7 @@ typedef enum {
    VIDEOTDSIZE,       /* True Size MPEG Video Display Double Resolution */
    VIDEONSIZE,        /* Full Size MPEG Video Display */
    CURSOR             /* Cursor */
-} DISPTYPE;           /* Window display type           */
+};
 
 /* switch defines */
 #define SB_GPIO 3
@@ -99,13 +99,13 @@ typedef enum {
 #define FB_ON   SAA7146_GPIO_OUTHI  //FastBlank an  (RGB-Mode)
 #define FB_LOOP	SAA7146_GPIO_INPUT  //FastBlank der PC-Grafik durchschleifen
 
-typedef enum
+enum av7110_video_output_mode
 {
         NO_OUT       = 0,		//disable analog Output
 	CVBS_RGB_OUT = 1,
 	CVBS_YC_OUT  = 2,
 	YC_OUT	     = 3
-} VIDEOOUTPUTMODE;
+};
 
 #define GPMQFull        0x0001                  //Main Message Queue Full
 #define GPMQOver        0x0002                  //Main Message Queue Overflow
@@ -133,7 +133,7 @@ typedef enum
 #define PBUFSIZE_16K  0x0700
 #define PBUFSIZE_32K  0x0800
 
-typedef enum {	
+enum av7110_osd_command {	
         WCreate,
 	WDestroy,
 	WMoveD,
@@ -154,9 +154,9 @@ typedef enum {
 	ReleaseBmp,
 	SetWTrans,
 	SetWNoTrans
-} OSDCOM;
+};
 
-typedef enum { 
+enum av7110_pid_command { 
 	MultiPID,
         VideoPID,
 	AudioPID,
@@ -169,13 +169,13 @@ typedef enum {
 	Scan,
 	SetDescr,
         SetIR
-} PIDCOM;
+};
 			
-typedef enum {
+enum av7110_mpeg_command {
         SelAudChannels
-} MPEGCOM;
+};
 
-typedef enum  { 
+enum av7110_audio_command { 
         AudioDAC,
 	CabADAC,
 	ON22K,
@@ -184,9 +184,9 @@ typedef enum  {
 	ADSwitch,
 	SendDiSEqC,
 	SetRegister
-} AUDCOM;
+};
 
-typedef enum  {
+enum av7110_request_command {
         AudioState,
 	AudioBuffState,
 	VideoState1,
@@ -198,18 +198,18 @@ typedef enum  {
 	ReqRegister,
 	ReqSecFilterError,
 	ReqSTC
-} REQCOM;
+};
 
-typedef enum  {
+enum av7110_encoder_command {
         SetVidMode,
 	SetTestMode,
 	LoadVidCode,
 	SetMonitorType,
 	SetPanScanType,
 	SetFreezeMode
-} ENC;
+};
 
-typedef enum  { 
+enum av7110_rec_play_state { 
         __Record,
 	__Stop,
 	__Play,
@@ -218,9 +218,9 @@ typedef enum  {
 	__FF_IP,
 	__Scan_I,
 	__Continue
-} REC_PLAY;
+};
 
-typedef enum  { 
+enum av7110_command_type { 
         COMTYPE_NOCOM,
 	COMTYPE_PIDFILTER,
 	COMTYPE_MPEGDECODER,
@@ -238,7 +238,7 @@ typedef enum  {
 	COMTYPE_VIDEO,
 	COMTYPE_AUDIO,
 	COMTYPE_CI_LL,
-} COMTYPE;
+};
 
 #define VID_NONE_PREF           0x00    /* No aspect ration processing preferred */
 #define VID_PAN_SCAN_PREF       0x01    /* Pan and Scan Display preferred */
diff --git a/linux/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c b/linux/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c
index 07ca6d077..4dfd8173c 100644
--- a/linux/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c
+++ b/linux/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c
@@ -16,8 +16,8 @@
 #include <linux/usb.h>
 #include <linux/delay.h>
 #include <linux/time.h>
+#include <linux/errno.h>
 #include <asm/semaphore.h>
-#include <asm/errno.h>
 
 #include "dvb_frontend.h"
 #include "dmxdev.h"