[2.6 patch] drivers/atm/nicstar*: small cleanup

[Adrian Bunk]

This patch makes two needlessly global functions in nicstarmac.c static.

Since after this change nicstarmac.h contained only one typedef I've 
moved this typedef to nicstarmac.c and completely removed the header.

Signed-off-by: Adrian Bunk <bunk@xxxxxxxxx>

---

 drivers/atm/nicstar.c    |    1 -
 drivers/atm/nicstarmac.c |    6 ++++--
 drivers/atm/nicstarmac.h |   13 -------------
 3 files changed, 4 insertions(+), 16 deletions(-)

--- linux-2.6.11-rc1-mm2-full/drivers/atm/nicstarmac.h	2005-01-20 07:44:04.000000000 +0100
+++ /dev/null	2004-11-25 03:16:25.000000000 +0100
@@ -1,13 +0,0 @@
-/******************************************************************************
- *
- * nicstarmac.h
- *
- * Header file for nicstarmac.c
- *
- ******************************************************************************/
-
-
-typedef void __iomem *virt_addr_t;
-
-void nicstar_init_eprom( virt_addr_t base );
-void nicstar_read_eprom( virt_addr_t, u_int8_t, u_int8_t *, u_int32_t);
--- linux-2.6.11-rc1-mm2-full/drivers/atm/nicstarmac.c.old	2005-01-21 13:23:05.000000000 +0100
+++ linux-2.6.11-rc1-mm2-full/drivers/atm/nicstarmac.c	2005-01-21 13:23:37.000000000 +0100
@@ -7,6 +7,8 @@
  * Read this ForeRunner's MAC address from eprom/eeprom
  */
 
+typedef void __iomem *virt_addr_t;
+
 #define CYCLE_DELAY 5
 
 /* This was the original definition
@@ -213,7 +215,7 @@
 }
 
 
-void
+static void
 nicstar_init_eprom( virt_addr_t base )
 {
     u_int32_t val;
@@ -246,7 +248,7 @@
  * above.
  */ 
 
-void
+static void
 nicstar_read_eprom(
     virt_addr_t	base,
     u_int8_t	prom_offset,
--- linux-2.6.11-rc1-mm2-full/drivers/atm/nicstar.c.old	2005-01-21 13:26:41.000000000 +0100
+++ linux-2.6.11-rc1-mm2-full/drivers/atm/nicstar.c	2005-01-21 13:26:50.000000000 +0100
@@ -54,7 +54,6 @@
 #include <asm/uaccess.h>
 #include <asm/atomic.h>
 #include "nicstar.h"
-#include "nicstarmac.h"
 #ifdef CONFIG_ATM_NICSTAR_USE_SUNI
 #include "suni.h"
 #endif /* CONFIG_ATM_NICSTAR_USE_SUNI */

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/