Skip to contentSkip to conversation

more dead headers

PATCH In review Christoph Hellwig 2 participants 4 messages Sep 27, 2003 – Oct 6, 2003

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 more dead headers

arch/ia64/sn/io/machvec/pci_dma.c +0 -1
diff -Nru a/arch/ia64/sn/io/machvec/pci_dma.c b/arch/ia64/sn/io/machvec/pci_dma.c
@@ -29,7 +29,6 @@
 #include <asm/sn/types.h>
 #include <asm/sn/alenlist.h>
 #include <asm/sn/pci/pci_bus_cvlink.h>
-#include <asm/sn/nag.h>
 
 /*
  * For ATE allocations
include/asm-ia64/sn/fetchop.h +0 -85

85 lines not on this page · raw message

include/asm-ia64/sn/ifconfig_net.h +0 -32
diff -Nru a/include/asm-ia64/sn/ifconfig_net.h b/include/asm-ia64/sn/ifconfig_net.h
@@ -1,32 +0,0 @@
-/*
- * This file is subject to the terms and conditions of the GNU General Public
- * License.  See the file "COPYING" in the main directory of this archive
- * for more details.
- *
- * Copyright (C) 2000-2003 Silicon Graphics, Inc. All rights reserved.
- */
-
-#ifndef _ASM_IA64_SN_IFCONFIG_NET_H
-#define _ASM_IA64_SN_IFCONFIG_NET_H
-
-#define NETCONFIG_FILE "/tmp/ifconfig_net"
-#define POUND_CHAR                   '#'
-#define MAX_LINE_LEN 128
-#define MAXPATHLEN 128
-
-struct ifname_num {
-	long next_eth;
-	long next_fddi;
-	long next_hip;
-	long next_tr;
-	long next_fc;
-	long size;
-};
-
-struct ifname_MAC {
-	char name[16];
-	unsigned char           dev_addr[7];
-	unsigned char           addr_len;       /* hardware address length      */
-};
-
-#endif /* _ASM_IA64_SN_IFCONFIG_NET_H */
include/asm-ia64/sn/ioc4.h +0 -799

799 lines not on this page · raw message

include/asm-ia64/sn/nag.h +0 -32
diff -Nru a/include/asm-ia64/sn/nag.h b/include/asm-ia64/sn/nag.h
@@ -1,32 +0,0 @@
-/*
- *
- * This file is subject to the terms and conditions of the GNU General Public
- * License.  See the file "COPYING" in the main directory of this archive
- * for more details.
- *
- * Copyright (c) 2001-2003 Silicon Graphics, Inc.  All rights reserved.
-*/
-
-
-#ifndef _ASM_IA64_SN_NAG_H
-#define _ASM_IA64_SN_NAG_H
-
-
-#define NAG(mesg...) \
-do {										\
-	static unsigned int how_broken = 1;					\
-	static unsigned int threshold = 1;					\
-	if (how_broken = threshold) {						\
-		if (threshold < 10000)						\
-			threshold *= 10;					\
-		if (how_broken > 1)						\
-			printk(KERN_WARNING "%u times: ", how_broken);		\
-		else								\
-			printk(KERN_WARNING);					\
-		printk(mesg);							\
-	}									\
-	how_broken++;								\
-} while (0)
-
-
-#endif /* _ASM_IA64_SN_NAG_H */
#1 lore raw

FYI

fetchop.h and ioc4.h are for GPL'ed drivers that have already been published for 2.4 - they just need to be ported to 2.6. We can take them out now and stick them back in later if you prefer but doing so seems silly to me.

nag.h is a goner and ifconfig_net.h is history for 2.6 for sure.

Cheers,
Jes

#2 lore raw
In reply to Christoph Hellwig
Quoted 7 lines · Jes Sorensen

FYI

fetchop.h and ioc4.h are for GPL'ed drivers that have already been published for 2.4 - they just need to be ported to 2.6. We can take them out now and stick them back in later if you prefer but doing so seems silly to me.

It's still the wrong place for them. And the ioc4 driver including most of the header is so utter junk that it needs a complete rewrite anyway.

#3 lore raw
In reply to Christoph Hellwig
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Christoph" = Christoph Hellwig <[email protected]> writes:

Christoph> On Sun, Oct 05, 2003 at 12:41:03PM -0400, Jes Sorensen

Quoted 4 lines · Christoph> wrote:
Quoted 4 lines

fetchop.h and ioc4.h are for GPL'ed drivers that have already been published for 2.4 - they just need to be ported to 2.6. We can take them out now and stick them back in later if you prefer but doing so seems silly to me.

Christoph> It's still the wrong place for them. And the ioc4 driver Christoph> including most of the header is so utter junk that it needs Christoph> a complete rewrite anyway.

I don't have a problem moving fetchop.h, it's very hardware specific though. ioc4 will have to migrate to relying a lot more on existing infrastructure.

Jes