On Wed, Aug 21, 2013 at 09:48:42PM -0400, Lidza Louina wrote: > This patch adds the dgap driver to the kernel build process. > > Signed-off-by: Lidza Louina <lidza.louina@xxxxxxxxx> > --- > drivers/staging/Kconfig | 2 +- > drivers/staging/Makefile | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/staging/Kconfig b/drivers/staging/Kconfig > index 5e34ae4..d2d72c2 100644 > --- a/drivers/staging/Kconfig > +++ b/drivers/staging/Kconfig > @@ -142,6 +142,6 @@ source "drivers/staging/lustre/Kconfig" > > source "drivers/staging/btmtk_usb/Kconfig" > > -source "drivers/staging/dgnc/Kconfig" > +source "drivers/staging/dgap/Kconfig" Wait, why are you doing this? Don't we want to be able to build both drivers? > endif # STAGING > diff --git a/drivers/staging/Makefile b/drivers/staging/Makefile > index 8d687a3..e9982a3 100644 > --- a/drivers/staging/Makefile > +++ b/drivers/staging/Makefile > @@ -63,4 +63,4 @@ obj-$(CONFIG_GOLDFISH) += goldfish/ > obj-$(CONFIG_USB_DWC2) += dwc2/ > obj-$(CONFIG_LUSTRE_FS) += lustre/ > obj-$(CONFIG_USB_BTMTK) += btmtk_usb/ > -obj-$(CONFIG_DGNC) += dgnc/ > +obj-$(CONFIG_DGAP) += dgap/ Same here, don't remove the dgnc driver from the build. Also, this patch doesn't apply to my staging-next tree, can you fix it up (by only adding the driver, not removing one) and refresh it and resend it so I can apply it? thanks, greg k-h _______________________________________________ devel mailing list devel@xxxxxxxxxxxxxxxxxxxxxx http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel