Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

This project is archived. Its data is read-only.

Commit eab44afc authored Feb 26, 2014 by Linux Build Service Account Committed by Gerrit - the friendly Code Review server Feb 26, 2014

Merge "USB: mach: Move the mach headers to common location"

parents 0ada0f9a af110c4d

drivers/char/diag/diag_dci.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -27,7 +27,7 @@
		#include <asm/current.h>
		#include <soc/qcom/restart.h>
		#ifdef CONFIG_DIAG_OVER_USB
		#include <mach/usbdiag.h>
		#include <linux/usb/usbdiag.h>
		#endif
		#include "diagchar_hdlc.h"
		#include "diagmem.h"

drivers/char/diag/diagchar_core.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -23,7 +23,7 @@
		#include <linux/sched.h>
		#include <linux/ratelimit.h>
		#ifdef CONFIG_DIAG_OVER_USB
		#include <mach/usbdiag.h>
		#include <linux/usb/usbdiag.h>
		#endif
		#include <asm/current.h>
		#include "diagchar_hdlc.h"

drivers/char/diag/diagfwd.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -25,7 +25,7 @@
		#include <linux/of.h>
		#include <linux/kmemleak.h>
		#ifdef CONFIG_DIAG_OVER_USB
		#include <mach/usbdiag.h>
		#include <linux/usb/usbdiag.h>
		#endif
		#include <soc/qcom/socinfo.h>
		#include <soc/qcom/smd.h>

drivers/char/diag/diagfwd_bridge.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -20,7 +20,7 @@
		#include <linux/platform_device.h>
		#include <linux/smux.h>
		#ifdef CONFIG_DIAG_OVER_USB
		#include <mach/usbdiag.h>
		#include <linux/usb/usbdiag.h>
		#endif
		#include "diagchar.h"
		#include "diagmem.h"

drivers/char/diag/diagfwd_hsic.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -23,7 +23,7 @@
		#include <linux/smux.h>
		#include <asm/current.h>
		#ifdef CONFIG_DIAG_OVER_USB
		#include <mach/usbdiag.h>
		#include <linux/usb/usbdiag.h>
		#endif
		#include "diagchar_hdlc.h"
		#include "diagmem.h"