compat: remove unnecessary ifdefs and empty file

The Makefile only builds the needed compat-2.6.XX.c files and not all,
so the ifdefs are not needed.

compat-2.6.30.c did not had any real content so remove it.

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>

diff --git a/compat/Makefile b/compat/Makefile
index c15a8f350539380d4ff69fbef0c4810cde7185df..46049af187febc6c4d1b8bde676c73971cee9aef 100644 (file)
--- a/compat/Makefile
+++ b/compat/Makefile
@@ -22,7 +22,6 @@ compat-$(CONFIG_COMPAT_KERNEL_26) += compat-2.6.26.o
 compat-$(CONFIG_COMPAT_KERNEL_27) += compat-2.6.27.o
 compat-$(CONFIG_COMPAT_KERNEL_28) += compat-2.6.28.o
 compat-$(CONFIG_COMPAT_KERNEL_29) += compat-2.6.29.o
-compat-$(CONFIG_COMPAT_KERNEL_30) += compat-2.6.30.o
 compat-$(CONFIG_COMPAT_KERNEL_32) += compat-2.6.32.o
 compat-$(CONFIG_COMPAT_KERNEL_33) += compat-2.6.33.o
 compat-$(CONFIG_COMPAT_KERNEL_35) += compat-2.6.35.o

diff --git a/compat/compat-2.6.14.c b/compat/compat-2.6.14.c
index e0af181f4529deba82fe982a5dbd11dff78066fb..3de847d9d057439d0ac41ea879d406b2c8595411 100644 (file)
--- a/compat/compat-2.6.14.c
+++ b/compat/compat-2.6.14.c
@@ -10,9 +10,5 @@
 
 #include <net/compat.h>
 
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,14))
-
 /* 2.6.14 compat code goes here */
 
-#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(2,6,14) */
-

diff --git a/compat/compat-2.6.18.c b/compat/compat-2.6.18.c
index c7fb2e417d82cd6b4abbd0bf79d2992d4d44b8b5..c7961eeba92b137ce5838a2038166558675c5159 100644 (file)
--- a/compat/compat-2.6.18.c
+++ b/compat/compat-2.6.18.c
@@ -10,9 +10,5 @@
 
 #include <net/compat.h>
 
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,18))
-
 /* 2.6.18 compat code goes here */
 
-#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(2,6,18) */
-

diff --git a/compat/compat-2.6.19.c b/compat/compat-2.6.19.c
index fc75b64dde4dabf76a9a2a052d5b2ac9175d4351..60c34045809877318ec07bc53467c330b47f5ff8 100644 (file)
--- a/compat/compat-2.6.19.c
+++ b/compat/compat-2.6.19.c
@@ -10,9 +10,5 @@
 
 #include <net/compat.h>
 
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19))
-
 /* 2.6.19 compat code goes here */
 
-#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19) */
-

diff --git a/compat/compat-2.6.21.c b/compat/compat-2.6.21.c
index e2737fb2533a8fadbefc164b5913ae2fecff5fe2..7cf886194bd3734ce3b37244edb479e65bd249fc 100644 (file)
--- a/compat/compat-2.6.21.c
+++ b/compat/compat-2.6.21.c
@@ -10,9 +10,5 @@
 
 #include <net/compat.h>
 
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,21))
-
 /* 2.6.21 compat code goes here */
 
-#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(2,6,21) */
-

diff --git a/compat/compat-2.6.22.c b/compat/compat-2.6.22.c
index b1ff1f3b3e5b99f1e64d8dda280905d83a6fcf28..d4df7b7d8d51f4abe1722c46d6b90d1a87a99c54 100644 (file)
--- a/compat/compat-2.6.22.c
+++ b/compat/compat-2.6.22.c
@@ -10,9 +10,5 @@
 
 #include <net/compat.h>
 
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,22))
-
 /* 2.6.22 compat code goes here */
 
-#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(2,6,22) */
-

diff --git a/compat/compat-2.6.23.c b/compat/compat-2.6.23.c
index 136d949948e9dcf0c337c27a5101364ef65747d7..87f2a8c84023811e8c17b9cc8a3a18b30aadb804 100644 (file)
--- a/compat/compat-2.6.23.c
+++ b/compat/compat-2.6.23.c
@@ -10,9 +10,6 @@
 
 #include <net/compat.h>
 
-/* All things not in 2.6.22 */
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,23))
-
 /* On net/core/dev.c as of 2.6.24 */
 int __dev_addr_delete(struct dev_addr_list **list, int *count,
                       void *addr, int alen, int glbl)
@@ -245,5 +242,3 @@ int pci_try_set_mwi(struct pci_dev *dev)
 EXPORT_SYMBOL(pci_try_set_mwi);
 #endif
 
