Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 324520
b: refs/heads/master
c: 9560533
h: refs/heads/master
v: v3
  • Loading branch information
Justin P. Mattock authored and Greg Kroah-Hartman committed Aug 14, 2012
1 parent 0ab0db9 commit e97f658
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 0959c63f11c3bbef0a7d6c5011be8d25503f547c
refs/heads/master: 95605332997211f377af55d05209c3ef2b86bed1
8 changes: 4 additions & 4 deletions trunk/drivers/staging/vme/devices/vme_user.c
Original file line number Diff line number Diff line change
Expand Up @@ -64,13 +64,13 @@ static unsigned int bus_num;
*
* However the VME driver at http://www.vmelinux.org/ is rather old and doesn't
* even support the tsi148 chipset (which has 8 master and 8 slave windows).
* We'll run with this or now as far as possible, however it probably makes
* We'll run with this for now as far as possible, however it probably makes
* sense to get rid of the old mappings and just do everything dynamically.
*
* So for now, we'll restrict the driver to providing 4 masters and 4 slaves as
* defined above and try to support at least some of the interface from
* http://www.vmelinux.org/ as an alternative drive can be written providing a
* saner interface later.
* http://www.vmelinux.org/ as an alternative the driver can be written
* providing a saner interface later.
*
* The vmelinux.org driver never supported slave images, the devices reserved
* for slaves were repurposed to support all 8 master images on the UniverseII!
Expand Down Expand Up @@ -242,7 +242,7 @@ static ssize_t resource_to_user(int minor, char __user *buf, size_t count,
}

/*
* We are going ot alloc a page during init per window for small transfers.
* We are going to alloc a page during init per window for small transfers.
* Small transfers will go user space -> buffer -> VME. Larger (more than a
* page) transfers will lock the user space buffer into memory and then
* transfer the data directly from the user space buffers out to VME.
Expand Down

0 comments on commit e97f658

Please sign in to comment.