PERFORCE change 151928 for review

[Marcel Moolenaar]

http://perforce.freebsd.org/chv.cgi?CH=151928

Change 151928 by marcel at marcel_xcllnt on 2008/10/25 23:50:34

	Merge fodder.

Affected files ...

.. //depot/projects/e500/sys/dev/cfi/cfi_bus_lbc.c#5 edit
.. //depot/projects/e500/sys/dev/cfi/cfi_core.c#4 edit
.. //depot/projects/e500/sys/dev/cfi/cfi_dev.c#4 edit
.. //depot/projects/e500/sys/dev/cfi/cfi_reg.h#4 edit
.. //depot/projects/e500/sys/dev/cfi/cfi_var.h#4 edit

Differences ...

==== //depot/projects/e500/sys/dev/cfi/cfi_bus_lbc.c#5 (text+ko) ====

@@ -27,6 +27,9 @@
  * SUCH DAMAGE.
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: head/sys/dev/cfi/cfi_bus_lbc.c 184251 2008-10-25 06:18:12Z marcel $");
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/bus.h>
@@ -73,7 +76,7 @@
 	if (error)
 		return (error);
 
-	if (devtype != LBC_DEVTYPE_BFLASH)
+	if (devtype != LBC_DEVTYPE_CFI)
 		return (EINVAL);
 
 	return (cfi_probe(dev));

==== //depot/projects/e500/sys/dev/cfi/cfi_core.c#4 (text+ko) ====

@@ -27,6 +27,9 @@
  * SUCH DAMAGE.
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: head/sys/dev/cfi/cfi_core.c 184251 2008-10-25 06:18:12Z marcel $");
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/bus.h>

==== //depot/projects/e500/sys/dev/cfi/cfi_dev.c#4 (text+ko) ====

@@ -27,6 +27,9 @@
  * SUCH DAMAGE.
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: head/sys/dev/cfi/cfi_dev.c 184251 2008-10-25 06:18:12Z marcel $");
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/bus.h>

==== //depot/projects/e500/sys/dev/cfi/cfi_reg.h#4 (text+ko) ====

@@ -25,6 +25,8 @@
  * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
+ *
+ * $FreeBSD: head/sys/dev/cfi/cfi_reg.h 184251 2008-10-25 06:18:12Z marcel $
  */
 
 #ifndef _DEV_CFI_REG_H_

==== //depot/projects/e500/sys/dev/cfi/cfi_var.h#4 (text+ko) ====

@@ -25,6 +25,8 @@
  * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
+ *
+ * $FreeBSD: head/sys/dev/cfi/cfi_var.h 184251 2008-10-25 06:18:12Z marcel $
  */
 
 #ifndef _DEV_CFI_VAR_H_