-#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(2,6,23)) */
-

diff --git a/compat/compat-2.6.24.c b/compat/compat-2.6.24.c
index 31a9212f84e12b32aa2b58d856617d64f6cc99f9..a5c9c972cdccb5f26ec5da825df75655428e69eb 100644 (file)
--- a/compat/compat-2.6.24.c
+++ b/compat/compat-2.6.24.c
@@ -9,10 +9,6 @@
  */
 
 #include <net/compat.h>
-
-/* All things not in 2.6.22 and 2.6.23 */
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24))
-
 #include <net/arp.h>
 
 /*
@@ -181,5 +177,3 @@ int compat_is_pcie(struct pci_dev *pdev)
 }
 EXPORT_SYMBOL(compat_is_pcie);
 
-#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24) */
-

diff --git a/compat/compat-2.6.25.c b/compat/compat-2.6.25.c
index 7546821031d66a845099cf66db7542866a4a3e1f..7cb996b60c0dde830e1930baac6c46866150d57e 100644 (file)
--- a/compat/compat-2.6.25.c
+++ b/compat/compat-2.6.25.c
@@ -8,9 +8,6 @@
  * Compatibility file for Linux wireless for kernels 2.6.25.
  */
 
-/* All things not in 2.6.22, 2.6.23 and 2.6.24 */
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,25))
-
 #include <linux/miscdevice.h>
 
 /**
@@ -98,5 +95,3 @@ define_strict_strtox(l, long)
 EXPORT_SYMBOL(strict_strtoul);
 EXPORT_SYMBOL(strict_strtol);
 
-#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(2,6,25) */
-

diff --git a/compat/compat-2.6.26.c b/compat/compat-2.6.26.c
index b9bf9e768956baf844ae59c4a435e96ddc1d7226..f4715067511f0db532f3c42736b944d1b0f7bfa2 100644 (file)
--- a/compat/compat-2.6.26.c
+++ b/compat/compat-2.6.26.c
@@ -16,10 +16,6 @@
 
 #include <net/compat.h>
 
-/* All things not in 2.6.25 */
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,26))
-
-
 /* 2.6.24 does not have the struct kobject with a name */
 #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,25))
 
@@ -89,5 +85,3 @@ int dev_set_name(struct device *dev, const char *fmt, ...)
 }
 EXPORT_SYMBOL_GPL(dev_set_name);
 
-#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(2,6,26) */
-

diff --git a/compat/compat-2.6.27.c b/compat/compat-2.6.27.c
index b78d4653891fe053224a7c6d0f8e13f68aaeac87..25bee281ac2eccc426bf82de372e67bbbc376d3d 100644 (file)
--- a/compat/compat-2.6.27.c
+++ b/compat/compat-2.6.27.c
@@ -9,9 +9,6 @@
  */
 
 #include <linux/compat.h>
-
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,27))
-
 #include <linux/pci.h>
 #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,24))
 #include <linux/mmc/sdio.h>
@@ -240,5 +237,3 @@ void debugfs_remove_recursive(struct dentry *dentry)
 EXPORT_SYMBOL_GPL(debugfs_remove_recursive);
 #endif /* CONFIG_DEBUG_FS */
 
-#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(2,6,27) */
-

diff --git a/compat/compat-2.6.28.c b/compat/compat-2.6.28.c
index c11ba409b5b385b84733961114c494067b3758dd..7a834d2746b9bce879d44e6ab81d916f08895c96 100644 (file)
--- a/compat/compat-2.6.28.c
+++ b/compat/compat-2.6.28.c
@@ -9,9 +9,6 @@
  */
 
 #include <linux/compat.h>
-
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,28))
-
 #include <linux/usb.h>
 #include <linux/tty.h>
 #include <asm/poll.h>
@@ -442,4 +439,3 @@ int n_tty_ioctl_helper(struct tty_struct *tty, struct file *file,
 }
 EXPORT_SYMBOL(n_tty_ioctl_helper);
 
-#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(2,6,28) */

diff --git a/compat/compat-2.6.29.c b/compat/compat-2.6.29.c
index cded3cc01a10441e7e531f9a7fe8f72931c6aaaa..14f5e902b07ecd4d41fe2c0356413687132c59ed 100644 (file)
--- a/compat/compat-2.6.29.c
+++ b/compat/compat-2.6.29.c
@@ -9,9 +9,6 @@
  */
 
 #include <linux/compat.h>
-
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,29))
-
 #include <linux/usb.h>
 #include <linux/etherdevice.h>
 
@@ -167,6 +164,3 @@ int init_dummy_netdev(struct net_device *dev)
 EXPORT_SYMBOL_GPL(init_dummy_netdev);
 /* Source: net/core/dev.c */
 
