diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2009-12-18 19:04:54 (GMT) |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-03-04 00:42:31 (GMT) |
| commit | 293c0db0dd2a7f1a8074645faa9d3a0294623002 (patch) | |
| tree | d1402828c10a732b599243a94c785209bbe952a3 /drivers/staging/dt3155 | |
| parent | bad9f950c011c50e8302b48244229c0250add9b4 (diff) | |
| download | linux-fsl-qoriq-293c0db0dd2a7f1a8074645faa9d3a0294623002.tar.xz | |
Staging: dt3155: add it to the build
Now it will build with the rest of the kernel
Cc: Scott Smedley <ss@aao.gov.au>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/dt3155')
| -rw-r--r-- | drivers/staging/dt3155/Kconfig | 4 | ||||
| -rw-r--r-- | drivers/staging/dt3155/Makefile | 33 |
2 files changed, 10 insertions, 27 deletions
diff --git a/drivers/staging/dt3155/Kconfig b/drivers/staging/dt3155/Kconfig new file mode 100644 index 0000000..4a3293c --- /dev/null +++ b/drivers/staging/dt3155/Kconfig @@ -0,0 +1,4 @@ +config DT3155 + tristate "DT3155 Digitizer support" + depends on PCI + diff --git a/drivers/staging/dt3155/Makefile b/drivers/staging/dt3155/Makefile index 1717ffb..136f21f 100644 --- a/drivers/staging/dt3155/Makefile +++ b/drivers/staging/dt3155/Makefile @@ -1,27 +1,6 @@ - -ifeq ($(shell [[ `uname -r | cut -f 1,2 -d\.` < 2.6 ]] && echo pre2.6),pre2.6) -# system with a pre 2.6 kernel _don't_ use kbuild. -all: - $(MAKE) -f Makefile.pre-2.6 - -clean: - rm -f *.o - -else -# systems with a 2.6 or later kernel use kbuild. -ifneq ($(KERNELRELEASE),) -obj-m := dt3155.o -dt3155-objs := dt3155_drv.o dt3155_isr.o dt3155_io.o allocator.o - -else -KDIR := /lib/modules/$(shell uname -r)/build -PWD := $(shell pwd) - -all: - $(MAKE) -C $(KDIR) M=$(PWD) modules - -clean: - rm -rf *.o *.mod *.mod.c *.ko .dt3155* .allocator.o.cmd .tmp_versions - -endif -endif +obj-$(CONFIG_DT3155) += dt3155.o +dt3155-objs := \ + dt3155_drv.o \ + dt3155_isr.o \ + dt3155_io.o \ + allocator.o |