projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://neil.brown.name/md
[deliverable/linux.git]
/
drivers
/
isdn
/
hisax
/
hisax.h
diff --git
a/drivers/isdn/hisax/hisax.h
b/drivers/isdn/hisax/hisax.h
index f8527046f1973a879a8a07d8111972ea3a0422ea..0685c194696928e7293a737aa010df7af217125a 100644
(file)
--- a/
drivers/isdn/hisax/hisax.h
+++ b/
drivers/isdn/hisax/hisax.h
@@
-703,7
+703,7
@@
struct hfcPCI_hw {
int nt_timer;
struct pci_dev *dev;
unsigned char *pci_io; /* start of PCI IO memory */
int nt_timer;
struct pci_dev *dev;
unsigned char *pci_io; /* start of PCI IO memory */
-
void *share_start; /* shared memory for Fifos start
*/
+
dma_addr_t dma; /* dma handle for Fifos
*/
void *fifos; /* FIFO memory */
int last_bfifo_cnt[2]; /* marker saving last b-fifo frame count */
struct timer_list timer;
void *fifos; /* FIFO memory */
int last_bfifo_cnt[2]; /* marker saving last b-fifo frame count */
struct timer_list timer;
This page took
0.025168 seconds
and
5
git commands to generate.