[media] altera-stapl: it is time to move out from staging
authorIgor M. Liplianin <liplianin@netup.ru>
Fri, 23 Sep 2011 14:17:41 +0000 (11:17 -0300)
committerMauro Carvalho Chehab <mchehab@redhat.com>
Fri, 23 Sep 2011 18:00:57 +0000 (15:00 -0300)
[mchehab@redhat.com: Fix a merge conflict]
Signed-off-by: Igor M. Liplianin <liplianin@netup.ru>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
15 files changed:
drivers/media/video/cx23885/cx23885-cards.c
drivers/misc/Kconfig
drivers/misc/Makefile
drivers/misc/altera-stapl/Kconfig [moved from drivers/staging/altera-stapl/Kconfig with 77% similarity]
drivers/misc/altera-stapl/Makefile [new file with mode: 0644]
drivers/misc/altera-stapl/altera-comp.c [moved from drivers/staging/altera-stapl/altera-comp.c with 100% similarity]
drivers/misc/altera-stapl/altera-exprt.h [moved from drivers/staging/altera-stapl/altera-exprt.h with 100% similarity]
drivers/misc/altera-stapl/altera-jtag.c [moved from drivers/staging/altera-stapl/altera-jtag.c with 99% similarity]
drivers/misc/altera-stapl/altera-jtag.h [moved from drivers/staging/altera-stapl/altera-jtag.h with 100% similarity]
drivers/misc/altera-stapl/altera-lpt.c [moved from drivers/staging/altera-stapl/altera-lpt.c with 100% similarity]
drivers/misc/altera-stapl/altera.c [moved from drivers/staging/altera-stapl/altera.c with 99% similarity]
drivers/staging/Kconfig
drivers/staging/Makefile
drivers/staging/altera-stapl/Makefile [deleted file]
include/misc/altera.h [moved from drivers/staging/altera-stapl/altera.h with 100% similarity]

index 76b7563de39c9eadec8a492a7e01ad77138e776c..62fd25e7633bd4f26579e11b890bc1f58cddd0e9 100644 (file)
@@ -25,8 +25,8 @@
 #include <linux/delay.h>
 #include <media/cx25840.h>
 #include <linux/firmware.h>
+#include <misc/altera.h>
 
-#include "../../../staging/altera-stapl/altera.h"
 #include "cx23885.h"
 #include "tuner-xc2028.h"
 #include "netup-eeprom.h"
index 2d6423c2d19340015c9f4be263342387db661d9a..50d5f27f09d0bb85c110fce0468bb01af9022eba 100644 (file)
@@ -506,5 +506,6 @@ source "drivers/misc/iwmc3200top/Kconfig"
 source "drivers/misc/ti-st/Kconfig"
 source "drivers/misc/lis3lv02d/Kconfig"
 source "drivers/misc/carma/Kconfig"
+source "drivers/misc/altera-stapl/Kconfig"
 
 endif # MISC_DEVICES
index 8f3efb68a141889e591b08925da27b3d63d8be7c..b26495a0255494d7c1ee03f987d4a12ac39b8196 100644 (file)
@@ -47,3 +47,4 @@ obj-$(CONFIG_AB8500_PWM)      += ab8500-pwm.o
 obj-y                          += lis3lv02d/
 obj-y                          += carma/
 obj-$(CONFIG_USB_SWITCH_FSA9480) += fsa9480.o
+obj-$(CONFIG_ALTERA_STAPL)     +=altera-stapl/
similarity index 77%
rename from drivers/staging/altera-stapl/Kconfig
rename to drivers/misc/altera-stapl/Kconfig
index b6537321ed72ff14105257bec6cd2ead02cebb71..7f01d8e93992268df6ed51dd475afda5d7c84818 100644 (file)
@@ -1,3 +1,5 @@
+comment "Altera FPGA firmware download module"
+
 config ALTERA_STAPL
        tristate "Altera FPGA firmware download module"
        depends on I2C
diff --git a/drivers/misc/altera-stapl/Makefile b/drivers/misc/altera-stapl/Makefile
new file mode 100644 (file)
index 0000000..055f61e
--- /dev/null
@@ -0,0 +1,3 @@
+altera-stapl-objs = altera-lpt.o altera-jtag.o altera-comp.o altera.o
+
+obj-$(CONFIG_ALTERA_STAPL) += altera-stapl.o
similarity index 99%
rename from drivers/staging/altera-stapl/altera-jtag.c
rename to drivers/misc/altera-stapl/altera-jtag.c
index 8b1620b1b2d0b0f614004726a3814155d039c543..f4bf20096972f4b5804f6c643448c3ca609c79ff 100644 (file)
@@ -26,7 +26,7 @@
 #include <linux/delay.h>
 #include <linux/firmware.h>
 #include <linux/slab.h>
-#include "altera.h"
+#include <misc/altera.h>
 #include "altera-exprt.h"
 #include "altera-jtag.h"
 
similarity index 99%
rename from drivers/staging/altera-stapl/altera.c
rename to drivers/misc/altera-stapl/altera.c
index 8d73a86427360a645132120b621f66b5d3287e29..1a2c50b82f94aa219a998ccd7ddb16934a21a942 100644 (file)
@@ -28,7 +28,7 @@
 #include <linux/string.h>
 #include <linux/firmware.h>
 #include <linux/slab.h>
-#include "altera.h"
+#include <misc/altera.h>
 #include "altera-exprt.h"
 #include "altera-jtag.h"
 
index 720927742eb7d1e297480419ca687a0eb1a4ef70..e9aa6889270574e8448f6fbc131dc29683c8b105 100644 (file)
@@ -142,8 +142,6 @@ source "drivers/staging/ste_rmi4/Kconfig"
 
 source "drivers/staging/gma500/Kconfig"
 
-source "drivers/staging/altera-stapl/Kconfig"
-
 source "drivers/staging/mei/Kconfig"
 
 source "drivers/staging/nvec/Kconfig"
index d44d25ed6cf1033c8464ae9655e9cc8a04fdada1..a2e77cf1dcb88cb036d6e8ab1083640f44bc3ece 100644 (file)
@@ -59,7 +59,6 @@ obj-$(CONFIG_BCM_WIMAX)               += bcm/
 obj-$(CONFIG_FT1000)           += ft1000/
 obj-$(CONFIG_SND_INTEL_SST)    += intel_sst/
 obj-$(CONFIG_SPEAKUP)          += speakup/
-obj-$(CONFIG_ALTERA_STAPL)     +=altera-stapl/
 obj-$(CONFIG_TOUCHSCREEN_CLEARPAD_TM1217)      += cptm1217/
 obj-$(CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_RMI4)   += ste_rmi4/
 obj-$(CONFIG_DRM_PSB)          += gma500/
diff --git a/drivers/staging/altera-stapl/Makefile b/drivers/staging/altera-stapl/Makefile
deleted file mode 100644 (file)
index ddeede3..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-altera-stapl-y := altera-lpt.o altera-jtag.o altera-comp.o altera.o
-
-obj-$(CONFIG_ALTERA_STAPL) += altera-stapl.o