diff options
| author |   Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-12-06 12:26:17 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-12-06 12:26:17 -0800 |
| commit | e1b7361f32fdf60f575566ddef8a36b33086631d (patch) | |
| tree | ee5e64036a4f99159d63d71fa603cf582729ef3a /include | |
| parent | Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus (diff) | |
| parent | [PARISC] lba_pci: pci_claim_resources disabled expansion roms (diff) | |
| download | linux-dev-e1b7361f32fdf60f575566ddef8a36b33086631d.tar.xz linux-dev-e1b7361f32fdf60f575566ddef8a36b33086631d.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/kyle/parisc-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/kyle/parisc-2.6:
[PARISC] lba_pci: pci_claim_resources disabled expansion roms
[PARISC] print more than one character at a time for pdc console
[PARISC] Update parisc-linux MAINTAINERS entries
[PARISC] timer interrupt should not be IRQ_DISABLED
Revert "[PARISC] import necessary bits of libgcc.a"
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-parisc/pdc.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/include/asm-parisc/pdc.h b/include/asm-parisc/pdc.h index 5e0c3ca5450b..deda8c311373 100644 --- a/include/asm-parisc/pdc.h +++ b/include/asm-parisc/pdc.h @@ -645,8 +645,7 @@ int pdc_soft_power_button(int sw_control); void pdc_io_reset(void); void pdc_io_reset_devices(void); int pdc_iodc_getc(void); -void pdc_iodc_putc(unsigned char c); -void pdc_iodc_outc(unsigned char c); +int pdc_iodc_print(unsigned char *str, unsigned count); void pdc_printf(const char *fmt, ...); void pdc_emergency_unlock(void); |