From f51056782842a9d2d544345f4fcf554df830cfb3 Mon Sep 17 00:00:00 2001 From: Manu Abraham Date: Wed, 2 Dec 2009 22:09:53 -0300 Subject: [PATCH] --- yaml --- r: 179445 b: refs/heads/master c: 55172773c57221c7c81e445d04f811f2f0478c3e h: refs/heads/master i: 179443: d3fb4f0e0adc192a6d14828cbb773b1a49834379 v: v3 --- [refs] | 2 +- trunk/drivers/media/dvb/mantis/mantis_common.h | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index d55a8a6bfa4b..b530ca77215c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: df0cca174b4d85ea041509a13e5e68b377758bf1 +refs/heads/master: 55172773c57221c7c81e445d04f811f2f0478c3e diff --git a/trunk/drivers/media/dvb/mantis/mantis_common.h b/trunk/drivers/media/dvb/mantis/mantis_common.h index 60a7457b2b98..d39cbe0f2414 100644 --- a/trunk/drivers/media/dvb/mantis/mantis_common.h +++ b/trunk/drivers/media/dvb/mantis/mantis_common.h @@ -83,7 +83,7 @@ struct mantis_pci { struct pci_dev *pdev; unsigned long mantis_addr; - volatile void __iomem *mantis_mmio; + volatile void __iomem *mantis_mmio; u8 irq; u8 revision; @@ -121,8 +121,8 @@ struct mantis_pci { struct mantis_hwconfig *hwconfig; - u32 mantis_int_stat; - u32 mantis_int_mask; + u32 mantis_int_stat; + u32 mantis_int_mask; /* board specific */ u8 mac_address[8];