aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--package/broadcom-diag/src/diag.h5
-rw-r--r--target/Config.in3
-rw-r--r--tools/Makefile2
3 files changed, 1 insertions, 9 deletions
diff --git a/package/broadcom-diag/src/diag.h b/package/broadcom-diag/src/diag.h
index eae5872e75..698c376519 100644
--- a/package/broadcom-diag/src/diag.h
+++ b/package/broadcom-diag/src/diag.h
@@ -95,13 +95,8 @@ static struct platform_t platform;
static void register_buttons(struct button_t *b);
static void unregister_buttons(struct button_t *b);
-#ifndef LINUX_2_4
static void hotplug_button(struct work_struct *work);
static irqreturn_t button_handler(int irq, void *dev_id);
-#else
-static void hotplug_button(struct event_t *event);
-static irqreturn_t button_handler(int irq, void *dev_id, struct pt_regs *regs);
-#endif
/* leds */
diff --git a/target/Config.in b/target/Config.in
index 21cc3a476f..6e45b640df 100644
--- a/target/Config.in
+++ b/target/Config.in
@@ -2,9 +2,6 @@ source "tmp/.config-target.in"
# Kernel/Hardware features
-config LINUX_2_4
- bool
-
config LINUX_2_6
bool
diff --git a/tools/Makefile b/tools/Makefile
index ac4d62c54f..5c6a499a6e 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -19,7 +19,7 @@ tools-y += sstrip ipkg-utils genext2fs libuuid mtd-utils mkimage
tools-y += firmware-utils patch-cmdline quilt yaffs2
tools-$(CONFIG_TARGET_orion) += wrt350nv2-builder upslug2
tools-$(CONFIG_TARGET_x86) += qemu
-ifneq ($(CONFIG_LINUX_2_4)$(CONFIG_LINUX_2_6_25)$(CONFIG_TARGET_ar71xx),)
+ifneq ($(CONFIG_LINUX_2_6_25)$(CONFIG_TARGET_ar71xx),)
tools-y += squashfs lzma-old
else
tools-y += squashfs4 lzma