diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-05-20 10:47:14 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-05-21 08:14:18 +0200 |
| commit | 8cac7b354a20742d515d6f649eea32e55a7086b2 (patch) | |
| tree | 4e58b23095764c101a7eca5484f9b20c49ba5a7e | |
| parent | f900d81cb960097524be3705b050b60aa5959a83 (diff) | |
staging: kpc2000: move the i2c driver out of its subdirectory
There is no need for a subdirectory for just a single .c file. So move
it out of kpc_i2c/ and rename it to the module name that we want the
file to build to, saving one more linking stage.
Cc: Matt Sickler <Matt.Sickler@daktronics.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/staging/kpc2000/Makefile | 2 | ||||
| -rw-r--r-- | drivers/staging/kpc2000/kpc2000_i2c.c (renamed from drivers/staging/kpc2000/kpc_i2c/i2c_driver.c) | 2 | ||||
| -rw-r--r-- | drivers/staging/kpc2000/kpc_i2c/Makefile | 4 |
3 files changed, 2 insertions, 6 deletions
diff --git a/drivers/staging/kpc2000/Makefile b/drivers/staging/kpc2000/Makefile index 99b1699a8b70..d15ed49807d5 100644 --- a/drivers/staging/kpc2000/Makefile +++ b/drivers/staging/kpc2000/Makefile @@ -1,6 +1,6 @@ # SPDX-License-Identifier: GPL-2.0 obj-$(CONFIG_KPC2000) += kpc2000/ -obj-$(CONFIG_KPC2000_I2C) += kpc_i2c/ +obj-$(CONFIG_KPC2000_I2C) += kpc2000_i2c.o obj-$(CONFIG_KPC2000_SPI) += kpc2000_spi.o obj-$(CONFIG_KPC2000_DMA) += kpc_dma/ diff --git a/drivers/staging/kpc2000/kpc_i2c/i2c_driver.c b/drivers/staging/kpc2000/kpc2000_i2c.c index 986148c72185..42061318d2d4 100644 --- a/drivers/staging/kpc2000/kpc_i2c/i2c_driver.c +++ b/drivers/staging/kpc2000/kpc2000_i2c.c @@ -28,7 +28,7 @@ #include <linux/rwsem.h> #include <linux/delay.h> #include <linux/i2c.h> -#include "../kpc.h" +#include "kpc.h" MODULE_LICENSE("GPL"); MODULE_AUTHOR("Matt.Sickler@Daktronics.com"); diff --git a/drivers/staging/kpc2000/kpc_i2c/Makefile b/drivers/staging/kpc2000/kpc_i2c/Makefile deleted file mode 100644 index 63a6ce4b8e03..000000000000 --- a/drivers/staging/kpc2000/kpc_i2c/Makefile +++ /dev/null @@ -1,4 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0 - -obj-m := kpc2000_i2c.o -kpc2000_i2c-objs := i2c_driver.o |