diff --git a/drivers/media/dvb/ngene/ngene-core.c b/drivers/media/dvb/ngene/ngene-core.c
index 1bb9bc78573e..1b53482f6e7f 100644
--- a/drivers/media/dvb/ngene/ngene-core.c
+++ b/drivers/media/dvb/ngene/ngene-core.c
@@ -32,7 +32,7 @@
 #include <linux/delay.h>
 #include <linux/slab.h>
 #include <linux/poll.h>
-#include <asm/io.h>
+#include <linux/io.h>
 #include <asm/div64.h>
 #include <linux/pci.h>
 #include <linux/pci_ids.h>
@@ -267,11 +267,13 @@ static void dump_command_io(struct ngene *dev)
 
 	ngcpyfrom(buf, HOST_TO_NGENE, 8);
 	printk(KERN_ERR "host_to_ngene (%04x): %02x %02x %02x %02x %02x %02x %02x %02x\n",
-		HOST_TO_NGENE, buf[0], buf[1], buf[2], buf[3], buf[4], buf[5], buf[6], buf[7]);
+		HOST_TO_NGENE, buf[0], buf[1], buf[2], buf[3],
+		buf[4], buf[5], buf[6], buf[7]);
 
 	ngcpyfrom(buf, NGENE_TO_HOST, 8);
 	printk(KERN_ERR "ngene_to_host (%04x): %02x %02x %02x %02x %02x %02x %02x %02x\n",
-		NGENE_TO_HOST, buf[0], buf[1], buf[2], buf[3], buf[4], buf[5], buf[6], buf[7]);
+		NGENE_TO_HOST, buf[0], buf[1], buf[2], buf[3],
+		buf[4], buf[5], buf[6], buf[7]);
 
 	b = dev->hosttongene;
 	printk(KERN_ERR "dev->hosttongene (%p): %02x %02x %02x %02x %02x %02x %02x %02x\n",
@@ -1198,7 +1200,7 @@ static int AllocateRingBuffers(struct pci_dev *pci_dev,
 		* sizeof(struct HW_SCATTER_GATHER_ELEMENT);
 
 	u64 PASCListMem;
-	PHW_SCATTER_GATHER_ELEMENT SCListEntry;
+	struct HW_SCATTER_GATHER_ELEMENT *SCListEntry;
 	u64 PASCListEntry;
 	struct SBufferHeader *Cur;
 	void *SCListMem;
@@ -1220,7 +1222,7 @@ static int AllocateRingBuffers(struct pci_dev *pci_dev,
 	pRingBuffer->Buffer1Length = Buffer1Length;
 	pRingBuffer->Buffer2Length = Buffer2Length;
 
-	SCListEntry = (PHW_SCATTER_GATHER_ELEMENT) SCListMem;
+	SCListEntry = SCListMem;
 	PASCListEntry = PASCListMem;
 	Cur = pRingBuffer->Head;
 
@@ -1611,10 +1613,10 @@ static int ngene_start(struct ngene *dev)
 		goto fail;
 
 	if (dev->card_info->fw_version == 17) {
-		u8 tsin4_config[6] =
-			{3072 / 64, 3072 / 64, 0, 3072 / 64, 3072 / 64, 0};
-		u8 default_config[6] =
-			{4096 / 64, 4096 / 64, 0, 2048 / 64, 2048 / 64, 0};
+		u8 tsin4_config[6] = {
+			3072 / 64, 3072 / 64, 0, 3072 / 64, 3072 / 64, 0};
+		u8 default_config[6] = {
+			4096 / 64, 4096 / 64, 0, 2048 / 64, 2048 / 64, 0};
 		u8 *bconf = default_config;
 
 		if (dev->card_info->io_type[3] == NGENE_IO_TSIN)
diff --git a/drivers/media/dvb/ngene/ngene.h b/drivers/media/dvb/ngene/ngene.h
index 1c6f0e742ad7..a7eb29846310 100644
--- a/drivers/media/dvb/ngene/ngene.h
+++ b/drivers/media/dvb/ngene/ngene.h
@@ -29,7 +29,7 @@
 #include <linux/interrupt.h>
 #include <linux/i2c.h>
 #include <asm/dma.h>
-#include <asm/scatterlist.h>
+#include <linux/scatterlist.h>
 
 #include <linux/dvb/frontend.h>
 
@@ -200,8 +200,6 @@ struct EVENT_BUFFER {
 	u32    Reserved[2];
 } __attribute__ ((__packed__));
 
-typedef struct EVENT_BUFFER *PEVENT_BUFFER;
-
 /* Firmware commands. */
 
 enum OPCODES {
@@ -488,18 +486,15 @@ struct ngene_command {
 
 #define EVENT_QUEUE_SIZE    16
 
-typedef struct HW_SCATTER_GATHER_ELEMENT *PHW_SCATTER_GATHER_ELEMENT;
-typedef struct FWRB *PFWRB;
-
 /* Gathers the current state of a single channel. */
 
 struct SBufferHeader {
 	struct BUFFER_HEADER   ngeneBuffer; /* Physical descriptor */
 	struct SBufferHeader  *Next;
 	void                  *Buffer1;
-	PHW_SCATTER_GATHER_ELEMENT scList1;
+	struct HW_SCATTER_GATHER_ELEMENT *scList1;
 	void                  *Buffer2;
-	PHW_SCATTER_GATHER_ELEMENT scList2;
+	struct HW_SCATTER_GATHER_ELEMENT *scList2;
 };
 
 /* Sizeof SBufferHeader aligned to next 64 Bit boundary (hw restriction) */
@@ -554,7 +549,7 @@ enum BufferExchangeFlags {
 
 typedef void *(IBufferExchange)(void *, void *, u32, u32, u32);
 
-typedef struct {
+struct MICI_STREAMINFO {
 	IBufferExchange    *pExchange;
 	IBufferExchange    *pExchangeVBI;     /* Secondary (VBI, ancillary) */
 	u8  Stream;
@@ -566,7 +561,7 @@ typedef struct {
 	u16 nLinesVBI;
 	u16 nBytesPerLineVBI;
 	u32 CaptureLength;    /* Used for audio and transport stream */
-} MICI_STREAMINFO, *PMICI_STREAMINFO;
+};
 
 /****************************************************************************/
 /* STRUCTS ******************************************************************/