summaryrefslogtreecommitdiffstats
path: root/arch/cris
diff options
context:
space:
mode:
authorJesper Nilsson <jesper.nilsson@axis.com>2008-01-24 14:30:01 +0100
committerJesper Nilsson <jesper.nilsson@axis.com>2008-02-08 11:06:34 +0100
commitcbca6634888ec9fcde203e6f12f6c5e716f1f90b (patch)
tree33227e2cc33f67a0f8f5a32665868bdc86adfc50 /arch/cris
parentCRIS v32: Remove drivers/gpio.c, now exists as machine specific file. (diff)
downloadlinux-cbca6634888ec9fcde203e6f12f6c5e716f1f90b.tar.xz
linux-cbca6634888ec9fcde203e6f12f6c5e716f1f90b.zip
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
} sync_port;
static int etrax_sync_serial_init(void);
-#if defined(CONFIG_ETRAX_SYNCHRONOUS_SERIAL_PORT1)
static void initialize_port(int portnbr);
-#endif
static inline int sync_data_avail(struct sync_port *port);
static int sync_serial_open(struct inode *, struct file*);
@@ -294,7 +292,6 @@ static int __init etrax_sync_serial_init(void)
return 0;
}
-#if defined(CONFIG_ETRAX_SYNCHRONOUS_SERIAL_PORT1)
static void __init initialize_port(int portnbr)
{
int __attribute__((unused)) i;
@@ -388,7 +385,6 @@ static void __init initialize_port(int portnbr)
port->catch_tr_descr = &port->out_descr[0];
#endif
}
-#endif
static inline int sync_data_avail(struct sync_port *port)
{
@@ -1077,7 +1073,7 @@ static ssize_t sync_serial_write(struct file *file, const char *buf,
if (signal_pending(current))
return -EINTR;
- }
+
DEBUGWRITE(printk(KERN_DEBUG "w d%d c %lu\n",
port->port_nbr, trunc_count));
return trunc_count;