projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/linville/wireles...
[firefly-linux-kernel-4.4.55.git]
/
include
/
pcmcia
/
ds.h
diff --git
a/include/pcmcia/ds.h
b/include/pcmcia/ds.h
index 90ef552c42dd638f8557d6af3f0abc1963db7d8b..f047a1fd64f803a887ce40430a7e14a86d0e4627 100644
(file)
--- a/
include/pcmcia/ds.h
+++ b/
include/pcmcia/ds.h
@@
-184,6
+184,7
@@
struct pcmcia_device {
char * prod_id[4];
+ u64 dma_mask;
struct device dev;
#ifdef CONFIG_PCMCIA_IOCTL