diff options
| author | Paul Mackerras <paulus@samba.org> | 2008-05-02 00:45:50 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2008-05-02 00:45:50 -0400 |
| commit | 5be661a28b12aa43cc83ba935ba2b2c273d0da45 (patch) | |
| tree | ae4e699023aad89f698c477ed9a5b4f9830dc8f1 /include/linux/rio.h | |
| parent | fbe543b412cef02350fab35526a6d4dc3d20d182 (diff) | |
| parent | b17b8181c97e88e6fac5aa704879ad61fdd67351 (diff) | |
Merge branch 'powerpc-next' of master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc
Diffstat (limited to 'include/linux/rio.h')
| -rw-r--r-- | include/linux/rio.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/rio.h b/include/linux/rio.h index cfb66bbc0f27..0201849480da 100644 --- a/include/linux/rio.h +++ b/include/linux/rio.h | |||
| @@ -163,6 +163,8 @@ enum rio_phy_type { | |||
| 163 | * @ops: configuration space functions | 163 | * @ops: configuration space functions |
| 164 | * @id: Port ID, unique among all ports | 164 | * @id: Port ID, unique among all ports |
| 165 | * @index: Port index, unique among all port interfaces of the same type | 165 | * @index: Port index, unique among all port interfaces of the same type |
| 166 | * @sys_size: RapidIO common transport system size | ||
| 167 | * @phy_type: RapidIO phy type | ||
| 166 | * @name: Port name string | 168 | * @name: Port name string |
| 167 | * @priv: Master port private data | 169 | * @priv: Master port private data |
| 168 | */ | 170 | */ |