diff options
author | Renato Botelho <renato@netgate.com> | 2015-12-01 08:32:21 -0200 |
---|---|---|
committer | Renato Botelho <renato@netgate.com> | 2015-12-01 08:32:21 -0200 |
commit | 695ea8099809439ed40fe35451df301d75e2b39e (patch) | |
tree | f5d371838e7b09643ac854d4c84c96d401175010 /sys/modules | |
parent | 2572e1a27934f3539d0356653fcac9aa6b03b80e (diff) | |
parent | ff68307fb48ebed764757b9f0ff301df2f3d8825 (diff) | |
download | FreeBSD-src-695ea8099809439ed40fe35451df301d75e2b39e.zip FreeBSD-src-695ea8099809439ed40fe35451df301d75e2b39e.tar.gz |
Merge remote-tracking branch 'origin/stable/10' into devel
Diffstat (limited to 'sys/modules')
-rw-r--r-- | sys/modules/ispfw/Makefile | 3 | ||||
-rw-r--r-- | sys/modules/ispfw/isp_1040_it/Makefile | 36 | ||||
-rw-r--r-- | sys/modules/ispfw/isp_1080_it/Makefile | 36 | ||||
-rw-r--r-- | sys/modules/ispfw/isp_12160_it/Makefile | 36 |
4 files changed, 0 insertions, 111 deletions
diff --git a/sys/modules/ispfw/Makefile b/sys/modules/ispfw/Makefile index 6219da8..fa61f17 100644 --- a/sys/modules/ispfw/Makefile +++ b/sys/modules/ispfw/Makefile @@ -29,11 +29,8 @@ SUBDIR = ispfw SUBDIR += isp_1040 -SUBDIR += isp_1040_it SUBDIR += isp_1080 -SUBDIR += isp_1080_it SUBDIR += isp_12160 -SUBDIR += isp_12160_it SUBDIR += isp_2100 SUBDIR += isp_2200 SUBDIR += isp_2300 diff --git a/sys/modules/ispfw/isp_1040_it/Makefile b/sys/modules/ispfw/isp_1040_it/Makefile deleted file mode 100644 index cdccc05..0000000 --- a/sys/modules/ispfw/isp_1040_it/Makefile +++ /dev/null @@ -1,36 +0,0 @@ -#- -# Copyright (c) 2006 by Matthew Jacob -# All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions -# are met: -# 1. Redistributions of source code must retain the above copyright -# notice immediately at the beginning of the file, without modification, -# this list of conditions, and the following disclaimer. -# 2. The name of the author may not be used to endorse or promote products -# derived from this software without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND -# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE FOR -# ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS -# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -# LIABILITY, 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$ - -.PATH: ${.CURDIR}/../../../dev/ispfw - -KMOD= isp_1040_it -SRCS= ispfw.c - -CFLAGS += -DISP_1040_IT -DMODULE_NAME=\"${KMOD}\" - -.include <bsd.kmod.mk> diff --git a/sys/modules/ispfw/isp_1080_it/Makefile b/sys/modules/ispfw/isp_1080_it/Makefile deleted file mode 100644 index 9d688fc..0000000 --- a/sys/modules/ispfw/isp_1080_it/Makefile +++ /dev/null @@ -1,36 +0,0 @@ -#- -# Copyright (c) 2006 by Matthew Jacob -# All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions -# are met: -# 1. Redistributions of source code must retain the above copyright -# notice immediately at the beginning of the file, without modification, -# this list of conditions, and the following disclaimer. -# 2. The name of the author may not be used to endorse or promote products -# derived from this software without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND -# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE FOR -# ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS -# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -# LIABILITY, 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$ - -.PATH: ${.CURDIR}/../../../dev/ispfw - -KMOD= isp_1080_it -SRCS= ispfw.c - -CFLAGS += -DISP_1080_IT -DMODULE_NAME=\"${KMOD}\" - -.include <bsd.kmod.mk> diff --git a/sys/modules/ispfw/isp_12160_it/Makefile b/sys/modules/ispfw/isp_12160_it/Makefile deleted file mode 100644 index d5526e6..0000000 --- a/sys/modules/ispfw/isp_12160_it/Makefile +++ /dev/null @@ -1,36 +0,0 @@ -#- -# Copyright (c) 2006 by Matthew Jacob -# All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions -# are met: -# 1. Redistributions of source code must retain the above copyright -# notice immediately at the beginning of the file, without modification, -# this list of conditions, and the following disclaimer. -# 2. The name of the author may not be used to endorse or promote products -# derived from this software without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND -# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE FOR -# ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS -# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -# LIABILITY, 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$ - -.PATH: ${.CURDIR}/../../../dev/ispfw - -KMOD= isp_12160_it -SRCS= ispfw.c - -CFLAGS += -DISP_12160_IT -DMODULE_NAME=\"${KMOD}\" - -.include <bsd.kmod.mk> |