projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
[powerpc.git]
/
drivers
/
serial
/
ip22zilog.c
diff --git
a/drivers/serial/ip22zilog.c
b/drivers/serial/ip22zilog.c
index
0746c94
..
c3abfb3
100644
(file)
--- a/
drivers/serial/ip22zilog.c
+++ b/
drivers/serial/ip22zilog.c
@@
-14,7
+14,6
@@
*/
#include <linux/module.h>
#include <linux/kernel.h>
*/
#include <linux/module.h>
#include <linux/kernel.h>
-#include <linux/sched.h>
#include <linux/errno.h>
#include <linux/delay.h>
#include <linux/tty.h>
#include <linux/errno.h>
#include <linux/delay.h>
#include <linux/tty.h>
@@
-922,13
+921,7
@@
static int zilog_irq = -1;
static void * __init alloc_one_table(unsigned long size)
{
static void * __init alloc_one_table(unsigned long size)
{
- void *ret;
-
- ret = kmalloc(size, GFP_KERNEL);
- if (ret != NULL)
- memset(ret, 0, size);
-
- return ret;
+ return kzalloc(size, GFP_KERNEL);
}
static void __init ip22zilog_alloc_tables(void)
}
static void __init ip22zilog_alloc_tables(void)