From 9bdab7b1038c7cbe9cee2a63da3b4d3bd4f922a7 Mon Sep 17 00:00:00 2001 From: Ben Dooks Date: Fri, 17 Apr 2009 12:36:47 +0100 Subject: [PATCH] --- yaml --- r: 143579 b: refs/heads/master c: 2a96ad05e93be75398871a2fce932ed234d03112 h: refs/heads/master i: 143577: 2bb24d2967dd3fcf3b5d35d0bcd08e151c1796bd 143575: a90f929dea0c9d7f4258e1192e011b507cf9a3ef v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-s3c2440/mach-osiris.c | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 4f9fb6292309..341d0367d39a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 019dbaa11db56d8e5d868e02421ff236a054c0d8 +refs/heads/master: 2a96ad05e93be75398871a2fce932ed234d03112 diff --git a/trunk/arch/arm/mach-s3c2440/mach-osiris.c b/trunk/arch/arm/mach-s3c2440/mach-osiris.c index 41a00f57e5da..c8a46685ce38 100644 --- a/trunk/arch/arm/mach-s3c2440/mach-osiris.c +++ b/trunk/arch/arm/mach-s3c2440/mach-osiris.c @@ -413,7 +413,6 @@ MACHINE_START(OSIRIS, "Simtec-OSIRIS") .io_pg_offst = (((u32)S3C24XX_VA_UART) >> 18) & 0xfffc, .boot_params = S3C2410_SDRAM_PA + 0x100, .map_io = osiris_map_io, - .init_machine = osiris_init, .init_irq = s3c24xx_init_irq, .init_machine = osiris_init, .timer = &s3c24xx_timer,