From cff4fa8415a3224a5abdd2b1dd7f431e4ea49366 Mon Sep 17 00:00:00 2001 From: "Igor M. Liplianin" Date: Fri, 23 Sep 2011 11:17:41 -0300 Subject: [PATCH] [media] altera-stapl: it is time to move out from staging [mchehab@redhat.com: Fix a merge conflict] Signed-off-by: Igor M. Liplianin Signed-off-by: Mauro Carvalho Chehab --- drivers/media/video/cx23885/cx23885-cards.c | 2 +- drivers/misc/Kconfig | 1 + drivers/misc/Makefile | 1 + drivers/{staging => misc}/altera-stapl/Kconfig | 2 ++ drivers/misc/altera-stapl/Makefile | 3 +++ drivers/{staging => misc}/altera-stapl/altera-comp.c | 0 drivers/{staging => misc}/altera-stapl/altera-exprt.h | 0 drivers/{staging => misc}/altera-stapl/altera-jtag.c | 2 +- drivers/{staging => misc}/altera-stapl/altera-jtag.h | 0 drivers/{staging => misc}/altera-stapl/altera-lpt.c | 0 drivers/{staging => misc}/altera-stapl/altera.c | 2 +- drivers/staging/Kconfig | 2 -- drivers/staging/Makefile | 1 - drivers/staging/altera-stapl/Makefile | 3 --- {drivers/staging/altera-stapl => include/misc}/altera.h | 0 15 files changed, 10 insertions(+), 9 deletions(-) rename drivers/{staging => misc}/altera-stapl/Kconfig (77%) create mode 100644 drivers/misc/altera-stapl/Makefile rename drivers/{staging => misc}/altera-stapl/altera-comp.c (100%) rename drivers/{staging => misc}/altera-stapl/altera-exprt.h (100%) rename drivers/{staging => misc}/altera-stapl/altera-jtag.c (99%) rename drivers/{staging => misc}/altera-stapl/altera-jtag.h (100%) rename drivers/{staging => misc}/altera-stapl/altera-lpt.c (100%) rename drivers/{staging => misc}/altera-stapl/altera.c (99%) delete mode 100644 drivers/staging/altera-stapl/Makefile rename {drivers/staging/altera-stapl => include/misc}/altera.h (100%) diff --git a/drivers/media/video/cx23885/cx23885-cards.c b/drivers/media/video/cx23885/cx23885-cards.c index 76b7563de39c..62fd25e7633b 100644 --- a/drivers/media/video/cx23885/cx23885-cards.c +++ b/drivers/media/video/cx23885/cx23885-cards.c @@ -25,8 +25,8 @@ #include #include #include +#include -#include "../../../staging/altera-stapl/altera.h" #include "cx23885.h" #include "tuner-xc2028.h" #include "netup-eeprom.h" diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig index 2d6423c2d193..50d5f27f09d0 100644 --- a/drivers/misc/Kconfig +++ b/drivers/misc/Kconfig @@ -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 diff --git a/drivers/misc/Makefile b/drivers/misc/Makefile index 8f3efb68a141..b26495a02554 100644 --- a/drivers/misc/Makefile +++ b/drivers/misc/Makefile @@ -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/ diff --git a/drivers/staging/altera-stapl/Kconfig b/drivers/misc/altera-stapl/Kconfig similarity index 77% rename from drivers/staging/altera-stapl/Kconfig rename to drivers/misc/altera-stapl/Kconfig index b6537321ed72..7f01d8e93992 100644 --- a/drivers/staging/altera-stapl/Kconfig +++ b/drivers/misc/altera-stapl/Kconfig @@ -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 index 000000000000..055f61ee781a --- /dev/null +++ b/drivers/misc/altera-stapl/Makefile @@ -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 diff --git a/drivers/staging/altera-stapl/altera-comp.c b/drivers/misc/altera-stapl/altera-comp.c similarity index 100% rename from drivers/staging/altera-stapl/altera-comp.c rename to drivers/misc/altera-stapl/altera-comp.c diff --git a/drivers/staging/altera-stapl/altera-exprt.h b/drivers/misc/altera-stapl/altera-exprt.h similarity index 100% rename from drivers/staging/altera-stapl/altera-exprt.h rename to drivers/misc/altera-stapl/altera-exprt.h diff --git a/drivers/staging/altera-stapl/altera-jtag.c b/drivers/misc/altera-stapl/altera-jtag.c similarity index 99% rename from drivers/staging/altera-stapl/altera-jtag.c rename to drivers/misc/altera-stapl/altera-jtag.c index 8b1620b1b2d0..f4bf20096972 100644 --- a/drivers/staging/altera-stapl/altera-jtag.c +++ b/drivers/misc/altera-stapl/altera-jtag.c @@ -26,7 +26,7 @@ #include #include #include -#include "altera.h" +#include #include "altera-exprt.h" #include "altera-jtag.h" diff --git a/drivers/staging/altera-stapl/altera-jtag.h b/drivers/misc/altera-stapl/altera-jtag.h similarity index 100% rename from drivers/staging/altera-stapl/altera-jtag.h rename to drivers/misc/altera-stapl/altera-jtag.h diff --git a/drivers/staging/altera-stapl/altera-lpt.c b/drivers/misc/altera-stapl/altera-lpt.c similarity index 100% rename from drivers/staging/altera-stapl/altera-lpt.c rename to drivers/misc/altera-stapl/altera-lpt.c diff --git a/drivers/staging/altera-stapl/altera.c b/drivers/misc/altera-stapl/altera.c similarity index 99% rename from drivers/staging/altera-stapl/altera.c rename to drivers/misc/altera-stapl/altera.c index 8d73a8642736..1a2c50b82f94 100644 --- a/drivers/staging/altera-stapl/altera.c +++ b/drivers/misc/altera-stapl/altera.c @@ -28,7 +28,7 @@ #include #include #include -#include "altera.h" +#include #include "altera-exprt.h" #include "altera-jtag.h" diff --git a/drivers/staging/Kconfig b/drivers/staging/Kconfig index 720927742eb7..e9aa68892705 100644 --- a/drivers/staging/Kconfig +++ b/drivers/staging/Kconfig @@ -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" diff --git a/drivers/staging/Makefile b/drivers/staging/Makefile index d44d25ed6cf1..a2e77cf1dcb8 100644 --- a/drivers/staging/Makefile +++ b/drivers/staging/Makefile @@ -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 index ddeede3c4b96..000000000000 --- a/drivers/staging/altera-stapl/Makefile +++ /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 diff --git a/drivers/staging/altera-stapl/altera.h b/include/misc/altera.h similarity index 100% rename from drivers/staging/altera-stapl/altera.h rename to include/misc/altera.h