2015-11-05 23:40:52

by Andrew Duggan

Subject: [PATCH 14/26] Input: synaptics-rmi4: Clean up Makefile

The Makefile contained commands for a different build environment. These
should be removed and are not needed in the upstream kernel.

Signed-off-by: Andrew Duggan <[email protected]>
---
drivers/input/rmi4/Makefile | 16 ----------------
1 file changed, 16 deletions(-)

diff --git a/drivers/input/rmi4/Makefile b/drivers/input/rmi4/Makefile
index 63bc595..37b6789 100644
--- a/drivers/input/rmi4/Makefile
+++ b/drivers/input/rmi4/Makefile
@@ -8,19 +8,3 @@ rmi_core-$(CONFIG_RMI4_F11) += rmi_f11.o
obj-$(CONFIG_RMI4_I2C) += rmi_i2c.o

ccflags-$(CONFIG_RMI4_DEBUG) += -DDEBUG
-
-ifeq ($(KERNELRELEASE),)
-
-# KERNELDIR ?= /home/<AndroidKernelDirectory>
-PWD := $(shell pwd)
-
-.PHONY: build clean
-
-build:
- $(MAKE) -C $(KERNELDIR) M=$(PWD) modules
-
-clean:
- rm -rf *.o *~ core .depend .*.cmd *.ko *.mod.c
-
-endif
-
--
2.1.4

2015-11-09 13:12:40

by Linus Walleij

Subject: Re: [PATCH 14/26] Input: synaptics-rmi4: Clean up Makefile

On Fri, Nov 6, 2015 at 12:40 AM, Andrew Duggan <[email protected]> wrote:

> The Makefile contained commands for a different build environment. These
> should be removed and are not needed in the upstream kernel.
>
> Signed-off-by: Andrew Duggan <[email protected]>

Acked-by: Linus Walleij <[email protected]>

Squash into the offending commit.

Yours,
Linus Walleij