From 35ef20ad839dafe564b19561fd779af256460152 Mon Sep 17 00:00:00 2001 From: Tomi Valkeinen Date: Thu, 2 Jul 2009 11:19:20 +0300 Subject: [PATCH 138/146] DSS2: VRAM: Update license information Signed-off-by: Tomi Valkeinen --- arch/arm/plat-omap/include/mach/vram.h | 13 ++++++------- arch/arm/plat-omap/vram.c | 24 +++++++++++------------- 2 files changed, 17 insertions(+), 20 deletions(-) diff --git a/arch/arm/plat-omap/include/mach/vram.h b/arch/arm/plat-omap/include/mach/vram.h index 8d26b05..f6bb9fb 100644 --- a/arch/arm/plat-omap/include/mach/vram.h +++ b/arch/arm/plat-omap/include/mach/vram.h @@ -1,13 +1,12 @@ /* - * File: arch/arm/plat-omap/include/mach/vram.h + * VRAM manager for OMAP * * Copyright (C) 2009 Nokia Corporation * Author: Tomi Valkeinen * - * 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 free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,8 +18,8 @@ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#ifndef __OMAPVRAM_H -#define __OMAPVRAM_H +#ifndef __OMAP_VRAM_H__ +#define __OMAP_VRAM_H__ #include diff --git a/arch/arm/plat-omap/vram.c b/arch/arm/plat-omap/vram.c index 6c4bc18..0fd5b13 100644 --- a/arch/arm/plat-omap/vram.c +++ b/arch/arm/plat-omap/vram.c @@ -1,23 +1,21 @@ /* - * arch/arm/plat-omap/vram.c + * VRAM manager for OMAP * * Copyright (C) 2009 Nokia Corporation * Author: Tomi Valkeinen * - * Some code and ideas taken from drivers/video/omap/ driver - * by Imre Deak. + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. * - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 2 as published by - * the Free Software Foundation. + * 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. * - * 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, see . + * 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. */ /*#define DEBUG*/ -- 1.6.2.4