Merge branch 'master' of git://git.denx.de/u-boot-sunxi

[u-boot] / include / fsl_diu_fb.h

diff --git a/include/fsl_diu_fb.h b/include/fsl_diu_fb.h
index 4c89f4b8b7d9f12506504cba29cfeee00d95ad83..139851ba1a8735bba7e52950132614fbb7aef6e8 100644 (file)
--- a/include/fsl_diu_fb.h
+++ b/include/fsl_diu_fb.h
@@ -1,30 +1,13 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
 /*
  * Copyright 2007, 2011 Freescale Semiconductor, Inc.
  * Authors: York Sun <yorksun@freescale.com>
  *          Timur Tabi <timur@freescale.com>
  *
  * FSL DIU Framebuffer driver
- *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * 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., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
  */
 
-int fsl_diu_init(int xres, u32 pixel_format, int gamma_fix);
+int fsl_diu_init(u16 xres, u16 yres, u32 pixel_format, int gamma_fix);
 
 /* Prototypes for external board-specific functions */
 int platform_diu_init(unsigned int xres, unsigned int yres, const char *port);