diff options
| author | Steve French <sfrench@us.ibm.com> | 2006-02-10 16:53:29 +0000 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2006-02-10 16:53:29 +0000 |
| commit | b580513e841d81eebf0d7b02f412be0882c2ce5f (patch) | |
| tree | 9336a14058eed66c335db10512f33a31f9e8c938 /drivers/base/memory.c | |
| parent | 04fdabe17c4840a4cd84c3589f20f5d4689b1ec5 (diff) | |
| parent | 418aade459f03318defd18ef0b11981a63bd81b0 (diff) | |
| download | kernel_samsung_tuna-b580513e841d81eebf0d7b02f412be0882c2ce5f.zip kernel_samsung_tuna-b580513e841d81eebf0d7b02f412be0882c2ce5f.tar.gz kernel_samsung_tuna-b580513e841d81eebf0d7b02f412be0882c2ce5f.tar.bz2 | |
Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Signed-off-by: Steve French <sfrench@us.ibm.com>
Diffstat (limited to 'drivers/base/memory.c')
| -rw-r--r-- | drivers/base/memory.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/base/memory.c b/drivers/base/memory.c index d1a0522..105a0d6 100644 --- a/drivers/base/memory.c +++ b/drivers/base/memory.c @@ -303,7 +303,7 @@ static int block_size_init(void) */ #ifdef CONFIG_ARCH_MEMORY_PROBE static ssize_t -memory_probe_store(struct class *class, const char __user *buf, size_t count) +memory_probe_store(struct class *class, const char *buf, size_t count) { u64 phys_addr; int ret; |