Merge branch 'perf/urgent' into perf/core, to resolve a conflict

[firefly-linux-kernel-4.4.55.git] / drivers / media / dvb-frontends / a8293.h

diff --git a/drivers/media/dvb-frontends/a8293.h b/drivers/media/dvb-frontends/a8293.h
index aa07b68d19e0aa92b209d5cbbbe726ce59770fad..7b90a03fcd0accaf4910db48603f3d10ade09dfb 100644 (file)
--- a/drivers/media/dvb-frontends/a8293.h
+++ b/drivers/media/dvb-frontends/a8293.h
@@ -12,10 +12,6 @@
  *    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.,
- *    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
 #ifndef A8293_H