From 616dec9df4d1e704d6fe6c69383d3b8f930345bf Mon Sep 17 00:00:00 2001
From: Ralf Baechle <ralf@linux-mips.org>
Date: Sun, 21 Jun 2009 18:01:55 +0000
Subject: Remove use of backwards compatibility header name.

Glibc as old as 2.2 provides working headers under the right name and
if not libax25 would install headers under the right name so this has
become redundant and ugly.
---
 netrom/netromd.c  | 12 ------------
 netrom/netromr.c  | 12 ------------
 netrom/netromt.c  | 12 ------------
 netrom/nodesave.c |  4 ----
 netrom/nrattach.c | 12 ------------
 netrom/nrparms.c  | 12 ------------
 6 files changed, 64 deletions(-)

(limited to 'netrom')

diff --git a/netrom/netromd.c b/netrom/netromd.c
index 0a16fd3..e7a0362 100644
--- a/netrom/netromd.c
+++ b/netrom/netromd.c
@@ -23,21 +23,9 @@
 #include <linux/if_ether.h>
 #endif
 
-#ifdef HAVE_NETAX25_AX25_H
 #include <netax25/ax25.h>
-#else
-#include <netax25/kernel_ax25.h>
-#endif
-#ifdef HAVE_NETROM_NETROM_H
 #include <netrom/netrom.h>
-#else
-#include <netax25/kernel_netrom.h>
-#endif
-#ifdef HAVE_NETROSE_ROSE_H
 #include <netrose/rose.h>
-#else 
-#include <netax25/kernel_rose.h>
-#endif
 
 #include <netax25/axlib.h>
 #include <netax25/axconfig.h>
diff --git a/netrom/netromr.c b/netrom/netromr.c
index 5fde8d0..9ed716f 100644
--- a/netrom/netromr.c
+++ b/netrom/netromr.c
@@ -20,21 +20,9 @@
 #include <linux/if_ether.h>
 #endif
 
-#ifdef HAVE_NETAX25_AX25_H
 #include <netax25/ax25.h>
-#else
-#include <netax25/kernel_ax25.h>
-#endif
-#ifdef HAVE_NETROM_NETROM_H
 #include <netrom/netrom.h>
-#else
-#include <netax25/kernel_netrom.h>
-#endif
-#ifdef HAVE_NETROSE_ROSE_H
 #include <netrose/rose.h>
-#else 
-#include <netax25/kernel_rose.h>
-#endif
 
 #include <netax25/axlib.h>
 #include "../pathnames.h"
diff --git a/netrom/netromt.c b/netrom/netromt.c
index 3b37d5f..b3f99b3 100644
--- a/netrom/netromt.c
+++ b/netrom/netromt.c
@@ -12,21 +12,9 @@
 
 #include <sys/socket.h>
 
-#ifdef HAVE_NETAX25_AX25_H
 #include <netax25/ax25.h>
-#else
-#include <netax25/kernel_ax25.h>
-#endif
-#ifdef HAVE_NETROM_NETROM_H
 #include <netrom/netrom.h>
-#else
-#include <netax25/kernel_netrom.h>
-#endif
-#ifdef HAVE_NETROSE_ROSE_H
 #include <netrose/rose.h>
-#else 
-#include <netax25/kernel_rose.h>
-#endif
 
 #include <netax25/axlib.h>
 #include <netax25/axconfig.h>
diff --git a/netrom/nodesave.c b/netrom/nodesave.c
index 7737fff..1258c36 100644
--- a/netrom/nodesave.c
+++ b/netrom/nodesave.c
@@ -10,11 +10,7 @@
 #include <sys/stat.h>
 #include <sys/socket.h>
 
-#ifdef HAVE_NETAX25_AX25_H
 #include <netax25/ax25.h>
-#else
-#include <netax25/kernel_ax25.h>
-#endif
 
 #include <netax25/axconfig.h>
 #include <netax25/nrconfig.h>
diff --git a/netrom/nrattach.c b/netrom/nrattach.c
index bd6cb58..ceda97d 100644
--- a/netrom/nrattach.c
+++ b/netrom/nrattach.c
@@ -17,21 +17,9 @@
 #include <net/if_arp.h>
 
 
-#ifdef HAVE_NETAX25_AX25_H
 #include <netax25/ax25.h>
-#else
-#include <netax25/kernel_ax25.h>
-#endif
-#ifdef HAVE_NETROM_NETROM_H
 #include <netrom/netrom.h>
-#else
-#include <netax25/kernel_netrom.h>
-#endif
-#ifdef HAVE_NETROSE_ROSE_H
 #include <netrose/rose.h>
-#else 
-#include <netax25/kernel_rose.h>
-#endif
 
 #include <netax25/axlib.h>
 #include <netax25/nrconfig.h>
diff --git a/netrom/nrparms.c b/netrom/nrparms.c
index 78a81f3..ff8b60e 100644
--- a/netrom/nrparms.c
+++ b/netrom/nrparms.c
@@ -10,21 +10,9 @@
 #include <sys/ioctl.h>
 
 #include <sys/socket.h>
-#ifdef HAVE_NETAX25_AX25_H
 #include <netax25/ax25.h>
-#else
-#include <netax25/kernel_ax25.h>
-#endif
-#ifdef HAVE_NETROM_NETROM_H
 #include <netrom/netrom.h>
-#else
-#include <netax25/kernel_netrom.h>
-#endif
-#ifdef HAVE_NETROSE_ROSE_H
 #include <netrose/rose.h>
-#else 
-#include <netax25/kernel_rose.h>
-#endif
 
 #include <netax25/axlib.h>
 #include <netax25/axconfig.h>
-- 
cgit v1.2.3