diff options
| author | Steven Whitehouse <swhiteho@redhat.com> | 2006-02-27 18:27:34 (GMT) |
|---|---|---|
| committer | Steven Whitehouse <swhiteho@redhat.com> | 2006-02-27 18:27:34 (GMT) |
| commit | f3b270a47882b958e9e3c5bd86894e3a7072899a (patch) | |
| tree | de3bdfd5d67e8310257b93ac3d8d703599b9d929 /include/linux | |
| parent | 116ad29d9839610d2811a1962cac7f3f2a9f9295 (diff) | |
| parent | b9a33cebac70d6f67a769ce8d4078fee2b254ada (diff) | |
| download | linux-fsl-qoriq-f3b270a47882b958e9e3c5bd86894e3a7072899a.tar.xz | |
Merge branch 'master'
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/serial_reg.h | 4 | ||||
| -rw-r--r-- | include/linux/syscalls.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/include/linux/serial_reg.h b/include/linux/serial_reg.h index 6a2bb95..3c8a6aa 100644 --- a/include/linux/serial_reg.h +++ b/include/linux/serial_reg.h @@ -247,10 +247,10 @@ #define UART_CTR 0xFF /* - * The 16C950 Additional Control Reigster + * The 16C950 Additional Control Register */ #define UART_ACR_RXDIS 0x01 /* Receiver disable */ -#define UART_ACR_TXDIS 0x02 /* Receiver disable */ +#define UART_ACR_TXDIS 0x02 /* Transmitter disable */ #define UART_ACR_DSRFC 0x04 /* DSR Flow Control */ #define UART_ACR_TLENB 0x20 /* 950 trigger levels enable */ #define UART_ACR_ICRRD 0x40 /* ICR Read enable */ diff --git a/include/linux/syscalls.h b/include/linux/syscalls.h index d73501b..b9ea44a 100644 --- a/include/linux/syscalls.h +++ b/include/linux/syscalls.h @@ -543,7 +543,7 @@ asmlinkage long sys_unlinkat(int dfd, const char __user * pathname, int flag); asmlinkage long sys_symlinkat(const char __user * oldname, int newdfd, const char __user * newname); asmlinkage long sys_linkat(int olddfd, const char __user *oldname, - int newdfd, const char __user *newname); + int newdfd, const char __user *newname, int flags); asmlinkage long sys_renameat(int olddfd, const char __user * oldname, int newdfd, const char __user * newname); asmlinkage long sys_futimesat(int dfd, char __user *filename, |