mirror of
https://github.com/torvalds/linux.git
synced 2026-09-15 15:01:08 -04:00
[ARM] 4049/1: S3C24XX: fix sparse warning due to upf_t in regs-serial.h
Change the include/asm-arm/arch-s3c2410/regs-serial.h platform data to use the prorper type (upf_t) for the uart_flags. Fix all the other parts of arch/arm/mach-s3c2410 to include <linux/serial_core.h> and all other uses of the include file. mach-rx3715.c:101:18: warning: incorrect type in initializer (different base types) mach-rx3715.c:101:18: expected unsigned long [unsigned] uart_flags mach-rx3715.c:101:18: got restricted unsigned int [usertype] [force] <noident> Signed-off-by: Ben Dooks <ben-linux@fluff.org> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
This commit is contained in:
@@ -197,7 +197,7 @@ struct s3c2410_uartcfg {
|
||||
unsigned char hwport; /* hardware port number */
|
||||
unsigned char unused;
|
||||
unsigned short flags;
|
||||
unsigned long uart_flags; /* default uart flags */
|
||||
upf_t uart_flags; /* default uart flags */
|
||||
|
||||
unsigned long ucon; /* value of ucon for port */
|
||||
unsigned long ulcon; /* value of ulcon for port */
|
||||
|
||||
@@ -13,6 +13,7 @@
|
||||
#ifndef __ASM_ARCH_UNCOMPRESS_H
|
||||
#define __ASM_ARCH_UNCOMPRESS_H
|
||||
|
||||
typedef unsigned int upf_t; /* cannot include linux/serial_core.h */
|
||||
|
||||
/* defines for UART registers */
|
||||
#include "asm/arch/regs-serial.h"
|
||||
|
||||
Reference in New Issue
Block a user