diff options
author | Paul Mackerras <paulus@samba.org> | 2006-02-08 09:43:08 +1100 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2006-02-08 09:43:08 +1100 |
commit | 8f75015f33c3005e0bbf83ffc0d5e0b4262cc03d (patch) | |
tree | a3c34ad86ccdc904bb43af6cd1cb163231c29276 /Documentation/parport-lowlevel.txt | |
parent | [PATCH] PPC32 8xx: support for the physmapped flash on m8xx (diff) | |
parent | [PATCH] powerpc: Lindent platforms/83xx (diff) | |
download | linux-dev-8f75015f33c3005e0bbf83ffc0d5e0b4262cc03d.tar.xz linux-dev-8f75015f33c3005e0bbf83ffc0d5e0b4262cc03d.zip |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
Diffstat (limited to 'Documentation/parport-lowlevel.txt')
-rw-r--r-- | Documentation/parport-lowlevel.txt | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Documentation/parport-lowlevel.txt b/Documentation/parport-lowlevel.txt index 1d40008a1926..8f2302415eff 100644 --- a/Documentation/parport-lowlevel.txt +++ b/Documentation/parport-lowlevel.txt @@ -1068,7 +1068,7 @@ SYNOPSIS struct parport_operations { ... - void (*write_status) (struct parport *port, unsigned char s); + void (*write_control) (struct parport *port, unsigned char s); ... }; @@ -1097,9 +1097,9 @@ SYNOPSIS struct parport_operations { ... - void (*frob_control) (struct parport *port, - unsigned char mask, - unsigned char val); + unsigned char (*frob_control) (struct parport *port, + unsigned char mask, + unsigned char val); ... }; |