diff options
| -rw-r--r-- | Documentation/devicetree/bindings/xillybus/xillybus.txt (renamed from Documentation/devicetree/bindings/staging/xillybus.txt) | 0 | ||||
| -rw-r--r-- | Documentation/xillybus.txt (renamed from drivers/staging/xillybus/README) | 0 | ||||
| -rw-r--r-- | drivers/char/Kconfig | 2 | ||||
| -rw-r--r-- | drivers/char/Makefile | 1 | ||||
| -rw-r--r-- | drivers/char/xillybus/Kconfig (renamed from drivers/staging/xillybus/Kconfig) | 0 | ||||
| -rw-r--r-- | drivers/char/xillybus/Makefile (renamed from drivers/staging/xillybus/Makefile) | 0 | ||||
| -rw-r--r-- | drivers/char/xillybus/xillybus.h (renamed from drivers/staging/xillybus/xillybus.h) | 0 | ||||
| -rw-r--r-- | drivers/char/xillybus/xillybus_core.c (renamed from drivers/staging/xillybus/xillybus_core.c) | 0 | ||||
| -rw-r--r-- | drivers/char/xillybus/xillybus_of.c (renamed from drivers/staging/xillybus/xillybus_of.c) | 0 | ||||
| -rw-r--r-- | drivers/char/xillybus/xillybus_pcie.c (renamed from drivers/staging/xillybus/xillybus_pcie.c) | 0 | ||||
| -rw-r--r-- | drivers/staging/Kconfig | 2 | ||||
| -rw-r--r-- | drivers/staging/Makefile | 1 | ||||
| -rw-r--r-- | drivers/staging/xillybus/TODO | 5 |
13 files changed, 3 insertions, 8 deletions
diff --git a/Documentation/devicetree/bindings/staging/xillybus.txt b/Documentation/devicetree/bindings/xillybus/xillybus.txt index 9e316dc2e40f..9e316dc2e40f 100644 --- a/Documentation/devicetree/bindings/staging/xillybus.txt +++ b/Documentation/devicetree/bindings/xillybus/xillybus.txt diff --git a/drivers/staging/xillybus/README b/Documentation/xillybus.txt index 81d111b4dc28..81d111b4dc28 100644 --- a/drivers/staging/xillybus/README +++ b/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 index b53bdf12da0d..b53bdf12da0d 100644 --- a/drivers/staging/xillybus/Kconfig +++ b/drivers/char/xillybus/Kconfig diff --git a/drivers/staging/xillybus/Makefile b/drivers/char/xillybus/Makefile index b68b7ebfd381..b68b7ebfd381 100644 --- a/drivers/staging/xillybus/Makefile +++ b/drivers/char/xillybus/Makefile diff --git a/drivers/staging/xillybus/xillybus.h b/drivers/char/xillybus/xillybus.h index b9a9eb6d4f72..b9a9eb6d4f72 100644 --- a/drivers/staging/xillybus/xillybus.h +++ b/drivers/char/xillybus/xillybus.h diff --git a/drivers/staging/xillybus/xillybus_core.c b/drivers/char/xillybus/xillybus_core.c index b827fa095f1b..b827fa095f1b 100644 --- a/drivers/staging/xillybus/xillybus_core.c +++ b/drivers/char/xillybus/xillybus_core.c diff --git a/drivers/staging/xillybus/xillybus_of.c b/drivers/char/xillybus/xillybus_of.c index 1ca0c7a4f1be..1ca0c7a4f1be 100644 --- a/drivers/staging/xillybus/xillybus_of.c +++ b/drivers/char/xillybus/xillybus_of.c diff --git a/drivers/staging/xillybus/xillybus_pcie.c b/drivers/char/xillybus/xillybus_pcie.c index d8266bc2ae35..d8266bc2ae35 100644 --- a/drivers/staging/xillybus/xillybus_pcie.c +++ b/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, -<eli.billauer@gmail.com>. |