OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[media] altera-stapl: it is time to move out from staging 

[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>
This commit is contained in:
Igor M. Liplianin 2011-09-23 11:17:41 -03:00 committed by Mauro Carvalho Chehab
parent 08347cdd2d
commit cff4fa8415
15 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/media/video/cx23885/cx23885-cards.c
View 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"

1
drivers/misc/Kconfig
View 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

1
drivers/misc/Makefile
View 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/

2
drivers/staging/altera-stapl/Kconfig → drivers/misc/altera-stapl/Kconfig
View File

@ -1,3 +1,5 @@
comment "Altera FPGA firmware download module"
config ALTERA_STAPL
tristate "Altera FPGA firmware download module"
depends on I2C

3
drivers/misc/altera-stapl/Makefile Normal file
View File

@ -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

0
drivers/staging/altera-stapl/altera-comp.c → drivers/misc/altera-stapl/altera-comp.c
View File

0
drivers/staging/altera-stapl/altera-exprt.h → drivers/misc/altera-stapl/altera-exprt.h
View File

2
drivers/staging/altera-stapl/altera-jtag.c → drivers/misc/altera-stapl/altera-jtag.c
View 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"

0
drivers/staging/altera-stapl/altera-jtag.h → drivers/misc/altera-stapl/altera-jtag.h
View File

0
drivers/staging/altera-stapl/altera-lpt.c → drivers/misc/altera-stapl/altera-lpt.c
View File

2
drivers/staging/altera-stapl/altera.c → drivers/misc/altera-stapl/altera.c
View 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"

2
drivers/staging/Kconfig
View 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"

1
drivers/staging/Makefile
View 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/

3
drivers/staging/altera-stapl/Makefile
View File

@ -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

0
drivers/staging/altera-stapl/altera.h → include/misc/altera.h
View File