diff options
author | Joerg Roedel <jroedel@suse.de> | 2019-06-03 13:00:40 +0200 |
---|---|---|
committer | Joerg Roedel <jroedel@suse.de> | 2019-06-03 13:00:40 +0200 |
commit | 2de03c11171544bd23e18539f65b3b561d57ff76 (patch) | |
tree | e207052e8cbb53f587c260617c16f97fa9f7d05d /drivers/net/ethernet/wiznet/w5100.h | |
parent | e314a7c92b3217e893cbe03b944c7afc9cbd3e4c (diff) | |
parent | f2c7c76c5d0a443053e94adb9f0918fa2fb85c3a (diff) | |
download | blackbird-op-linux-2de03c11171544bd23e18539f65b3b561d57ff76.tar.gz blackbird-op-linux-2de03c11171544bd23e18539f65b3b561d57ff76.zip |
Merge tag 'v5.2-rc3' into x86/vt-d
Linux 5.2-rc3
Diffstat (limited to 'drivers/net/ethernet/wiznet/w5100.h')
-rw-r--r-- | drivers/net/ethernet/wiznet/w5100.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/ethernet/wiznet/w5100.h b/drivers/net/ethernet/wiznet/w5100.h index 17983a3b8d6c..5d3d4b541fec 100644 --- a/drivers/net/ethernet/wiznet/w5100.h +++ b/drivers/net/ethernet/wiznet/w5100.h @@ -1,10 +1,9 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Ethernet driver for the WIZnet W5100 chip. * * Copyright (C) 2006-2008 WIZnet Co.,Ltd. * Copyright (C) 2012 Mike Sinkovsky <msink@permonline.ru> - * - * Licensed under the GPL-2 or later. */ enum { |