summaryrefslogtreecommitdiff
path: root/wcte12xp
diff options
context:
space:
mode:
Diffstat (limited to 'wcte12xp')
-rw-r--r--wcte12xp/Kbuild (renamed from wcte12xp/Makefile.kernel26)4
-rw-r--r--wcte12xp/Makefile26
2 files changed, 8 insertions, 22 deletions
diff --git a/wcte12xp/Makefile.kernel26 b/wcte12xp/Kbuild
index c41e8f1..15530ce 100644
--- a/wcte12xp/Makefile.kernel26
+++ b/wcte12xp/Kbuild
@@ -2,6 +2,10 @@ obj-m += wcte12xp.o
EXTRA_CFLAGS := -I$(src)/.. -Wno-undef
+ifeq ($(HOTPLUG_FIRMWARE),yes)
+ EXTRA_CFLAGS += -DHOTPLUG_FIRMWARE
+endif
+
wcte12xp-objs := base.o vpmadt032.o GpakApi.o
ifneq ($(HOTPLUG_FIRMWARE),yes)
diff --git a/wcte12xp/Makefile b/wcte12xp/Makefile
index 026252d..442555a 100644
--- a/wcte12xp/Makefile
+++ b/wcte12xp/Makefile
@@ -1,22 +1,4 @@
-ifneq ($(KBUILD_EXTMOD),)
-
-include $(obj)/Makefile.kernel26
-
-else
-
-all: wcte12xp.o
-
-%.o: %.c
- $(CC) $(KFLAGS) -o $@ -c $<
-
-base.o: ../zaptel.h ../wct4xxp/wct4xxp.h vpmadt032.h
-
-vpmadt032.o: vpmadt032.h
-
-wcte12xp.o: base.o vpmadt032.o GpakApi.o
- $(LD) -r -o $@ $^
-
-clean:
- rm -rf *.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