lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of /home/davem/src/GIT/linux-2.6/

Browse Source 
Conflicts:
	include/linux/mod_devicetable.h
	scripts/mod/file2alias.c
This commit is contained in:
David S. Miller
2010-05-18 23:01:55 -07:00
parent 7b39f90fab 537b60d178
commit 2ec8c6bb5d
577 changed files with 24623 additions and 14821 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
include/linux/mod_devicetable.h
View File

@ -500,4 +500,13 @@ struct mdio_device_id {
__u32 phy_id_mask;
};
struct zorro_device_id {
__u32 id; /* Device ID or ZORRO_WILDCARD */
kernel_ulong_t driver_data; /* Data private to the driver */
};
#define ZORRO_WILDCARD (0xffffffff) /* not official */
#define ZORRO_DEVICE_MODALIAS_FMT "zorro:i%08X"
#endif /* LINUX_MOD_DEVICETABLE_H */