Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc

* 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc: (77 commits)
  [POWERPC] Abolish powerpc_flash_init()
  [POWERPC] Early serial debug support for PPC44x
  [POWERPC] Support for the Ebony 440GP reference board in arch/powerpc
  [POWERPC] Add device tree for Ebony
  [POWERPC] Add powerpc/platforms/44x, disable platforms/4xx for now
  [POWERPC] MPIC U3/U4 MSI backend
  [POWERPC] MPIC MSI allocator
  [POWERPC] Enable MSI mappings for MPIC
  [POWERPC] Tell Phyp we support MSI
  [POWERPC] RTAS MSI implementation
  [POWERPC] PowerPC MSI infrastructure
  [POWERPC] Rip out the existing powerpc msi stubs
  [POWERPC] Remove use of 4level-fixup.h for ppc32
  [POWERPC] Add powerpc PCI-E reset API implementation
  [POWERPC] Holly bootwrapper
  [POWERPC] Holly DTS
  [POWERPC] Holly defconfig
  [POWERPC] Add support for 750CL Holly board
  [POWERPC] Generalize tsi108 PCI setup
  [POWERPC] Generalize tsi108 PHY types
  ...

Fixed conflict in include/asm-powerpc/kdebug.h manually

Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

6 files changed, 21 insertions, 21 deletions

diff --git a/sound/aoa/codecs/snd-aoa-codec-onyx.c b/sound/aoa/codecs/snd-aoa-codec-onyx.c
index 7f980be5d060..e91f9f66f395 100644
--- a/sound/aoa/codecs/snd-aoa-codec-onyx.c
+++ b/sound/aoa/codecs/snd-aoa-codec-onyx.c
@@ -1061,7 +1061,7 @@ static int onyx_i2c_attach(struct i2c_adapter *adapter)
         busnode = pmac_i2c_get_bus_node(bus);
 
         while ((dev = of_get_next_child(busnode, dev)) != NULL) {
-                if (device_is_compatible(dev, "pcm3052")) {
+                if (of_device_is_compatible(dev, "pcm3052")) {
                         const u32 *addr;
                         printk(KERN_DEBUG PFX "found pcm3052\n");
                         addr = of_get_property(dev, "reg", NULL);
@@ -1074,7 +1074,7 @@ static int onyx_i2c_attach(struct i2c_adapter *adapter)
         /* if that didn't work, try desperate mode for older
          * machines that have stuff missing from the device tree */
         
-        if (!device_is_compatible(busnode, "k2-i2c"))
+        if (!of_device_is_compatible(busnode, "k2-i2c"))
                 return -ENODEV;
 
         printk(KERN_DEBUG PFX "found k2-i2c, checking if onyx chip is on it\n");
diff --git a/sound/aoa/codecs/snd-aoa-codec-tas.c b/sound/aoa/codecs/snd-aoa-codec-tas.c
index ceca38486eae..041fe52cbf29 100644
--- a/sound/aoa/codecs/snd-aoa-codec-tas.c
+++ b/sound/aoa/codecs/snd-aoa-codec-tas.c
@@ -938,7 +938,7 @@ static int tas_i2c_attach(struct i2c_adapter *adapter)
         busnode = pmac_i2c_get_bus_node(bus);
 
         while ((dev = of_get_next_child(busnode, dev)) != NULL) {
-                if (device_is_compatible(dev, "tas3004")) {
+                if (of_device_is_compatible(dev, "tas3004")) {
                         const u32 *addr;
                         printk(KERN_DEBUG PFX "found tas3004\n");
                         addr = of_get_property(dev, "reg", NULL);
diff --git a/sound/aoa/soundbus/i2sbus/i2sbus-core.c b/sound/aoa/soundbus/i2sbus/i2sbus-core.c
index 79fc4bc09e5e..0fccdbf51663 100644
--- a/sound/aoa/soundbus/i2sbus/i2sbus-core.c
+++ b/sound/aoa/soundbus/i2sbus/i2sbus-core.c
@@ -336,8 +336,8 @@ static int i2sbus_probe(struct macio_dev* dev, const struct of_device_id *match)
         }
 
         while ((np = of_get_next_child(dev->ofdev.node, np))) {
-                if (device_is_compatible(np, "i2sbus") ||
-                    device_is_compatible(np, "i2s-modem")) {
+                if (of_device_is_compatible(np, "i2sbus") ||
+                    of_device_is_compatible(np, "i2s-modem")) {
                         got += i2sbus_add_dev(dev, control, np);
                 }
         }
diff --git a/sound/oss/dmasound/dmasound_awacs.c b/sound/oss/dmasound/dmasound_awacs.c
index 730fa1d001a5..8f6388004f44 100644
--- a/sound/oss/dmasound/dmasound_awacs.c
+++ b/sound/oss/dmasound/dmasound_awacs.c
@@ -362,7 +362,7 @@ setup_audio_gpio(const char *name, const char* compatible, int *gpio_addr, int*
                                 of_get_property(np,"audio-gpio",NULL);
                         if (property != 0 && strcmp(property,name) == 0)
                                 break;
-                } else if (compatible && device_is_compatible(np, compatible))
+                } else if (compatible && of_device_is_compatible(np, compatible))
                         break;
                 np = of_get_next_child(gpiop, np);
         }
@@ -2620,17 +2620,17 @@ get_codec_type(struct device_node *info)
 
         if (info) {
                 /* must do awacs first to allow screamer to overide it */
-                if (device_is_compatible(info, "awacs"))
+                if (of_device_is_compatible(info, "awacs"))
                         codec = AWACS_AWACS ;
-                if (device_is_compatible(info, "screamer"))
+                if (of_device_is_compatible(info, "screamer"))
                         codec = AWACS_SCREAMER;
-                if (device_is_compatible(info, "burgundy"))
+                if (of_device_is_compatible(info, "burgundy"))
                         codec = AWACS_BURGUNDY ;
-                if (device_is_compatible(info, "daca"))
+                if (of_device_is_compatible(info, "daca"))
                         codec = AWACS_DACA;
-                if (device_is_compatible(info, "tumbler"))
+                if (of_device_is_compatible(info, "tumbler"))
                         codec = AWACS_TUMBLER;
-                if (device_is_compatible(info, "snapper"))
+                if (of_device_is_compatible(info, "snapper"))
                         codec = AWACS_SNAPPER;
         }
         return codec ;
@@ -2772,7 +2772,7 @@ set_hw_byteswap(struct device_node *io)
 
         for (mio = io->parent; mio ; mio = mio->parent) {
                 if (strcmp(mio->name, "mac-io") == 0) {
-                        if (device_is_compatible(mio, "Keylargo"))
+                        if (of_device_is_compatible(mio, "Keylargo"))
                                 kl = 1;
                         break;
                 }
diff --git a/sound/ppc/pmac.c b/sound/ppc/pmac.c
index 2bae9c1a2b54..5a2bef44a2f5 100644
--- a/sound/ppc/pmac.c
+++ b/sound/ppc/pmac.c
@@ -843,7 +843,7 @@ static void __init detect_byte_swap(struct snd_pmac *chip)
         /* if seems that Keylargo can't byte-swap  */
         for (mio = chip->node->parent; mio; mio = mio->parent) {
                 if (strcmp(mio->name, "mac-io") == 0) {
-                        if (device_is_compatible(mio, "Keylargo"))
+                        if (of_device_is_compatible(mio, "Keylargo"))
                                 chip->can_byte_swap = 0;
                         break;
                 }
@@ -910,7 +910,7 @@ static int __init snd_pmac_detect(struct snd_pmac *chip)
                 chip->node = of_find_node_by_name(NULL, "i2s-a");
                 if (chip->node && chip->node->parent &&
                     chip->node->parent->parent) {
-                        if (device_is_compatible(chip->node->parent->parent,
+                        if (of_device_is_compatible(chip->node->parent->parent,
                                                  "K2-Keylargo"))
                                 chip->is_k2 = 1;
                 }
@@ -941,22 +941,22 @@ static int __init snd_pmac_detect(struct snd_pmac *chip)
                 return -ENODEV;
         }
         /* This should be verified on older screamers */
-        if (device_is_compatible(sound, "screamer")) {
+        if (of_device_is_compatible(sound, "screamer")) {
                 chip->model = PMAC_SCREAMER;
                 // chip->can_byte_swap = 0; /* FIXME: check this */
         }
-        if (device_is_compatible(sound, "burgundy")) {
+        if (of_device_is_compatible(sound, "burgundy")) {
                 chip->model = PMAC_BURGUNDY;
                 chip->control_mask = MASK_IEPC | 0x11; /* disable IEE */
         }
-        if (device_is_compatible(sound, "daca")) {
+        if (of_device_is_compatible(sound, "daca")) {
                 chip->model = PMAC_DACA;
                 chip->can_capture = 0;  /* no capture */
                 chip->can_duplex = 0;
                 // chip->can_byte_swap = 0; /* FIXME: check this */
                 chip->control_mask = MASK_IEPC | 0x11; /* disable IEE */
         }
-        if (device_is_compatible(sound, "tumbler")) {
+        if (of_device_is_compatible(sound, "tumbler")) {
                 chip->model = PMAC_TUMBLER;
                 chip->can_capture = 0;  /* no capture */
                 chip->can_duplex = 0;
@@ -965,7 +965,7 @@ static int __init snd_pmac_detect(struct snd_pmac *chip)
                 chip->freq_table = tumbler_freqs;
                 chip->control_mask = MASK_IEPC | 0x11; /* disable IEE */
         }
-        if (device_is_compatible(sound, "snapper")) {
+        if (of_device_is_compatible(sound, "snapper")) {
                 chip->model = PMAC_SNAPPER;
                 // chip->can_byte_swap = 0; /* FIXME: check this */
                 chip->num_freqs = ARRAY_SIZE(tumbler_freqs);
diff --git a/sound/ppc/tumbler.c b/sound/ppc/tumbler.c
index 54e333fbb1d0..5821cdd0bec9 100644
--- a/sound/ppc/tumbler.c
+++ b/sound/ppc/tumbler.c
@@ -1060,7 +1060,7 @@ static struct device_node *find_compatible_audio_device(const char *name)
   
         for (np = of_get_next_child(gpiop, NULL); np;
                         np = of_get_next_child(gpiop, np)) {
-                if (device_is_compatible(np, name))
+                if (of_device_is_compatible(np, name))
                         break;
         }  
         of_node_put(gpiop);