git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
arch
/
m68k
/
amiga
/
chipram.c
diff --git
a/arch/m68k/amiga/chipram.c
b/arch/m68k/amiga/chipram.c
index
558d5fd
..
fa015d8
100644
(file)
--- a/
arch/m68k/amiga/chipram.c
+++ b/
arch/m68k/amiga/chipram.c
@@
-7,7
+7,6
@@
** Rewritten 15/9/2000 by Geert to use resource management
*/
** Rewritten 15/9/2000 by Geert to use resource management
*/
-#include <linux/config.h>
#include <linux/types.h>
#include <linux/kernel.h>
#include <linux/init.h>
#include <linux/types.h>
#include <linux/kernel.h>
#include <linux/init.h>
@@
-53,10
+52,9
@@
void *amiga_chip_alloc(unsigned long size, const char *name)
#ifdef DEBUG
printk("amiga_chip_alloc: allocate %ld bytes\n", size);
#endif
#ifdef DEBUG
printk("amiga_chip_alloc: allocate %ld bytes\n", size);
#endif
- res = k
m
alloc(sizeof(struct resource), GFP_KERNEL);
+ res = k
z
alloc(sizeof(struct resource), GFP_KERNEL);
if (!res)
return NULL;
if (!res)
return NULL;
- memset(res, 0, sizeof(struct resource));
res->name = name;
if (allocate_resource(&chipram_res, res, size, 0, UINT_MAX, PAGE_SIZE, NULL, NULL) < 0) {
res->name = name;
if (allocate_resource(&chipram_res, res, size, 0, UINT_MAX, PAGE_SIZE, NULL, NULL) < 0) {