From owner-svn-src-stable@FreeBSD.ORG  Thu May 31 23:05:07 2012
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 959B61065672;
	Thu, 31 May 2012 23:05:07 +0000 (UTC)
	(envelope-from jhibbits@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 7F2ED8FC12;
	Thu, 31 May 2012 23:05:07 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q4VN57gv069272;
	Thu, 31 May 2012 23:05:07 GMT
	(envelope-from jhibbits@svn.freebsd.org)
Received: (from jhibbits@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q4VN57ZV069270;
	Thu, 31 May 2012 23:05:07 GMT
	(envelope-from jhibbits@svn.freebsd.org)
Message-Id: <201205312305.q4VN57ZV069270@svn.freebsd.org>
From: Justin Hibbits <jhibbits@FreeBSD.org>
Date: Thu, 31 May 2012 23:05:07 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r236368 - stable/9/sys/dev/powermac_nvram
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
	<svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>, 
	<mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
	<mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 31 May 2012 23:05:07 -0000

Author: jhibbits
Date: Thu May 31 23:05:07 2012
New Revision: 236368
URL: http://svn.freebsd.org/changeset/base/236368

Log:
  MFC r235678:
  
  "nvram,flash" may not be the first in the compatible list property of the
  nvram ofw node, so check all strings in the list.
  
  Approved by:	nwhitehorn (mentor)

Modified:
  stable/9/sys/dev/powermac_nvram/powermac_nvram.c
Directory Properties:
  stable/9/sys/   (props changed)
  stable/9/sys/dev/   (props changed)

Modified: stable/9/sys/dev/powermac_nvram/powermac_nvram.c
==============================================================================
--- stable/9/sys/dev/powermac_nvram/powermac_nvram.c	Thu May 31 22:54:08 2012	(r236367)
+++ stable/9/sys/dev/powermac_nvram/powermac_nvram.c	Thu May 31 23:05:07 2012	(r236368)
@@ -36,6 +36,7 @@
 
 #include <dev/ofw/openfirm.h>
 #include <dev/ofw/ofw_bus.h>
+#include <dev/ofw/ofw_bus_subr.h>
 
 #include <machine/bus.h>
 #include <machine/md_var.h>
@@ -118,7 +119,7 @@ powermac_nvram_probe(device_t dev)
 	if (strcmp(type, "nvram") != 0)
 		return ENXIO;
 	if (strcmp(compatible, "amd-0137") != 0 &&
-	    strcmp(compatible, "nvram,flash") != 0)
+	    !ofw_bus_is_compatible(dev, "nvram,flash"))
 		return ENXIO;
 
 	device_set_desc(dev, "Apple NVRAM");