aboutsummaryrefslogtreecommitdiffstats
path: root/arch/cris
diff options
context:
space:
mode:
authorJesper Nilsson <jesper.nilsson@axis.com>2008-01-24 08:30:01 -0500
committerJesper Nilsson <jesper.nilsson@axis.com>2008-02-08 05:06:34 -0500
commitcbca6634888ec9fcde203e6f12f6c5e716f1f90b (patch)
tree33227e2cc33f67a0f8f5a32665868bdc86adfc50 /arch/cris
parent5adb5c873f8324e5dfdbabc7d68fda3972de7386 (diff)
CRIS v32: Remove config ifdef around init function for drivers/sync_serial.c
The init function should be defined always.
Diffstat (limited to 'arch/cris')
-rw-r--r--arch/cris/arch-v32/drivers/sync_serial.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/arch/cris/arch-v32/drivers/sync_serial.c b/arch/cris/arch-v32/drivers/sync_serial.c
index eddb98707347..47c377df6fb3 100644
--- a/arch/cris/arch-v32/drivers/sync_serial.c
+++ b/arch/cris/arch-v32/drivers/sync_serial.c
@@ -146,9 +146,7 @@ typedef struct sync_port
146} sync_port; 146} sync_port;
147 147
148static int etrax_sync_serial_init(void); 148static int etrax_sync_serial_init(void);
149#if defined(CONFIG_ETRAX_SYNCHRONOUS_SERIAL_PORT1)
150static void initialize_port(int portnbr); 149static void initialize_port(int portnbr);
151#endif
152static inline int sync_data_avail(struct sync_port *port); 150static inline int sync_data_avail(struct sync_port *port);
153 151
154static int sync_serial_open(struct inode *, struct file*); 152static int sync_serial_open(struct inode *, struct file*);
@@ -294,7 +292,6 @@ static int __init etrax_sync_serial_init(void)
294 return 0; 292 return 0;
295} 293}
296 294
297#if defined(CONFIG_ETRAX_SYNCHRONOUS_SERIAL_PORT1)
298static void __init initialize_port(int portnbr) 295static void __init initialize_port(int portnbr)
299{ 296{
300 int __attribute__((unused)) i; 297 int __attribute__((unused)) i;
@@ -388,7 +385,6 @@ static void __init initialize_port(int portnbr)
388 port->catch_tr_descr = &port->out_descr[0]; 385 port->catch_tr_descr = &port->out_descr[0];
389#endif 386#endif
390} 387}
391#endif
392 388
393static inline int sync_data_avail(struct sync_port *port) 389static inline int sync_data_avail(struct sync_port *port)
394{ 390{
@@ -1077,7 +1073,7 @@ static ssize_t sync_serial_write(struct file *file, const char *buf,
1077 1073
1078 if (signal_pending(current)) 1074 if (signal_pending(current))
1079 return -EINTR; 1075 return -EINTR;
1080 } 1076
1081 DEBUGWRITE(printk(KERN_DEBUG "w d%d c %lu\n", 1077 DEBUGWRITE(printk(KERN_DEBUG "w d%d c %lu\n",
1082 port->port_nbr, trunc_count)); 1078 port->port_nbr, trunc_count));
1083 return trunc_count; 1079 return trunc_count;