diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2006-09-24 17:05:59 -0400 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2006-09-24 17:05:59 -0400 |
| commit | 02b25fcff676125a88169c8a78d4c6dd647574ed (patch) | |
| tree | 372fc8e885be41ba1819b2767c8889ecd97ff948 /include/linux/mod_devicetable.h | |
| parent | 1694176a210189312e31b083bac1e1688981219a (diff) | |
| parent | a68aa1cc6f3203b8a332683ebde67a00f39eec43 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'include/linux/mod_devicetable.h')
| -rw-r--r-- | include/linux/mod_devicetable.h | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/include/linux/mod_devicetable.h b/include/linux/mod_devicetable.h index f697770858..f7ca0b0907 100644 --- a/include/linux/mod_devicetable.h +++ b/include/linux/mod_devicetable.h | |||
| @@ -148,6 +148,17 @@ struct ccw_device_id { | |||
| 148 | #define CCW_DEVICE_ID_MATCH_DEVICE_TYPE 0x04 | 148 | #define CCW_DEVICE_ID_MATCH_DEVICE_TYPE 0x04 |
| 149 | #define CCW_DEVICE_ID_MATCH_DEVICE_MODEL 0x08 | 149 | #define CCW_DEVICE_ID_MATCH_DEVICE_MODEL 0x08 |
| 150 | 150 | ||
| 151 | /* s390 AP bus devices */ | ||
| 152 | struct ap_device_id { | ||
| 153 | __u16 match_flags; /* which fields to match against */ | ||
| 154 | __u8 dev_type; /* device type */ | ||
| 155 | __u8 pad1; | ||
| 156 | __u32 pad2; | ||
| 157 | kernel_ulong_t driver_info; | ||
| 158 | }; | ||
| 159 | |||
| 160 | #define AP_DEVICE_ID_MATCH_DEVICE_TYPE 0x01 | ||
| 161 | |||
| 151 | 162 | ||
| 152 | #define PNP_ID_LEN 8 | 163 | #define PNP_ID_LEN 8 |
| 153 | #define PNP_MAX_DEVICES 8 | 164 | #define PNP_MAX_DEVICES 8 |