From ad594f38bd52537c014722708f40b7350c445adc Mon Sep 17 00:00:00 2001 From: Greg Ungerer Date: Tue, 23 Oct 2007 14:37:54 +1000 Subject: [PATCH] --- yaml --- r: 72163 b: refs/heads/master c: 293dba4b4acdfed75f92600792b5a00a942edc60 h: refs/heads/master i: 72161: 283318b1d7da2be9d44f75c02b831342e9e83193 72159: e329fae7f62f33626e063ee30a1966d4548c6e76 v: v3 --- [refs] | 2 +- trunk/arch/m68knommu/kernel/setup.c | 12 ------------ 2 files changed, 1 insertion(+), 13 deletions(-) diff --git a/[refs] b/[refs] index 442588c3ec81..9921cf42cb2f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: be6cb66da76fe089a4032a85c3825223a2216beb +refs/heads/master: 293dba4b4acdfed75f92600792b5a00a942edc60 diff --git a/trunk/arch/m68knommu/kernel/setup.c b/trunk/arch/m68knommu/kernel/setup.c index b2355eb0a412..de7732903763 100644 --- a/trunk/arch/m68knommu/kernel/setup.c +++ b/trunk/arch/m68knommu/kernel/setup.c @@ -151,27 +151,15 @@ void setup_arch(char **cmdline_p) #ifdef CONFIG_ELITE printk(KERN_INFO "Modified for M5206eLITE by Rob Scott, rscott@mtrob.fdns.net\n"); #endif -#ifdef CONFIG_TELOS - printk(KERN_INFO "Modified for Omnia ToolVox by James D. Schettine, james@telos-systems.com\n"); -#endif #endif printk(KERN_INFO "Flat model support (C) 1998,1999 Kenneth Albanowski, D. Jeff Dionne\n"); #if defined( CONFIG_PILOT ) && defined( CONFIG_M68328 ) printk(KERN_INFO "TRG SuperPilot FLASH card support \n"); #endif - #if defined( CONFIG_PILOT ) && defined( CONFIG_M68EZ328 ) printk(KERN_INFO "PalmV support by Lineo Inc. \n"); #endif - -#ifdef CONFIG_M68EZ328ADS - printk(KERN_INFO "M68EZ328ADS board support (C) 1999 Vladimir Gurevich \n"); -#endif - -#ifdef CONFIG_ALMA_ANS - printk(KERN_INFO "Alma Electronics board support (C) 1999 Vladimir Gurevich \n"); -#endif #if defined (CONFIG_M68360) printk(KERN_INFO "QUICC port done by SED Systems ,\n"); printk(KERN_INFO "based on 2.0.38 port by Lineo Inc. .\n");