Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 3814
b: refs/heads/master
c: aecab27
h: refs/heads/master
v: v3
  • Loading branch information
Dominik Brodowski authored and Linus Torvalds committed Jun 28, 2005
1 parent f98c732 commit 3153dd2
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 2 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: 0c7ab67602e65b3ba7aaa81f023b034cd7458ec6
refs/heads/master: aecab27aeabaa897d69fc082686df314329830de
12 changes: 11 additions & 1 deletion trunk/include/linux/mod_devicetable.h
Original file line number Diff line number Diff line change
Expand Up @@ -191,12 +191,22 @@ struct pcmcia_device_id {
/* for pseude multi-function devices */
__u8 device_no;

const char * prod_id[4];
__u32 prod_id_hash[4];

/* not matched against in kernelspace*/
#ifdef __KERNEL__
const char * prod_id[4];
#else
kernel_ulong_t prod_id[4];
#endif

/* not matched against */
kernel_ulong_t driver_info;
#ifdef __KERNEL__
char * cisfile;
#else
kernel_ulong_t cisfile;
#endif
};

#define PCMCIA_DEV_ID_MATCH_MANF_ID 0x0001
Expand Down

0 comments on commit 3153dd2

Please sign in to comment.