Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/holtmann/bluetooth-next-2.6

Conflicts:
	drivers/net/wireless/iwlwifi/iwl-commands.h

1 files changed, 2 insertions, 2 deletions

diff --git a/sound/aoa/soundbus/sysfs.c b/sound/aoa/soundbus/sysfs.c
index f580942b5c09..6496e754f00a 100644
--- a/sound/aoa/soundbus/sysfs.c
+++ b/sound/aoa/soundbus/sysfs.c
@@ -9,7 +9,7 @@ field##_show (struct device *dev, struct device_attribute *attr,	\
               char *buf)                                                \
 {                                                                       \
         struct soundbus_dev *mdev = to_soundbus_device (dev);           \
-        return sprintf (buf, format_string, mdev->ofdev.node->field);   \
+        return sprintf (buf, format_string, mdev->ofdev.dev.of_node->field); \
 }
 
 static ssize_t modalias_show(struct device *dev, struct device_attribute *attr,
@@ -25,7 +25,7 @@ static ssize_t modalias_show(struct device *dev, struct device_attribute *attr,
                 length = strlen(buf);
         } else {
                 length = sprintf(buf, "of:N%sT%s\n",
-                                 of->node->name, of->node->type);
+                                 of->dev.of_node->name, of->dev.of_node->type);
         }
 
         return length;