Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

arcnet: Move files out of include/linux

These #include files don't need to be in the include/linux directory
as they can be local to drivers/net/arcnet/

Move them and update the #include statements.

Update the MAINTAINERS file pattern by deleting arcdevice from the
NETWORKING block as arcnet is currently unmaintained.

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Michael Grzeschik <m.grzeschik@pengutronix.de>

authored by

Joe Perches and committed by
Michael Grzeschik
26c6d281 d6d7d3ed

+28 -22
-1
MAINTAINERS
··· 7292 7292 F: drivers/net/ 7293 7293 F: include/linux/if_* 7294 7294 F: include/linux/netdevice.h 7295 - F: include/linux/arcdevice.h 7296 7295 F: include/linux/etherdevice.h 7297 7296 F: include/linux/fcdevice.h 7298 7297 F: include/linux/fddidevice.h
+2 -1
drivers/net/arcnet/arc-rawmode.c
··· 33 33 #include <net/arp.h> 34 34 #include <linux/netdevice.h> 35 35 #include <linux/skbuff.h> 36 - #include <linux/arcdevice.h> 36 + 37 + #include "arcdevice.h" 37 38 38 39 static void rx(struct net_device *dev, int bufnum, 39 40 struct archdr *pkthdr, int length);
+2 -1
drivers/net/arcnet/arc-rimi.c
··· 37 37 #include <linux/init.h> 38 38 #include <linux/interrupt.h> 39 39 #include <linux/io.h> 40 - #include <linux/arcdevice.h> 40 + 41 + #include "arcdevice.h" 41 42 42 43 /* Internal function declarations */ 43 44
+2 -1
drivers/net/arcnet/arcnet.c
··· 50 50 #include <linux/if_arp.h> 51 51 #include <net/arp.h> 52 52 #include <linux/init.h> 53 - #include <linux/arcdevice.h> 54 53 #include <linux/jiffies.h> 54 + 55 + #include "arcdevice.h" 55 56 56 57 /* "do nothing" functions for protocol drivers */ 57 58 static void null_rx(struct net_device *dev, int bufnum,
+2 -1
drivers/net/arcnet/capmode.c
··· 35 35 #include <net/arp.h> 36 36 #include <linux/netdevice.h> 37 37 #include <linux/skbuff.h> 38 - #include <linux/arcdevice.h> 38 + 39 + #include "arcdevice.h" 39 40 40 41 /* packet receiver */ 41 42 static void rx(struct net_device *dev, int bufnum,
+3 -3
drivers/net/arcnet/com20020-isa.c
··· 39 39 #include <linux/init.h> 40 40 #include <linux/interrupt.h> 41 41 #include <linux/bootmem.h> 42 - #include <linux/arcdevice.h> 43 - #include <linux/com20020.h> 44 - 45 42 #include <linux/io.h> 43 + 44 + #include "arcdevice.h" 45 + #include "com20020.h" 46 46 47 47 /* We cannot (yet) probe for an IO mapped card, although we can check that 48 48 * it's where we were told it was, and even do autoirq.
+3 -3
drivers/net/arcnet/com20020-pci.c
··· 39 39 #include <linux/init.h> 40 40 #include <linux/interrupt.h> 41 41 #include <linux/pci.h> 42 - #include <linux/arcdevice.h> 43 - #include <linux/com20020.h> 44 42 #include <linux/list.h> 45 - 46 43 #include <linux/io.h> 44 + 45 + #include "arcdevice.h" 46 + #include "com20020.h" 47 47 48 48 /* Module parameters */ 49 49
+3 -3
drivers/net/arcnet/com20020.c
··· 37 37 #include <linux/netdevice.h> 38 38 #include <linux/init.h> 39 39 #include <linux/interrupt.h> 40 - #include <linux/arcdevice.h> 41 - #include <linux/com20020.h> 42 - 43 40 #include <linux/io.h> 41 + 42 + #include "arcdevice.h" 43 + #include "com20020.h" 44 44 45 45 static char *clockrates[] = { 46 46 "XXXXXXX", "XXXXXXXX", "XXXXXX",
+3 -4
drivers/net/arcnet/com20020_cs.c
··· 42 42 #include <linux/delay.h> 43 43 #include <linux/module.h> 44 44 #include <linux/netdevice.h> 45 - #include <linux/arcdevice.h> 46 - #include <linux/com20020.h> 47 - 45 + #include <linux/io.h> 48 46 #include <pcmcia/cistpl.h> 49 47 #include <pcmcia/ds.h> 50 48 51 - #include <linux/io.h> 49 + #include "arcdevice.h" 50 + #include "com20020.h" 52 51 53 52 static void regdump(struct net_device *dev) 54 53 {
+2 -1
drivers/net/arcnet/com90io.c
··· 38 38 #include <linux/init.h> 39 39 #include <linux/interrupt.h> 40 40 #include <linux/io.h> 41 - #include <linux/arcdevice.h> 41 + 42 + #include "arcdevice.h" 42 43 43 44 /* Internal function declarations */ 44 45
+2 -1
drivers/net/arcnet/com90xx.c
··· 36 36 #include <linux/netdevice.h> 37 37 #include <linux/slab.h> 38 38 #include <linux/io.h> 39 - #include <linux/arcdevice.h> 39 + 40 + #include "arcdevice.h" 40 41 41 42 /* Define this to speed up the autoprobe by assuming if only one io port and 42 43 * shmem are left in the list at Stage 5, they must correspond to each
+2 -1
drivers/net/arcnet/rfc1051.c
··· 33 33 #include <net/arp.h> 34 34 #include <linux/netdevice.h> 35 35 #include <linux/skbuff.h> 36 - #include <linux/arcdevice.h> 36 + 37 + #include "arcdevice.h" 37 38 38 39 static __be16 type_trans(struct sk_buff *skb, struct net_device *dev); 39 40 static void rx(struct net_device *dev, int bufnum,
+2 -1
drivers/net/arcnet/rfc1201.c
··· 32 32 #include <linux/if_arp.h> 33 33 #include <linux/netdevice.h> 34 34 #include <linux/skbuff.h> 35 - #include <linux/arcdevice.h> 35 + 36 + #include "arcdevice.h" 36 37 37 38 MODULE_LICENSE("GPL"); 38 39
include/linux/arcdevice.h drivers/net/arcnet/arcdevice.h
include/linux/com20020.h drivers/net/arcnet/com20020.h