diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-07 18:45:53 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-07 18:45:53 -0500 |
| commit | 2ddb3b15f1b46836c61cfac5b00d8f08a24236e6 (patch) | |
| tree | fb1b7879d6e5cd5460bc256fae11c02aebd94256 /drivers | |
| parent | 5980bb3ee6e733d66eea04c221a140dea15d52de (diff) | |
| parent | 6ee77658ce387ad6c85dcbda4a68bc33efd8de39 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/kyle/parisc-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/kyle/parisc-2.6:
parisc: use __ratelimit in unaligned.c
parisc: Convert to read/update_persistent_clock
parisc: Simplify param.h by including <asm-generic/param.h>
parisc: drop unnecessary cast in __ldcw_align() macro
parisc: add strict copy size checks (v2)
parisc: remove trailing space in messages
parisc: ditto sys_accept4
parisc: wire up sys_recvmmsg
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/parisc/eisa_enumerator.c | 2 | ||||
| -rw-r--r-- | drivers/parisc/superio.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/parisc/eisa_enumerator.c b/drivers/parisc/eisa_enumerator.c index 0be1d50645ab..caa153133754 100644 --- a/drivers/parisc/eisa_enumerator.c +++ b/drivers/parisc/eisa_enumerator.c | |||
| @@ -460,7 +460,7 @@ static int init_slot(int slot, struct eeprom_eisa_slot_info *es) | |||
| 460 | slot, id_string); | 460 | slot, id_string); |
| 461 | 461 | ||
| 462 | print_eisa_id(id_string, es->eisa_slot_id); | 462 | print_eisa_id(id_string, es->eisa_slot_id); |
| 463 | printk(" expected %s \n", id_string); | 463 | printk(" expected %s\n", id_string); |
| 464 | 464 | ||
| 465 | return -1; | 465 | return -1; |
| 466 | 466 | ||
diff --git a/drivers/parisc/superio.c b/drivers/parisc/superio.c index a35c9c5b89e8..f7806d81f1e0 100644 --- a/drivers/parisc/superio.c +++ b/drivers/parisc/superio.c | |||
| @@ -169,7 +169,7 @@ superio_init(struct pci_dev *pcidev) | |||
| 169 | /* ...then properly fixup the USB to point at suckyio PIC */ | 169 | /* ...then properly fixup the USB to point at suckyio PIC */ |
| 170 | sio->usb_pdev->irq = superio_fixup_irq(sio->usb_pdev); | 170 | sio->usb_pdev->irq = superio_fixup_irq(sio->usb_pdev); |
| 171 | 171 | ||
| 172 | printk(KERN_INFO PFX "Found NS87560 Legacy I/O device at %s (IRQ %i) \n", | 172 | printk(KERN_INFO PFX "Found NS87560 Legacy I/O device at %s (IRQ %i)\n", |
| 173 | pci_name(pdev), pdev->irq); | 173 | pci_name(pdev), pdev->irq); |
| 174 | 174 | ||
| 175 | pci_read_config_dword (pdev, SIO_SP1BAR, &sio->sp1_base); | 175 | pci_read_config_dword (pdev, SIO_SP1BAR, &sio->sp1_base); |