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

Commit 5b045423 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "usb: gadget: Use correct include style for local headers"

parents cd22865b 84e70986

drivers/dma-buf/dma-buf.c

+2 −2
Original line number Diff line number Diff line
@@ -1290,7 +1290,7 @@ static void write_proc(struct seq_file *s, struct dma_proc *proc) 
{

	struct dma_info *tmp;



	seq_printf(s, "\n%s (PID %ld) size: %ld\nDMA Buffers:\n",

	seq_printf(s, "\n%s (PID %d) size: %ld\nDMA Buffers:\n",

		proc->name, proc->pid, proc->size);

	seq_printf(s, "%-8s\t%-8s\t%-8s\n",

		"Name", "Size (KB)", "Time Alive (sec)");
@@ -1300,7 +1300,7 @@ static void write_proc(struct seq_file *s, struct dma_proc *proc) 
		ktime_t elapmstime = ktime_ms_delta(ktime_get(), dmabuf->ktime);



		elapmstime = ktime_divns(elapmstime, MSEC_PER_SEC);

		seq_printf(s, "%-8s\t%-8ld\t%-8ld\n",

		seq_printf(s, "%-8s\t%-8ld\t%-8lld\n",

				dmabuf->name,

				dmabuf->size / SZ_1K,

				elapmstime);

drivers/usb/gadget/configfs.c

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 
#include <linux/usb/ch9.h>



#ifdef CONFIG_USB_F_NCM

#include <function/u_ncm.h>

#include "function/u_ncm.h"

#endif



#ifdef CONFIG_USB_CONFIGFS_F_ACC