diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-10-25 17:30:53 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-10-25 17:30:53 +0100 |
| commit | 0b9e31e9264f1bad89856afb96da1688292f13b4 (patch) | |
| tree | 7a9e9b6456dce993efeed8734de0a15a1f16ae94 /drivers/vlynq/vlynq.c | |
| parent | cf82ff7ea7695b0e82ba07bc5e9f1bd03a74e1aa (diff) | |
| parent | 964fe080d94db82a3268443e9b9ece4c60246414 (diff) | |
| download | kernel-crypto-0b9e31e9264f1bad89856afb96da1688292f13b4.tar.gz kernel-crypto-0b9e31e9264f1bad89856afb96da1688292f13b4.tar.xz kernel-crypto-0b9e31e9264f1bad89856afb96da1688292f13b4.zip | |
Merge branch 'linus' into sched/core
Conflicts:
fs/proc/array.c
Merge reason: resolve conflict and queue up dependent patch.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'drivers/vlynq/vlynq.c')
| -rw-r--r-- | drivers/vlynq/vlynq.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/vlynq/vlynq.c b/drivers/vlynq/vlynq.c index f05d2a36836..9554ad5f9af 100644 --- a/drivers/vlynq/vlynq.c +++ b/drivers/vlynq/vlynq.c @@ -28,7 +28,6 @@ #include <linux/errno.h> #include <linux/platform_device.h> #include <linux/interrupt.h> -#include <linux/device.h> #include <linux/delay.h> #include <linux/io.h> @@ -703,7 +702,7 @@ static int vlynq_probe(struct platform_device *pdev) dev->mem_start = mem_res->start; dev->mem_end = mem_res->end; - len = regs_res->end - regs_res->start; + len = resource_size(regs_res); if (!request_mem_region(regs_res->start, len, dev_name(&dev->dev))) { printk(KERN_ERR "%s: Can't request vlynq registers\n", dev_name(&dev->dev)); |