From e944110707d1fbbb7f77c8423cb42f47167c1799 Mon Sep 17 00:00:00 2001
From: gbeauche <>
Date: Mon, 16 Feb 2004 09:04:57 +0000
Subject: [PATCH] try to fix cvs update -d conflicts

---
 SheepShaver/src/dummy/ether_dummy.cpp | 91 ---------------------------
 1 file changed, 91 deletions(-)
 delete mode 100644 SheepShaver/src/dummy/ether_dummy.cpp

diff --git a/SheepShaver/src/dummy/ether_dummy.cpp b/SheepShaver/src/dummy/ether_dummy.cpp
deleted file mode 100644
index a5e7d35e..00000000
--- a/SheepShaver/src/dummy/ether_dummy.cpp
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
- *  ether_dummy.cpp - Ethernet device driver, dummy implementation
- *
- *  Basilisk II (C) 1997-2004 Christian Bauer
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-
-#include "sysdeps.h"
-
-#include "main.h"
-#include "ether.h"
-#include "ether_defs.h"
-
-#define DEBUG 0
-#include "debug.h"
-
-
-/*
- *  Init ethernet
- */
-
-void EtherInit(void)
-{
-}
-
-
-/*
- *  Exit ethernet
- */
-
-void EtherExit(void)
-{
-}
-
-
-/*
- *  Get ethernet hardware address
- */
-
-void AO_get_ethernet_address(uint8 *addr)
-{
-}
-
-
-/*
- *  Enable multicast address
- */
-
-void AO_enable_multicast(uint8 *addr)
-{
-}
-
-
-/*
- *  Disable multicast address
- */
-
-void AO_disable_multicast(uint8 *addr)
-{
-}
-
-
-/*
- *  Transmit one packet
- */
-
-void AO_transmit_packet(mblk_t *mp)
-{
-}
-
-
-/*
- *  Ethernet interrupt
- */
-
-void EtherIRQ(void)
-{
-}