diff options
author | 2006-02-27 11:33:51 -0500 | |
---|---|---|
committer | 2006-02-27 11:33:51 -0500 | |
commit | dbfedbb98145375106cee7ec7269611d553819dc (patch) | |
tree | 81d2a6de51b1bb3c704e5385dbc90ca79efa69bc /include/linux | |
parent | Merge branch 'upstream-fixes' (diff) | |
parent | Merge branch 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev (diff) | |
download | linux-dev-dbfedbb98145375106cee7ec7269611d553819dc.tar.xz linux-dev-dbfedbb98145375106cee7ec7269611d553819dc.zip |
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 6a2bb955844b..3c8a6aa77415 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 d73501ba7e44..b9ea44ac0ddb 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, |