summaryrefslogtreecommitdiffstats
path: root/include/linux/rio.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-05-03 10:01:33 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2008-05-03 10:01:33 -0700
commitc36c804559d3a891a2e655ba8185b4fa7eaee156 (patch)
tree0a4092432229616b2fdc53d87ea32e944212c626 /include/linux/rio.h
parentbe2e88011bd800222bfd7b477c727966f93186a9 (diff)
parent3b5750644b2ffa2a76fdfe7b4e00e4af2ecf3539 (diff)
downloadlinux-c36c804559d3a891a2e655ba8185b4fa7eaee156.tar.gz
linux-c36c804559d3a891a2e655ba8185b4fa7eaee156.tar.bz2
linux-c36c804559d3a891a2e655ba8185b4fa7eaee156.zip
Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
* git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc: [POWERPC] Bolt in SLB entry for kernel stack on secondary cpus [POWERPC] PS3: Update ps3_defconfig [POWERPC] PS3: Remove unsupported wakeup sources [POWERPC] PS3: Make ps3_virq_setup and ps3_virq_destroy static [POWERPC] PS3: Add time include to lpm [POWERPC] Fix slb.c compile warnings [POWERPC] Xilinx: Fix compile warnings [POWERPC] Squash build warning for print of resource_size_t in fsl_soc.c [RAPIDIO] fix current kernel-doc notation [POWERPC] 86xx: mpc8610_hpcd: add support for PCI Express x8 slot Fix a potential issue in mpc52xx uart driver [POWERPC] mpc5200: Allow for fixed speed MII configurations [POWERPC] 86xx: Fix the wrong serial1 interrupt for 8610 board
Diffstat (limited to 'include/linux/rio.h')
-rw-r--r--include/linux/rio.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/rio.h b/include/linux/rio.h
index c1c99c9643d3..dc0c75556c63 100644
--- a/include/linux/rio.h
+++ b/include/linux/rio.h
@@ -161,6 +161,8 @@ enum rio_phy_type {
* @ops: configuration space functions
* @id: Port ID, unique among all ports
* @index: Port index, unique among all port interfaces of the same type
+ * @sys_size: RapidIO common transport system size
+ * @phy_type: RapidIO phy type
* @name: Port name string
* @priv: Master port private data
*/