From: Eli Billauer Date: Tue, 9 Sep 2014 06:36:04 +0000 (+0300) Subject: xillybus: Move out of staging X-Git-Tag: v3.18-rc1~130^2~211 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=7051924f;p=karo-tx-linux.git xillybus: Move out of staging This driver has been functional and stable throughout the year it has spent in the staging area. It has been patched for minor bugs, coding style issues and improvements during this period. This is the second submission of this move-out, after making several style improvements, as suggested by Dan Carpenter. Signed-off-by: Eli Billauer Signed-off-by: Greg Kroah-Hartman --- diff --git a/Documentation/devicetree/bindings/staging/xillybus.txt b/Documentation/devicetree/bindings/xillybus/xillybus.txt similarity index 100% rename from Documentation/devicetree/bindings/staging/xillybus.txt rename to Documentation/devicetree/bindings/xillybus/xillybus.txt diff --git a/drivers/staging/xillybus/README b/Documentation/xillybus.txt similarity index 100% rename from drivers/staging/xillybus/README rename to Documentation/xillybus.txt diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig index 6e9f74a5c095..efefd12a0f7b 100644 --- a/drivers/char/Kconfig +++ b/drivers/char/Kconfig @@ -600,5 +600,7 @@ config TILE_SROM device appear much like a simple EEPROM, and knows how to partition a single ROM for multiple purposes. +source "drivers/char/xillybus/Kconfig" + endmenu diff --git a/drivers/char/Makefile b/drivers/char/Makefile index a324f9303e36..d06cde26031b 100644 --- a/drivers/char/Makefile +++ b/drivers/char/Makefile @@ -61,3 +61,4 @@ obj-$(CONFIG_JS_RTC) += js-rtc.o js-rtc-y = rtc.o obj-$(CONFIG_TILE_SROM) += tile-srom.o +obj-$(CONFIG_XILLYBUS) += xillybus/ diff --git a/drivers/staging/xillybus/Kconfig b/drivers/char/xillybus/Kconfig similarity index 100% rename from drivers/staging/xillybus/Kconfig rename to drivers/char/xillybus/Kconfig diff --git a/drivers/staging/xillybus/Makefile b/drivers/char/xillybus/Makefile similarity index 100% rename from drivers/staging/xillybus/Makefile rename to drivers/char/xillybus/Makefile diff --git a/drivers/staging/xillybus/xillybus.h b/drivers/char/xillybus/xillybus.h similarity index 100% rename from drivers/staging/xillybus/xillybus.h rename to drivers/char/xillybus/xillybus.h diff --git a/drivers/staging/xillybus/xillybus_core.c b/drivers/char/xillybus/xillybus_core.c similarity index 100% rename from drivers/staging/xillybus/xillybus_core.c rename to drivers/char/xillybus/xillybus_core.c diff --git a/drivers/staging/xillybus/xillybus_of.c b/drivers/char/xillybus/xillybus_of.c similarity index 100% rename from drivers/staging/xillybus/xillybus_of.c rename to drivers/char/xillybus/xillybus_of.c diff --git a/drivers/staging/xillybus/xillybus_pcie.c b/drivers/char/xillybus/xillybus_pcie.c similarity index 100% rename from drivers/staging/xillybus/xillybus_pcie.c rename to drivers/char/xillybus/xillybus_pcie.c diff --git a/drivers/staging/Kconfig b/drivers/staging/Kconfig index 6e2d6fd85b89..e3c1a1fa7b4d 100644 --- a/drivers/staging/Kconfig +++ b/drivers/staging/Kconfig @@ -104,8 +104,6 @@ source "drivers/staging/mt29f_spinand/Kconfig" source "drivers/staging/lustre/Kconfig" -source "drivers/staging/xillybus/Kconfig" - source "drivers/staging/dgnc/Kconfig" source "drivers/staging/dgap/Kconfig" diff --git a/drivers/staging/Makefile b/drivers/staging/Makefile index 74c679e17e77..8e8333f6dd76 100644 --- a/drivers/staging/Makefile +++ b/drivers/staging/Makefile @@ -43,7 +43,6 @@ obj-$(CONFIG_DRM_IMX) += imx-drm/ obj-$(CONFIG_FIREWIRE_SERIAL) += fwserial/ obj-$(CONFIG_GOLDFISH) += goldfish/ obj-$(CONFIG_LUSTRE_FS) += lustre/ -obj-$(CONFIG_XILLYBUS) += xillybus/ obj-$(CONFIG_DGNC) += dgnc/ obj-$(CONFIG_DGAP) += dgap/ obj-$(CONFIG_MTD_SPINAND_MT29F) += mt29f_spinand/ diff --git a/drivers/staging/xillybus/TODO b/drivers/staging/xillybus/TODO deleted file mode 100644 index 95cfe2f62fcd..000000000000 --- a/drivers/staging/xillybus/TODO +++ /dev/null @@ -1,5 +0,0 @@ -TODO: -- have the driver reviewed - -Please send any patches and/or comments to Eli Billauer, -.