From: Ian Abbott Date: Tue, 27 Jan 2015 17:49:04 +0000 (+0000) Subject: staging: comedi: ni_usb6501: include new "comedi_usb.h" header X-Git-Tag: android-x86-4.4-r3~323^2~106 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=3fdffa5d140e7b9fe37d33870b8ed99a14c9980a;p=android-x86%2Fkernel.git staging: comedi: ni_usb6501: include new "comedi_usb.h" header Include the new "../comedi_usb.h" header instead of and "../comedidev.h", which will now get included indirectly. Signed-off-by: Ian Abbott Reviewed-by: H Hartley Sweeten Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/comedi/drivers/ni_usb6501.c b/drivers/staging/comedi/drivers/ni_usb6501.c index 3b5a1b90366d..5f649f88d55c 100644 --- a/drivers/staging/comedi/drivers/ni_usb6501.c +++ b/drivers/staging/comedi/drivers/ni_usb6501.c @@ -96,9 +96,8 @@ #include #include #include -#include -#include "../comedidev.h" +#include "../comedi_usb.h" #define NI6501_TIMEOUT 1000