Merge tag 'lsk-android-14.04' into develop-3.10

[firefly-linux-kernel-4.4.55.git] / include / linux / zorro.h

diff --git a/include/linux/zorro.h b/include/linux/zorro.h
index 7bf9db525e9ee7e7092959c64059198a60bacc3d..dff42025649b32cb03f84d359c0c213ec5617569 100644 (file)
--- a/include/linux/zorro.h
+++ b/include/linux/zorro.h
@@ -187,7 +187,7 @@ extern struct zorro_dev *zorro_find_device(zorro_id id,
 
 #define zorro_resource_start(z)        ((z)->resource.start)
 #define zorro_resource_end(z)  ((z)->resource.end)
-#define zorro_resource_len(z)  ((z)->resource.end-(z)->resource.start+1)
+#define zorro_resource_len(z)  (resource_size(&(z)->resource))
 #define zorro_resource_flags(z)        ((z)->resource.flags)
 
 #define zorro_request_device(z, name) \