diff options
| author | Tony Luck <tony.luck@intel.com> | 2005-09-08 14:27:13 -0700 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2005-09-08 14:27:13 -0700 |
| commit | 344a076110f4ecb16ea6d286b63be696604982ed (patch) | |
| tree | def6e229efdb6ee91b631b6695bf7f9ace8e2719 /drivers/char/mbcs.c | |
| parent | 9b17e7e74e767d8a494a74c3c459aeecd1e08c5f (diff) | |
| parent | 1b11d78cf87a7014f96e5b7fa2e1233cc8081a00 (diff) | |
[IA64] Manual merge fix for 3 files
arch/ia64/Kconfig
arch/ia64/kernel/acpi.c
include/asm-ia64/irq.h
Signed-off-by: Tony Luck <tony.luck@intel.com>
Diffstat (limited to 'drivers/char/mbcs.c')
| -rw-r--r-- | drivers/char/mbcs.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/mbcs.c b/drivers/char/mbcs.c index 115dbb35334..3fa64c63110 100644 --- a/drivers/char/mbcs.c +++ b/drivers/char/mbcs.c @@ -750,7 +750,7 @@ static int mbcs_probe(struct cx_dev *dev, const struct cx_device_id *id) dev->soft = NULL; - soft = kcalloc(1, sizeof(struct mbcs_soft), GFP_KERNEL); + soft = kzalloc(sizeof(struct mbcs_soft), GFP_KERNEL); if (soft == NULL) return -ENOMEM; |