diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-02-02 22:20:17 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-02-02 22:20:17 -0500 |
| commit | 17294ab2ca8e8c46f2e4825c55541b2b88e52bf4 (patch) | |
| tree | c44fd3cf1c20c5724e719a3339a5734f2eae7e58 /drivers/uwb/allocator.c | |
| parent | 86adf8adfcb3d3f4b6c30aeb40da480da02de1d1 (diff) | |
| parent | 8f04915532485d81e7f6c580a396ea7b01094221 (diff) | |
Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/dvrabel/uwb
* 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/dvrabel/uwb:
uwb: lock rc->rsvs_lock with spin_lock_bh()
wusb: timeout when waiting for ASL/PZL updates in whci-hcd
uwb: remove unused #include <version.h>'s
wusb: return -ENOTCONN when resetting a port with no connected device
uwb: safely remove all reservations
Diffstat (limited to 'drivers/uwb/allocator.c')
| -rw-r--r-- | drivers/uwb/allocator.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/uwb/allocator.c b/drivers/uwb/allocator.c index c8185e6b0cd5..c13cec7dcbc5 100644 --- a/drivers/uwb/allocator.c +++ b/drivers/uwb/allocator.c | |||
| @@ -15,7 +15,6 @@ | |||
| 15 | * You should have received a copy of the GNU General Public License | 15 | * You should have received a copy of the GNU General Public License |
| 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
| 17 | */ | 17 | */ |
| 18 | #include <linux/version.h> | ||
| 19 | #include <linux/kernel.h> | 18 | #include <linux/kernel.h> |
| 20 | #include <linux/uwb.h> | 19 | #include <linux/uwb.h> |
| 21 | 20 | ||