Merge branch 'for-linus' of git://neil.brown.name/md

[linux-2.6-omap-h63xx.git] / drivers / media / dvb / bt8xx / bt878.h

diff --git a/drivers/media/dvb/bt8xx/bt878.h b/drivers/media/dvb/bt8xx/bt878.h
index d593bc145628e3f0311875132dea279900a47f8d..d19b59299d78adca911089a28cebdeff9661250a 100644 (file)
--- a/drivers/media/dvb/bt8xx/bt878.h
+++ b/drivers/media/dvb/bt8xx/bt878.h
@@ -101,12 +101,6 @@
 #define BTTV_BOARD_DVICO_DVBT_LITE         0x80
 #define BTTV_BOARD_DVICO_FUSIONHDTV_5_LITE 0x87
 
-struct cards {
-       __u32 pci_id;
-       __u16 card_id;
-       char  *name;
-};
-
 extern int bt878_num;
 
 struct bt878 {
@@ -134,7 +128,7 @@ struct bt878 {
        dma_addr_t buf_dma;
 
        u32 risc_size;
-       u32 *risc_cpu;
+       __le32 *risc_cpu;
        dma_addr_t risc_dma;
        u32 risc_pos;