From b9487baeb98fefd926563e099b6e3242f8a00589 Mon Sep 17 00:00:00 2001 From: Tony Lindgren Date: Wed, 6 Dec 2006 19:02:55 -0800 Subject: [PATCH] Sync with mainline: Clean up a bit Clean up a bit Signed-off-by: Tony Lindgren --- arch/arm/kernel/vmlinux.lds.S | 8 ++++++++ arch/arm/mach-omap1/board-sx1.c | 2 +- arch/arm/mach-omap2/gpmc.c | 6 +++--- include/asm-arm/arch-omap/board-2430sdp.h | 4 ++-- include/asm-arm/dma-mapping.h | 1 - 5 files changed, 14 insertions(+), 7 deletions(-) diff --git a/arch/arm/kernel/vmlinux.lds.S b/arch/arm/kernel/vmlinux.lds.S index 675ae484886..a8fa75ea07a 100644 --- a/arch/arm/kernel/vmlinux.lds.S +++ b/arch/arm/kernel/vmlinux.lds.S @@ -170,3 +170,11 @@ SECTIONS .stab.indexstr 0 : { *(.stab.indexstr) } .comment 0 : { *(.comment) } } + +/* + * These must never be empty + * If you have to comment these two assert statements out, your + * binutils is too old (for other reasons as well) + */ +ASSERT((__proc_info_end - __proc_info_begin), "missing CPU support") +ASSERT((__arch_info_end - __arch_info_begin), "no machine record defined") diff --git a/arch/arm/mach-omap1/board-sx1.c b/arch/arm/mach-omap1/board-sx1.c index 636a5af47c6..2743d639aa0 100644 --- a/arch/arm/mach-omap1/board-sx1.c +++ b/arch/arm/mach-omap1/board-sx1.c @@ -8,7 +8,7 @@ * Original version : Vladimir Ananiev (Vovan888-at-gmail com) * * Maintainters : Vladimir Ananiev (aka Vovan888), Sergge -* oslik.ru +* oslik.ru * * 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 diff --git a/arch/arm/mach-omap2/gpmc.c b/arch/arm/mach-omap2/gpmc.c index 26ea9ba7d84..3c5ff959059 100644 --- a/arch/arm/mach-omap2/gpmc.c +++ b/arch/arm/mach-omap2/gpmc.c @@ -130,7 +130,7 @@ static int set_gpmc_timing_reg(int cs, int reg, int st_bit, int end_bit, if (ticks >= 1 << nr_bits) { #ifdef DEBUG printk(KERN_INFO "GPMC CS%d: %-10s* %3d ns, %3d ticks >= %d\n", - cs, name, time, ticks, 1 << nr_bits); + cs, name, time, ticks, 1 << nr_bits); #endif return -1; } @@ -141,7 +141,7 @@ static int set_gpmc_timing_reg(int cs, int reg, int st_bit, int end_bit, printk(KERN_INFO "GPMC CS%d: %-10s: %3d ticks, %3lu ns (was %3i ticks) %3d ns\n", cs, name, ticks, gpmc_get_fclk_period() * ticks / 1000, - (l >> st_bit) & mask, time); + (l >> st_bit) & mask, time); #endif l &= ~(mask << st_bit); l |= ticks << st_bit; @@ -211,7 +211,7 @@ int gpmc_cs_set_timings(int cs, const struct gpmc_timings *t) if (l & (GPMC_CONFIG1_READTYPE_SYNC | GPMC_CONFIG1_WRITETYPE_SYNC)) { #ifdef DEBUG printk(KERN_INFO "GPMC CS%d CLK period is %lu ns (div %d)\n", - cs, (div * gpmc_get_fclk_period()) / 1000, div); + cs, (div * gpmc_get_fclk_period()) / 1000, div); #endif l &= ~0x03; l |= (div - 1); diff --git a/include/asm-arm/arch-omap/board-2430sdp.h b/include/asm-arm/arch-omap/board-2430sdp.h index 3ab4aa440e8..6749ad7252d 100644 --- a/include/asm-arm/arch-omap/board-2430sdp.h +++ b/include/asm-arm/arch-omap/board-2430sdp.h @@ -4,7 +4,7 @@ * Hardware definitions for TI OMAP2430 SDP board. * * Based on board-h4.h by Dirk Behme - * + * * 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 @@ -30,7 +30,7 @@ #define __ASM_ARCH_OMAP_2430SDP_H /* Placeholder for 2430SDP specific defines */ -#define OMAP24XX_ETHR_START 0x08000300 +#define OMAP24XX_ETHR_START 0x08000300 #define OMAP24XX_ETHR_GPIO_IRQ 149 #define SDP2430_CS0_BASE 0x04000000 diff --git a/include/asm-arm/dma-mapping.h b/include/asm-arm/dma-mapping.h index 3fc4b353fec..666617711c8 100644 --- a/include/asm-arm/dma-mapping.h +++ b/include/asm-arm/dma-mapping.h @@ -4,7 +4,6 @@ #ifdef __KERNEL__ #include /* need struct page */ -#include #include -- 2.41.1