projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus-4.1' of git://git.kernel.org/pub/scm/linux/kernel/git/mason...
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
dma
/
mv_xor.c
diff --git
a/drivers/dma/mv_xor.c
b/drivers/dma/mv_xor.c
index b03e8137b918881891bde603576f659612c40c47..1c56001df676c048a8ec30c206e0a215375eada7 100644
(file)
--- a/
drivers/dma/mv_xor.c
+++ b/
drivers/dma/mv_xor.c
@@
-10,10
+10,6
@@
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
* more details.
* 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.,
- * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include <linux/init.h>
*/
#include <linux/init.h>
@@
-1249,7
+1245,7
@@
static int mv_xor_remove(struct platform_device *pdev)
}
#ifdef CONFIG_OF
}
#ifdef CONFIG_OF
-static struct of_device_id mv_xor_dt_ids[] = {
+static
const
struct of_device_id mv_xor_dt_ids[] = {
{ .compatible = "marvell,orion-xor", },
{},
};
{ .compatible = "marvell,orion-xor", },
{},
};