Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 179445
b: refs/heads/master
c: 5517277
h: refs/heads/master
i:
  179443: d3fb4f0
v: v3
  • Loading branch information
Manu Abraham authored and Mauro Carvalho Chehab committed Jan 17, 2010
1 parent c7a9bef commit f510567
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: df0cca174b4d85ea041509a13e5e68b377758bf1
refs/heads/master: 55172773c57221c7c81e445d04f811f2f0478c3e
6 changes: 3 additions & 3 deletions trunk/drivers/media/dvb/mantis/mantis_common.h
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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];
Expand Down

0 comments on commit f510567

Please sign in to comment.