diff options
| -rw-r--r-- | drivers/media/video/cx23885/cx23885-cards.c | 2 | ||||
| -rw-r--r-- | drivers/misc/Kconfig | 1 | ||||
| -rw-r--r-- | drivers/misc/Makefile | 1 | ||||
| -rw-r--r-- | drivers/misc/altera-stapl/Kconfig (renamed from drivers/staging/altera-stapl/Kconfig) | 2 | ||||
| -rw-r--r-- | drivers/misc/altera-stapl/Makefile | 3 | ||||
| -rw-r--r-- | drivers/misc/altera-stapl/altera-comp.c (renamed from drivers/staging/altera-stapl/altera-comp.c) | 0 | ||||
| -rw-r--r-- | drivers/misc/altera-stapl/altera-exprt.h (renamed from drivers/staging/altera-stapl/altera-exprt.h) | 0 | ||||
| -rw-r--r-- | drivers/misc/altera-stapl/altera-jtag.c (renamed from drivers/staging/altera-stapl/altera-jtag.c) | 2 | ||||
| -rw-r--r-- | drivers/misc/altera-stapl/altera-jtag.h (renamed from drivers/staging/altera-stapl/altera-jtag.h) | 0 | ||||
| -rw-r--r-- | drivers/misc/altera-stapl/altera-lpt.c (renamed from drivers/staging/altera-stapl/altera-lpt.c) | 0 | ||||
| -rw-r--r-- | drivers/misc/altera-stapl/altera.c (renamed from drivers/staging/altera-stapl/altera.c) | 2 | ||||
| -rw-r--r-- | drivers/staging/Kconfig | 2 | ||||
| -rw-r--r-- | drivers/staging/Makefile | 1 | ||||
| -rw-r--r-- | drivers/staging/altera-stapl/Makefile | 3 | ||||
| -rw-r--r-- | include/misc/altera.h (renamed from drivers/staging/altera-stapl/altera.h) | 0 |
15 files changed, 10 insertions, 9 deletions
diff --git a/drivers/media/video/cx23885/cx23885-cards.c b/drivers/media/video/cx23885/cx23885-cards.c index 76b7563de39..62fd25e7633 100644 --- a/drivers/media/video/cx23885/cx23885-cards.c +++ b/drivers/media/video/cx23885/cx23885-cards.c @@ -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" diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig index 2d6423c2d19..50d5f27f09d 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 8f3efb68a14..b26495a0255 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 index b6537321ed7..7f01d8e9399 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 00000000000..055f61ee781 --- /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 index 49b103bedaa..49b103bedaa 100644 --- a/drivers/staging/altera-stapl/altera-comp.c +++ b/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 index 39c38d84a67..39c38d84a67 100644 --- a/drivers/staging/altera-stapl/altera-exprt.h +++ b/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 index 8b1620b1b2d..f4bf2009697 100644 --- a/drivers/staging/altera-stapl/altera-jtag.c +++ b/drivers/misc/altera-stapl/altera-jtag.c @@ -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" diff --git a/drivers/staging/altera-stapl/altera-jtag.h b/drivers/misc/altera-stapl/altera-jtag.h index 2f97e36a2fb..2f97e36a2fb 100644 --- a/drivers/staging/altera-stapl/altera-jtag.h +++ b/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 index 91456a03612..91456a03612 100644 --- a/drivers/staging/altera-stapl/altera-lpt.c +++ b/drivers/misc/altera-stapl/altera-lpt.c diff --git a/drivers/staging/altera-stapl/altera.c b/drivers/misc/altera-stapl/altera.c index 8d73a864273..1a2c50b82f9 100644 --- a/drivers/staging/altera-stapl/altera.c +++ b/drivers/misc/altera-stapl/altera.c @@ -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" diff --git a/drivers/staging/Kconfig b/drivers/staging/Kconfig index 720927742eb..e9aa6889270 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 d44d25ed6cf..a2e77cf1dcb 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 ddeede3c4b9..00000000000 --- 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 index 94c0c6181da..94c0c6181da 100644 --- a/drivers/staging/altera-stapl/altera.h +++ b/include/misc/altera.h |