# HG changeset patch # User Florian Pose # Date 1222783492 0 # Node ID 59ab2130a85976658953ed07fdc927c3a23b3ae5 # Parent d4db7ad736a5162ae94b222ba0821b21525cc5e3 Removed e100 relicts. diff -r d4db7ad736a5 -r 59ab2130a859 configure.ac --- a/configure.ac Tue Sep 30 14:02:02 2008 +0000 +++ b/configure.ac Tue Sep 30 14:04:52 2008 +0000 @@ -134,61 +134,6 @@ AC_SUBST(KERNEL_8139TOO,[$kernel8139too]) #------------------------------------------------------------------------------ -# e100 driver -#------------------------------------------------------------------------------ - -AC_ARG_ENABLE([e100], - AS_HELP_STRING([--enable-e100], - [Enable e100 driver]), - [ - case "${enableval}" in - yes) enablee100=1 - ;; - no) enablee100=0 - ;; - *) AC_MSG_ERROR([Invalid value for --enable-e100]) - ;; - esac - ], - [enablee100=0] # disabled by default -) - -AM_CONDITIONAL(ENABLE_E100, test "x$enablee100" = "x1") -AC_SUBST(ENABLE_E100,[$enablee100]) - -AC_ARG_WITH([e100-kernel], - AC_HELP_STRING( - [--with-e100-kernel=], - [e100 kernel (only if differing)] - ), - [ - kernele100=[$withval] - ], - [ - kernele100=$linuxversion - ] -) - -if test "x${enablee100}" = "x1"; then - AC_MSG_CHECKING([for kernel for e100 driver]) - - kernels=`ls -1 ${srcdir}/devices/ | grep -oE "^e100-.*-" | cut -d "-" -f 2 | uniq` - found=0 - for k in $kernels; do - if test "$kernele100" = "$k"; then - found=1 - fi - done - if test $found -ne 1; then - AC_MSG_ERROR([kernel $kernele100 not available for e100 driver!]) - fi - - AC_MSG_RESULT([$kernele100]) -fi - -AC_SUBST(KERNEL_E100,[$kernele100]) - -#------------------------------------------------------------------------------ # e1000 driver #------------------------------------------------------------------------------ diff -r d4db7ad736a5 -r 59ab2130a859 devices/Kbuild.in --- a/devices/Kbuild.in Tue Sep 30 14:02:02 2008 +0000 +++ b/devices/Kbuild.in Tue Sep 30 14:04:52 2008 +0000 @@ -46,13 +46,6 @@ CFLAGS_$(EC_8139TOO_OBJ) = -DSVNREV=$(REV) endif -ifeq (@ENABLE_E100@,1) - EC_E100_OBJ := e100-@KERNEL_E100@-ethercat.o - obj-m += ec_e100.o - ec_e100-objs := $(EC_E100_OBJ) - CFLAGS_$(EC_E100_OBJ) = -DSVNREV=$(REV) -endif - ifeq (@ENABLE_E1000@,1) obj-m += e1000/ endif diff -r d4db7ad736a5 -r 59ab2130a859 devices/Makefile.am --- a/devices/Makefile.am Tue Sep 30 14:02:02 2008 +0000 +++ b/devices/Makefile.am Tue Sep 30 14:04:52 2008 +0000 @@ -64,9 +64,6 @@ if ENABLE_8139TOO cp $(srcdir)/ec_8139too.ko $(DESTDIR)$(LINUX_MOD_PATH) endif -if ENABLE_E100 - cp $(srcdir)/ec_e100.ko $(DESTDIR)$(LINUX_MOD_PATH) -endif if ENABLE_E1000 $(MAKE) -C e1000 modules_install endif