diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-05-04 10:08:43 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-05-04 10:08:43 -0400 |
| commit | e6600d800fead3e895f16bf9b426578a6301af44 (patch) | |
| tree | fc2bb35ed142b96b31a04b52c3d097100e2653bd /drivers/usb/misc/legousbtower.c | |
| parent | a1d4ebdbb3806e9d2c37f32a043ec54f4534977c (diff) | |
| parent | 3cb4a4f739cccdf0642fa7e3a087e0b8425ff67b (diff) | |
Automatic merge of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6.git/
Diffstat (limited to 'drivers/usb/misc/legousbtower.c')
| -rw-r--r-- | drivers/usb/misc/legousbtower.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/misc/legousbtower.c b/drivers/usb/misc/legousbtower.c index dd4580cb57e0..7d06105763d4 100644 --- a/drivers/usb/misc/legousbtower.c +++ b/drivers/usb/misc/legousbtower.c | |||
| @@ -859,7 +859,7 @@ static int tower_probe (struct usb_interface *interface, const struct usb_device | |||
| 859 | info ("udev is NULL."); | 859 | info ("udev is NULL."); |
| 860 | } | 860 | } |
| 861 | 861 | ||
| 862 | /* allocate memory for our device state and intialize it */ | 862 | /* allocate memory for our device state and initialize it */ |
| 863 | 863 | ||
| 864 | dev = kmalloc (sizeof(struct lego_usb_tower), GFP_KERNEL); | 864 | dev = kmalloc (sizeof(struct lego_usb_tower), GFP_KERNEL); |
| 865 | 865 | ||