diff options
| author | Dmitry Torokhov <dtor@insightbb.com> | 2007-02-10 01:26:32 -0500 |
|---|---|---|
| committer | Dmitry Torokhov <dtor@insightbb.com> | 2007-02-10 01:26:32 -0500 |
| commit | b22364c8eec89e6b0c081a237f3b6348df87796f (patch) | |
| tree | 233a923281fb640106465d076997ff511efb6edf /include/asm-arm/arch-s3c2410/regs-serial.h | |
| parent | 2c8dc071517ec2843869024dc82be2e246f41064 (diff) | |
| parent | 66efc5a7e3061c3597ac43a8bb1026488d57e66b (diff) | |
Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'include/asm-arm/arch-s3c2410/regs-serial.h')
| -rw-r--r-- | include/asm-arm/arch-s3c2410/regs-serial.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-arm/arch-s3c2410/regs-serial.h b/include/asm-arm/arch-s3c2410/regs-serial.h index 19c77da9c3fe..46f52401d132 100644 --- a/include/asm-arm/arch-s3c2410/regs-serial.h +++ b/include/asm-arm/arch-s3c2410/regs-serial.h | |||
| @@ -197,7 +197,7 @@ struct s3c2410_uartcfg { | |||
| 197 | unsigned char hwport; /* hardware port number */ | 197 | unsigned char hwport; /* hardware port number */ |
| 198 | unsigned char unused; | 198 | unsigned char unused; |
| 199 | unsigned short flags; | 199 | unsigned short flags; |
| 200 | unsigned long uart_flags; /* default uart flags */ | 200 | upf_t uart_flags; /* default uart flags */ |
| 201 | 201 | ||
| 202 | unsigned long ucon; /* value of ucon for port */ | 202 | unsigned long ucon; /* value of ucon for port */ |
| 203 | unsigned long ulcon; /* value of ulcon for port */ | 203 | unsigned long ulcon; /* value of ulcon for port */ |