Merge tag 'xilinx-for-v2017.07' of git://www.denx.de/git/u-boot-microblaze

[people/ms/u-boot.git] / include / usbdevice.h

diff --git a/include/usbdevice.h b/include/usbdevice.h
index 265ba4acd5124599c0598ec95b6dbab48d1bfea2..f27e17f124a3113f988e9f43609424c72d1b5374 100644 (file)
--- a/include/usbdevice.h
+++ b/include/usbdevice.h
@@ -12,20 +12,7 @@
  *     Tom Rushworth <tbr@lineo.com>,
  *     Bruce Balden <balden@lineo.com>
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.         See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
+ * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #ifndef __USBDCORE_H__
@@ -451,7 +438,7 @@ typedef enum usb_device_event {
        DEVICE_HUB_RESET,       /* bi  - bus has been unplugged */
        DEVICE_DESTROY,         /* bi  - device instance should be destroyed */
 
-       DEVICE_HOTPLUG,         /* bi  - a hotplug event has occured */
+       DEVICE_HOTPLUG,         /* bi  - a hotplug event has occurred */
 
        DEVICE_FUNCTION_PRIVATE,        /* function - private */