Commit cff4fa84 authored by Igor M. Liplianin's avatar Igor M. Liplianin Committed by Mauro Carvalho Chehab
Browse files

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



[mchehab@redhat.com: Fix a merge conflict]
Signed-off-by: default avatarIgor M. Liplianin <liplianin@netup.ru>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 08347cdd

drivers/media/video/cx23885/cx23885-cards.c

+1 −1
Original line number Diff line number Diff line
@@ -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"

drivers/misc/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -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

drivers/misc/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -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/

drivers/staging/altera-stapl/Kconfig→drivers/misc/altera-stapl/Kconfig

+2 −0
Original line number Diff line number Diff line 
comment "Altera FPGA firmware download module"



config ALTERA_STAPL

	tristate "Altera FPGA firmware download module"

	depends on I2C

drivers/staging/altera-stapl/Makefile→drivers/misc/altera-stapl/Makefile

+1 −1
Original line number Diff line number Diff line 
altera-stapl-y := altera-lpt.o altera-jtag.o altera-comp.o altera.o

altera-stapl-objs = altera-lpt.o altera-jtag.o altera-comp.o altera.o



obj-$(CONFIG_ALTERA_STAPL) += altera-stapl.o