-
-#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(2,6,29) */
-

diff --git a/compat/compat-2.6.30.c b/compat/compat-2.6.30.c
deleted file mode 100644 (file)
index f821918..0000000
--- a/compat/compat-2.6.30.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * Copyright 2007      Luis R. Rodriguez <mcgrof@winlab.rutgers.edu>
- *
- * 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
- * published by the Free Software Foundation.
- *
- * Compatibility file for Linux wireless for kernels 2.6.30.
- */
-
-#include <linux/compat.h>
-
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,30))
-
-/* 2.6.30 compat code goes here */
-
-#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(2,6,30) */
-

diff --git a/compat/compat-2.6.32.c b/compat/compat-2.6.32.c
index 22c2c197f282f58e75da9c98efbbb274d90e07e0..013150d098fe610309e0c8bc98f485fea78d357a 100644 (file)
--- a/compat/compat-2.6.32.c
+++ b/compat/compat-2.6.32.c
@@ -9,9 +9,6 @@
  */
 
 #include <linux/compat.h>
-
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,32))
-
 #include <linux/netdevice.h>
 
 int __dev_addr_add(struct dev_addr_list **list, int *count,
@@ -120,5 +117,3 @@ void __dev_addr_unsync(struct dev_addr_list **to, int *to_count,
 }
 EXPORT_SYMBOL_GPL(__dev_addr_unsync);
 
-#endif /* (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,32)) */
-

diff --git a/compat/compat-2.6.33.c b/compat/compat-2.6.33.c
index 055082e76c954a23893a651a8ab66c086238b7b7..c8e568dfa10c94c60c876f379f4fd2a8cc9bc7fd 100644 (file)
--- a/compat/compat-2.6.33.c
+++ b/compat/compat-2.6.33.c
@@ -9,9 +9,6 @@
  */
 
 #include <linux/compat.h>
-
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,33))
-
 #include <linux/autoconf.h>
 
 #if defined(CONFIG_PCCARD) || defined(CONFIG_PCCARD_MODULE)
@@ -133,5 +130,3 @@ EXPORT_SYMBOL(pcmcia_loop_tuple);
 
 #endif /* CONFIG_PCCARD */
 
-#endif /* (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,33)) */
-

diff --git a/compat/compat-2.6.35.c b/compat/compat-2.6.35.c
index abb08c709905bc6dd55c3c7a94a3581dd94b69db..44a15d63cf9d57caf87ac80593b491e591b718f5 100644 (file)
--- a/compat/compat-2.6.35.c
+++ b/compat/compat-2.6.35.c
@@ -9,8 +9,6 @@
  */
 
 #include <linux/compat.h>
-
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,35)
 #include <linux/ctype.h>
 
 /**
@@ -48,4 +46,3 @@ loff_t noop_llseek(struct file *file, loff_t offset, int origin)
 }
 EXPORT_SYMBOL(noop_llseek);
 
-#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(2,6,35) */

diff --git a/compat/compat-2.6.36.c b/compat/compat-2.6.36.c
index bd9335d673a9a9a9f3ab0647ca97c6f15c26fe23..5faefb4b2376fb7087bfccbda1949bd0ffb70b70 100644 (file)
--- a/compat/compat-2.6.36.c
+++ b/compat/compat-2.6.36.c
@@ -9,9 +9,6 @@
  */
 
 #include <linux/compat.h>
-
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,36)
-
 #include <linux/usb.h>
 
 #ifdef CONFIG_COMPAT_USB_URB_THREAD_FIX
@@ -97,4 +94,3 @@ void compat_usb_scuttle_anchored_urbs(struct usb_anchor *anchor)
 EXPORT_SYMBOL_GPL(compat_usb_scuttle_anchored_urbs);
 #endif /* CONFIG_COMPAT_USB_URB_THREAD_FIX */
 
-#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(2,6,36) */

diff --git a/compat/compat-2.6.37.c b/compat/compat-2.6.37.c
index d949a929b9125d5bcbe41f20b2c3667972c21c2d..81f466f3b58a23f143d63ecf705556437f04d60d 100644 (file)
--- a/compat/compat-2.6.37.c
+++ b/compat/compat-2.6.37.c
@@ -9,9 +9,6 @@
  */
 
 #include <linux/compat.h>
-
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,37)
-
 #include <linux/netdevice.h>
 #include <net/sock.h>
 #include <linux/nsproxy.h>
@@ -155,4 +152,3 @@ int compat_genl_unregister_family(struct genl_family *family)
 }
 EXPORT_SYMBOL(compat_genl_unregister_family);
 
-#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(2,6,37) */