diff options
| author | Steve French <sfrench@us.ibm.com> | 2006-01-17 22:49:59 -0500 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2006-01-17 22:49:59 -0500 |
| commit | d65177c1ae7f085723154105c5dc8d9e16ae8265 (patch) | |
| tree | 14408129d880d89cc5e937f2810f243ed1e6fcde /arch/ppc/4xx_io/serial_sicc.c | |
| parent | d41f084a74de860fe879403fbbad13abdf7aea8e (diff) | |
| parent | 15578eeb6cd4b74492f26e60624aa1a9a52ddd7b (diff) | |
Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Signed-off-by: Steve French <sfrench@us.ibm.com>
Diffstat (limited to 'arch/ppc/4xx_io/serial_sicc.c')
| -rw-r--r-- | arch/ppc/4xx_io/serial_sicc.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/ppc/4xx_io/serial_sicc.c b/arch/ppc/4xx_io/serial_sicc.c index ebc4db8fcc63..8ace2a1f3b48 100644 --- a/arch/ppc/4xx_io/serial_sicc.c +++ b/arch/ppc/4xx_io/serial_sicc.c | |||
| @@ -215,7 +215,6 @@ static struct tty_driver *siccnormal_driver; | |||
| 215 | * memory if large numbers of serial ports are open. | 215 | * memory if large numbers of serial ports are open. |
| 216 | */ | 216 | */ |
| 217 | static u_char *tmp_buf; | 217 | static u_char *tmp_buf; |
| 218 | static DECLARE_MUTEX(tmp_buf_sem); | ||
| 219 | 218 | ||
| 220 | #define HIGH_BITS_OFFSET ((sizeof(long)-sizeof(int))*8) | 219 | #define HIGH_BITS_OFFSET ((sizeof(long)-sizeof(int))*8) |
| 221 | 220 | ||