diff --git a/[refs] b/[refs] index ef58bee2cf3f..1da8ab291445 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4717b03b56fedd1c44fe6a0701cd4e36e97efbab +refs/heads/master: 4b5e781dc8d981e9c58926464fc1fff16a8804ff diff --git a/trunk/drivers/staging/Kconfig b/trunk/drivers/staging/Kconfig index 073c154bdeb1..98dae044cbf5 100644 --- a/trunk/drivers/staging/Kconfig +++ b/trunk/drivers/staging/Kconfig @@ -111,5 +111,7 @@ source "drivers/staging/p9auth/Kconfig" source "drivers/staging/heci/Kconfig" +source "drivers/staging/line6/Kconfig" + endif # !STAGING_EXCLUDE_BUILD endif # STAGING diff --git a/trunk/drivers/staging/Makefile b/trunk/drivers/staging/Makefile index b69703e72c0c..2a859ee036da 100644 --- a/trunk/drivers/staging/Makefile +++ b/trunk/drivers/staging/Makefile @@ -38,3 +38,4 @@ obj-$(CONFIG_B3DFG) += b3dfg/ obj-$(CONFIG_IDE_PHISON) += phison/ obj-$(CONFIG_PLAN9AUTH) += p9auth/ obj-$(CONFIG_HECI) += heci/ +obj-$(CONFIG_LINE6_USB) += line6/