CVS commit: [netbsd-8] src/sys/modules/nand

2017-12-21 Thread Soren Jacobsen 
Module Name:src
Committed By:   snj
Date:   Fri Dec 22 00:07:32 UTC 2017

Modified Files:
src/sys/modules/nand [netbsd-8]: Makefile

Log Message:
revert ticket 438


To generate a diff of this commit:
cvs rdiff -u -r1.4.30.1 -r1.4.30.2 src/sys/modules/nand/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/modules/nand/Makefile
diff -u src/sys/modules/nand/Makefile:1.4.30.1 src/sys/modules/nand/Makefile:1.4.30.2
--- src/sys/modules/nand/Makefile:1.4.30.1	Thu Dec 21 19:19:30 2017
+++ src/sys/modules/nand/Makefile	Fri Dec 22 00:07:32 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4.30.1 2017/12/21 19:19:30 snj Exp $
+# $NetBSD: Makefile,v 1.4.30.2 2017/12/22 00:07:32 snj Exp $
 
 .include "../Makefile.inc"
 
@@ -14,7 +14,3 @@ SRCS+=	nand_micron.c
 SRCS+=	nand_samsung.c
 
 .include 
-.PATH:	${S}/dev/flash
-
-SRCS+=	flash_mtdparts.c
-

CVS commit: [netbsd-8] src/sys/modules/nand

2017-12-21 Thread Soren Jacobsen 
Module Name:src
Committed By:   snj
Date:   Thu Dec 21 19:19:30 UTC 2017

Modified Files:
src/sys/modules/nand [netbsd-8]: Makefile

Log Message:
Pull up following revision(s) (requested by pgoyette in ticket #438):
sys/modules/nand/Makefile: revision 1.6
Include the flash_mtd_parts in the nand module.  Without this, the module
fails to load because of undefined linker symbol flash_attach_mtdparts


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.4.30.1 src/sys/modules/nand/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/modules/nand/Makefile
diff -u src/sys/modules/nand/Makefile:1.4 src/sys/modules/nand/Makefile:1.4.30.1
--- src/sys/modules/nand/Makefile:1.4	Sat Nov  3 11:48:54 2012
+++ src/sys/modules/nand/Makefile	Thu Dec 21 19:19:30 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2012/11/03 11:48:54 ahoka Exp $
+# $NetBSD: Makefile,v 1.4.30.1 2017/12/21 19:19:30 snj Exp $
 
 .include "../Makefile.inc"
 
@@ -14,3 +14,7 @@ SRCS+=	nand_micron.c
 SRCS+=	nand_samsung.c
 
 .include 
+.PATH:	${S}/dev/flash
+
+SRCS+=	flash_mtdparts.c
+