diff options
| -rw-r--r-- | MAINTAINERS | 2 | ||||
| -rw-r--r-- | drivers/staging/Kconfig | 3 | ||||
| -rw-r--r-- | drivers/staging/Makefile | 2 | ||||
| -rw-r--r-- | drivers/staging/vme/Makefile | 2 | ||||
| -rw-r--r-- | drivers/staging/vme_user/Kconfig (renamed from drivers/staging/vme/devices/Kconfig) | 0 | ||||
| -rw-r--r-- | drivers/staging/vme_user/Makefile (renamed from drivers/staging/vme/devices/Makefile) | 0 | ||||
| -rw-r--r-- | drivers/staging/vme_user/vme_user.c (renamed from drivers/staging/vme/devices/vme_user.c) | 0 | ||||
| -rw-r--r-- | drivers/staging/vme_user/vme_user.h (renamed from drivers/staging/vme/devices/vme_user.h) | 0 |
8 files changed, 3 insertions, 6 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index a62da6d0f943..0a635f2ae5b9 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -21002,7 +21002,7 @@ L: linux-kernel@vger.kernel.org S: Maintained T: git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git F: Documentation/driver-api/vme.rst -F: drivers/staging/vme/ +F: drivers/staging/vme_user/ F: drivers/vme/ F: include/linux/vme* diff --git a/drivers/staging/Kconfig b/drivers/staging/Kconfig index 42dcb9b7cb60..0a993c47273e 100644 --- a/drivers/staging/Kconfig +++ b/drivers/staging/Kconfig @@ -84,7 +84,6 @@ source "drivers/staging/fieldbus/Kconfig" source "drivers/staging/qlge/Kconfig" - -source "drivers/staging/vme/devices/Kconfig" +source "drivers/staging/vme_user/Kconfig" endif # STAGING diff --git a/drivers/staging/Makefile b/drivers/staging/Makefile index a17a2aeaceba..2800ab9b2d1d 100644 --- a/drivers/staging/Makefile +++ b/drivers/staging/Makefile @@ -14,7 +14,7 @@ obj-$(CONFIG_OCTEON_ETHERNET) += octeon/ obj-$(CONFIG_OCTEON_USB) += octeon-usb/ obj-$(CONFIG_VT6655) += vt6655/ obj-$(CONFIG_VT6656) += vt6656/ -obj-$(CONFIG_VME_BUS) += vme/ +obj-$(CONFIG_VME_BUS) += vme_user/ obj-$(CONFIG_IIO) += iio/ obj-$(CONFIG_FB_SM750) += sm750fb/ obj-$(CONFIG_USB_EMXX) += emxx_udc/ diff --git a/drivers/staging/vme/Makefile b/drivers/staging/vme/Makefile deleted file mode 100644 index cf2f686ccffe..000000000000 --- a/drivers/staging/vme/Makefile +++ /dev/null @@ -1,2 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0 -obj-y += devices/ diff --git a/drivers/staging/vme/devices/Kconfig b/drivers/staging/vme_user/Kconfig index e8b4461bf27f..e8b4461bf27f 100644 --- a/drivers/staging/vme/devices/Kconfig +++ b/drivers/staging/vme_user/Kconfig diff --git a/drivers/staging/vme/devices/Makefile b/drivers/staging/vme_user/Makefile index 5380115139b0..5380115139b0 100644 --- a/drivers/staging/vme/devices/Makefile +++ b/drivers/staging/vme_user/Makefile diff --git a/drivers/staging/vme/devices/vme_user.c b/drivers/staging/vme_user/vme_user.c index 859af797630c..859af797630c 100644 --- a/drivers/staging/vme/devices/vme_user.c +++ b/drivers/staging/vme_user/vme_user.c diff --git a/drivers/staging/vme/devices/vme_user.h b/drivers/staging/vme_user/vme_user.h index 19ecb05781cc..19ecb05781cc 100644 --- a/drivers/staging/vme/devices/vme_user.h +++ b/drivers/staging/vme_user/vme_user.h |