Merge branch 'master' of /home/trondmy/kernel/linux-2.6/

Conflicts:

	fs/nfs/inode.c
	fs/super.c

Fix conflicts between patch 'NFS: Split fs/nfs/inode.c' and patch
'VFS: Permit filesystem to override root dentry on mount'

1 files changed, 7 insertions, 8 deletions

diff --git a/drivers/hwmon/f71805f.c b/drivers/hwmon/f71805f.c
index 885465df6e6a..fd72440faf76 100644
--- a/drivers/hwmon/f71805f.c
+++ b/drivers/hwmon/f71805f.c
@@ -99,10 +99,6 @@ superio_exit(int base)
 #define ADDR_REG_OFFSET         0
 #define DATA_REG_OFFSET         1
 
-static struct resource f71805f_resource __initdata = {
-        .flags  = IORESOURCE_IO,
-};
-
 /*
  * Registers
  */
@@ -782,6 +778,11 @@ static struct platform_driver f71805f_driver = {
 
 static int __init f71805f_device_add(unsigned short address)
 {
+        struct resource res = {
+                .start  = address,
+                .end    = address + REGION_LENGTH - 1,
+                .flags  = IORESOURCE_IO,
+        };
         int err;
 
         pdev = platform_device_alloc(DRVNAME, address);
@@ -791,10 +792,8 @@ static int __init f71805f_device_add(unsigned short address)
                 goto exit;
         }
 
-        f71805f_resource.start = address;
-        f71805f_resource.end = address + REGION_LENGTH - 1;
-        f71805f_resource.name = pdev->name;
-        err = platform_device_add_resources(pdev, &f71805f_resource, 1);
+        res.name = pdev->name;
+        err = platform_device_add_resources(pdev, &res, 1);
         if (err) {
                 printk(KERN_ERR DRVNAME ": Device resource addition failed "
                        "(%d)\n", err);