From: Michael Schmitz <schmitzmic@gmail.com>
To: geert@linux-m68k.org
Cc: linux-m68k@vger.kernel.org, debian-68k@lists.debian.org,
Michael Schmitz <schmitz@debian.org>
Subject: [PATCH 03/14] m68k/atari: use CONFIG_ATARI in smc91x.h
Date: Mon, 25 Mar 2013 14:16:21 +1300 [thread overview]
Message-ID: <1364174192-25406-4-git-send-email-schmitz@debian.org> (raw)
In-Reply-To: <1364174192-25406-1-git-send-email-schmitz@debian.org>
Signed-off-by: Michael Schmitz <schmitz@debian.org>
---
drivers/net/ethernet/smsc/smc91x.h | 6 ++----
1 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/drivers/net/ethernet/smsc/smc91x.h b/drivers/net/ethernet/smsc/smc91x.h
index f0f950c..528f7ba 100644
--- a/drivers/net/ethernet/smsc/smc91x.h
+++ b/drivers/net/ethernet/smsc/smc91x.h
@@ -231,7 +231,7 @@ SMC_outw(u16 val, void __iomem *ioaddr, int reg)
#include <unit/smc91111.h>
-#elif defined(CONFIG_ATARI_ETHERNAT) || defined(CONFIG_ATARI_ETHERNAT_MODULE)
+#elif defined(CONFIG_ATARI)
#define SMC_CAN_USE_8BIT 1
#define SMC_CAN_USE_16BIT 1
@@ -255,8 +255,6 @@ SMC_outw(u16 val, void __iomem *ioaddr, int reg)
#define RPC_LSA_DEFAULT RPC_LED_100_10
#define RPC_LSB_DEFAULT RPC_LED_TX_RX
-#define SMC_DYNAMIC_BUS_CONFIG
-
#elif defined(CONFIG_ARCH_MSM)
#define SMC_CAN_USE_8BIT 0
@@ -1142,7 +1140,7 @@ static const char * chip_ids[ 16 ] = {
} \
} while (0)
-#if defined(CONFIG_ATARI_ETHERNAT) || defined(CONFIG_ATARI_ETHERNAT_MODULE)
+#if defined(CONFIG_ATARI)
/*
* MSch: EtherNAT is 32 bit, so the misaligned data buffer hack applies.
* This appears to hurt quite a lot ... we actually need to byte swap the
--
1.7.0.4
next prev parent reply other threads:[~2013-03-25 1:16 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-03-25 1:16 (unknown), Michael Schmitz
2013-03-25 1:16 ` [PATCH 01/14] m68k/atari EtherNEC: remove original EtherNEC driver Michael Schmitz
2013-03-25 1:16 ` [PATCH 02/14] m68k/atari EtherNAT: remove original EtherNAT driver Michael Schmitz
2013-03-25 1:16 ` Michael Schmitz [this message]
2013-03-25 1:16 ` [PATCH 04/14] m68k/atari: EtherNAT - change number of Atari interrupt sources Michael Schmitz
2013-03-25 1:16 ` [PATCH 05/14] m68k/irq: add handle_polled_irq() for timer based soft interrupts Michael Schmitz
2013-03-25 1:16 ` [PATCH 06/14] m68k/atari: use dedicated irq_chip for timer D interrupts Michael Schmitz
2013-03-25 1:16 ` [PATCH 07/14] m68k/atari: EtherNEC - add platform device support Michael Schmitz
2013-03-25 1:16 ` [PATCH 08/14] m68k/atari: EtherNAT - ethernet support - new driver (smc91x) Michael Schmitz
2013-03-25 1:16 ` [PATCH 09/14] m68k/atari: EtherNEC - ethernet support - new driver (ne.c) Michael Schmitz
2013-03-25 1:16 ` [PATCH 10/14] m68k/atari: EtherNAT - add interrupt chip for Ethernet and USB interrupts Michael Schmitz
2013-03-25 1:16 ` [PATCH 11/14] m68k/atari: Implement 16 bit access macros for ROM port Michael Schmitz
2013-03-25 1:16 ` [PATCH 12/14] m68k: Implement ndelay() based on the existing udelay() logic Michael Schmitz
2013-03-25 1:16 ` [PATCH 13/14] m68k/atari: USB - add platform device definitions for ISP1160 HCD Michael Schmitz
2013-03-25 1:16 ` [PATCH 14/14] m68k/atari: USB - Add ISP1160 USB host controller support Michael Schmitz
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1364174192-25406-4-git-send-email-schmitz@debian.org \
--to=schmitzmic@gmail.com \
--cc=debian-68k@lists.debian.org \
--cc=geert@linux-m68k.org \
--cc=linux-m68k@vger.kernel.org \
--cc=schmitz@debian.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox