Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

[pandora-kernel.git] / drivers / net / arm / am79c961a.h

diff --git a/drivers/net/arm/am79c961a.h b/drivers/net/arm/am79c961a.h
index 1e9b050..483009f 100644 (file)
--- a/drivers/net/arm/am79c961a.h
+++ b/drivers/net/arm/am79c961a.h
@@ -1,5 +1,5 @@
 /*
 /*

- * linux/drivers/net/am79c961.h
+ * linux/drivers/net/arm/am79c961a.h

  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as


@@ -143,6 +143,4 @@ struct dev_priv {
     struct timer_list  timer;
 };
 
     struct timer_list  timer;
 };
 

-extern int     am79c961_probe (struct net_device *dev);
-

 #endif
 #endif