summaryrefslogtreecommitdiff
path: root/wctdm24xxp
diff options
context:
space:
mode:
Diffstat (limited to 'wctdm24xxp')
-rw-r--r--wctdm24xxp/Kbuild (renamed from wctdm24xxp/Makefile.kernel26)4
-rw-r--r--wctdm24xxp/Makefile26
2 files changed, 8 insertions, 22 deletions
diff --git a/wctdm24xxp/Makefile.kernel26 b/wctdm24xxp/Kbuild
index 43b641c..24658b9 100644
--- a/wctdm24xxp/Makefile.kernel26
+++ b/wctdm24xxp/Kbuild
@@ -2,6 +2,10 @@ obj-m += wctdm24xxp.o
EXTRA_CFLAGS := -I$(src)/.. -Wno-undef
+ifeq ($(HOTPLUG_FIRMWARE),yes)
+ EXTRA_CFLAGS += -DHOTPLUG_FIRMWARE
+endif
+
wctdm24xxp-objs := base.o GpakCust.o GpakApi.o
ifneq ($(HOTPLUG_FIRMWARE),yes)
diff --git a/wctdm24xxp/Makefile b/wctdm24xxp/Makefile
index 9927928..442555a 100644
--- a/wctdm24xxp/Makefile
+++ b/wctdm24xxp/Makefile
@@ -1,22 +1,4 @@
-ifneq ($(KBUILD_EXTMOD),)
-
-include $(src)/Makefile.kernel26
-
-else
-
-all: wctdm24xxp.o
-
-%.o: %.c
- $(CC) $(KFLAGS) -o $@ -c $<
-
-base.o: ../zaptel.h GpakCust.h ../wctdm.h
-
-GpakCust.o: GpakCust.h
-
-wctdm24xxp.o: base.o GpakCust.o GpakApi.o
- $(LD) -r -o $@ $^
-
-clean:
- rm -f *.o
-
-endif
+# We only get here on kernels 2.6.0-2.6.8 .
+# For newer kernels, Kbuild will be included directly by the kernel
+# build system.
+-include $(src)/Kbuild