From: Francois Romieu <romieu@fr.zoreil.com>

- silly indentation;
- let's be more user-friendly with manufacturer specific (mis)feature:
  + s/CONFIG_DSCC4_CLOCK_ON_TWO_PORTS_ONLY/CONFIG_DSCC4_PCISYNC/
  + KConfig adequate entry
- broken warning message.



 25-akpm/drivers/net/wan/Kconfig |   11 +++++++++++
 25-akpm/drivers/net/wan/dscc4.c |   10 +++++-----
 2 files changed, 16 insertions(+), 5 deletions(-)

diff -puN drivers/net/wan/dscc4.c~dscc4-7 drivers/net/wan/dscc4.c
--- 25/drivers/net/wan/dscc4.c~dscc4-7	Fri Aug 15 13:54:23 2003
+++ 25-akpm/drivers/net/wan/dscc4.c	Fri Aug 15 13:54:23 2003
@@ -514,9 +514,9 @@ inline int try_get_rx_skb(struct dscc4_d
 	skb = dev_alloc_skb(len);
 	dpriv->rx_skbuff[dirty] = skb;
 	if (skb) {
-	skb->dev = dev;
-	skb->protocol = hdlc_type_trans(skb, dev);
-	skb->mac.raw = skb->data;
+		skb->dev = dev;
+		skb->protocol = hdlc_type_trans(skb, dev);
+		skb->mac.raw = skb->data;
 		rx_fd->data = pci_map_single(dpriv->pci_priv->pdev, skb->data,
 					     len, PCI_DMA_FROMDEVICE);
 	} else {
@@ -1171,7 +1171,7 @@ static inline int dscc4_check_clock_abil
 {
 	int ret = 0;
 
-#ifdef CONFIG_DSCC4_CLOCK_ON_TWO_PORTS_ONLY
+#ifdef CONFIG_DSCC4_PCISYNC
 	if (port >= 2)
 		ret = -1;
 #endif
@@ -1304,7 +1304,7 @@ static int dscc4_ioctl(struct net_device
 
 		if (dpriv->flags & FakeReset) {
 			printk(KERN_INFO "%s: please reset the device"
-			       "before this command\n", dev->name);
+			       " before this command\n", dev->name);
 			return -EPERM;
 		}
 		if (copy_from_user(&dpriv->settings, line, size))
diff -puN drivers/net/wan/Kconfig~dscc4-7 drivers/net/wan/Kconfig
--- 25/drivers/net/wan/Kconfig~dscc4-7	Fri Aug 15 13:54:23 2003
+++ 25-akpm/drivers/net/wan/Kconfig	Fri Aug 15 13:54:23 2003
@@ -186,6 +186,17 @@ config DSCC4
 	  The module will be called dscc4. For general information about
 	  modules read <file:Documentation/modules.txt>.
 
+config DSCC4_PCISYNC
+	bool "Etinc PCISYNC features"
+	depends on DSCC4
+	help
+	  Due to Etinc's design choice for its PCISYNC cards, some operations
+	  are only allowed on specific ports of the DSCC4. This option is the
+	  only way for the driver to know that it shouldn't return a success
+	  code for these operations.
+
+	  Please say Y if your card is an Etinc's PCISYNC.
+
 config DSCC4_PCI_RST
 	bool "Hard reset support"
 	depends on DSCC4

_