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>

1 files changed, 8 insertions, 8 deletions

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;
                 }