diff options
| author | Len Brown <len.brown@intel.com> | 2010-08-15 01:06:31 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2010-08-15 01:06:31 -0400 |
| commit | 95ee46aa8698f2000647dfb362400fadbb5807cf (patch) | |
| tree | e5a05c7297f997e191c73091934e42e3195c0e40 /drivers/rapidio/rio.c | |
| parent | cfa806f059801dbe7e435745eb2e187c8bfe1e7f (diff) | |
| parent | 92fa5bd9a946b6e7aab6764e7312e4e3d9bed295 (diff) | |
| download | lwn-95ee46aa8698f2000647dfb362400fadbb5807cf.tar.gz lwn-95ee46aa8698f2000647dfb362400fadbb5807cf.zip | |
Merge branch 'linus' into release
Conflicts:
drivers/acpi/debug.c
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers/rapidio/rio.c')
| -rw-r--r-- | drivers/rapidio/rio.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/rapidio/rio.c b/drivers/rapidio/rio.c index 08fa453af974..74e9d22d95fb 100644 --- a/drivers/rapidio/rio.c +++ b/drivers/rapidio/rio.c @@ -808,7 +808,7 @@ int rio_std_route_add_entry(struct rio_mport *mport, u16 destid, u8 hopcount, /** * rio_std_route_get_entry - Read switch route table entry (port number) - * assosiated with specified destID using standard registers defined in RIO + * associated with specified destID using standard registers defined in RIO * specification rev.1.3 * @mport: Master port to issue transaction * @destid: Destination ID of the device |