Merge tag 'configfs-for-4.15' of git://git.infradead.org/users/hch/configfs

[mirror_ubuntu-bionic-kernel.git] / drivers / usb / gadget / function / f_ncm.c

diff --git a/drivers/usb/gadget/function/f_ncm.c b/drivers/usb/gadget/function/f_ncm.c
index a45e6174a38779be4e6072e9f2e8664bdf432d81..c5bce8e2298312bf2c73edc37f80af72b03ae34e 100644 (file)
--- a/drivers/usb/gadget/function/f_ncm.c
+++ b/drivers/usb/gadget/function/f_ncm.c
@@ -9,11 +9,6 @@
  *
  * Copyright (C) 2003-2005,2008 David Brownell
  * Copyright (C) 2008 Nokia Corporation
- *
- * 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.
  */
 
 #include <linux/kernel.h>
@@ -1569,7 +1564,7 @@ static struct configfs_attribute *ncm_attrs[] = {
        NULL,
 };
 
-static struct config_item_type ncm_func_type = {
+static const struct config_item_type ncm_func_type = {
        .ct_item_ops    = &ncm_item_ops,
        .ct_attrs       = ncm_attrs,
        .ct_owner       = THIS_MODULE,