diff options
| author |   David S. Miller <davem@davemloft.net> | 2010-05-18 23:01:55 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-05-18 23:01:55 -0700 |
| commit | 2ec8c6bb5d8f3a62a79f463525054bae1e3d4487 (patch) | |
| tree | fa7f8400ac685fb52e96f64997c7c682fc2aa021 /include/linux/mod_devicetable.h | |
| parent | qlcnic: adding co maintainer (diff) | |
| parent | Merge branch 'x86-uv-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip (diff) | |
| download | linux-dev-2ec8c6bb5d8f3a62a79f463525054bae1e3d4487.tar.xz linux-dev-2ec8c6bb5d8f3a62a79f463525054bae1e3d4487.zip | |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Conflicts:
include/linux/mod_devicetable.h
scripts/mod/file2alias.c
Diffstat (limited to 'include/linux/mod_devicetable.h')
| -rw-r--r-- | include/linux/mod_devicetable.h | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/include/linux/mod_devicetable.h b/include/linux/mod_devicetable.h index 55f1f9c9506c..007fbaafead0 100644 --- a/include/linux/mod_devicetable.h +++ b/include/linux/mod_devicetable.h @@ -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 */ |