diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2011-05-10 13:30:45 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-05-10 13:30:45 -0700 |
| commit | 8a1629c771b1a60bc6d73394d869fe69b13200dc (patch) | |
| tree | 12f68138d95b70d450ab418fdfb300ebdcd2f003 /drivers/infiniband/hw/qib/qib_iba6120.c | |
| parent | 04aebcbb1b6dccadc8862b2765265f65a946db57 (diff) | |
| parent | 693d92a1bbc9e42681c42ed190bd42b636ca876f (diff) | |
| download | kernel_replicant_linux-8a1629c771b1a60bc6d73394d869fe69b13200dc.tar.gz kernel_replicant_linux-8a1629c771b1a60bc6d73394d869fe69b13200dc.tar.bz2 kernel_replicant_linux-8a1629c771b1a60bc6d73394d869fe69b13200dc.zip | |
Merge branch 2.6.39-rc7 into usb-linus
This was needed to resolve a conflict in:
drivers/usb/host/isp1760-hcd.c
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/infiniband/hw/qib/qib_iba6120.c')
| -rw-r--r-- | drivers/infiniband/hw/qib/qib_iba6120.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/infiniband/hw/qib/qib_iba6120.c b/drivers/infiniband/hw/qib/qib_iba6120.c index 7de4b7ebffc5..d8ca0a0b970d 100644 --- a/drivers/infiniband/hw/qib/qib_iba6120.c +++ b/drivers/infiniband/hw/qib/qib_iba6120.c @@ -1799,7 +1799,7 @@ static int qib_6120_setup_reset(struct qib_devdata *dd) /* * Keep chip from being accessed until we are ready. Use * writeq() directly, to allow the write even though QIB_PRESENT - * isn't' set. + * isn't set. */ dd->flags &= ~(QIB_INITTED | QIB_PRESENT); dd->int_counter = 0; /* so we check interrupts work again */ |