From f8e1f50751d17e85a23faba8e9a55be856e70fb5 Mon Sep 17 00:00:00 2001 From: Mauro Ribeiro Date: Wed, 15 Oct 2014 01:20:36 -0300 Subject: [PATCH] clean ups Change-Id: Iebf8ef70344bb2e94831cb2a7c4bd6d3247e4829 --- arch/arm/mach-meson6/include/mach/usbclock.h.rej | 11 ----------- 1 file changed, 11 deletions(-) delete mode 100644 arch/arm/mach-meson6/include/mach/usbclock.h.rej diff --git a/arch/arm/mach-meson6/include/mach/usbclock.h.rej b/arch/arm/mach-meson6/include/mach/usbclock.h.rej deleted file mode 100644 index 51d1c6aee33e..000000000000 --- a/arch/arm/mach-meson6/include/mach/usbclock.h.rej +++ /dev/null @@ -1,11 +0,0 @@ ---- arch/arm/mach-meson6/include/mach/usbclock.h.orig 2014-07-18 11:36:55.687502450 +0800 -+++ arch/arm/mach-meson6/include/mach/usbclock.h 2014-07-18 11:37:02.943502586 +0800 -@@ -207,7 +207,7 @@ - #define USB_BC_MODE_CDP 3 /* PC + Charger */ - - #define USB_CORE_RESET_TIME 200 --#define USB_ID_CHANGE_TIME 100 -+#define USB_ID_CHANGE_TIME 200 - - int clk_enable_usb(struct clk *clk); - int clk_disable_usb(struct clk *clk);