diff options
author | Jonas Bonn <jonas.bonn@gmail.com> | 2008-11-19 17:11:22 +0000 |
---|---|---|
committer | Andy Green <agreen@pads.home.warmcat.com> | 2008-11-19 17:11:22 +0000 |
commit | 8466b6200dcae5b7c219493c59639d10ea391bed (patch) | |
tree | d66428886ca770a6996523f3ed8fd90ef2c944bc | |
parent | 87e863f323a3933b56a4cd1128a9f868ddea8bcc (diff) |
GTA01: Build fixes
Some header files have moved so update #includes.
devs.h has been moved and updated. Delete the old version at
include/asm-arm/plat-s3c24xx as it is no longer used. Nothing to
migrate from this file to the new file at the new location.
s3c_device_i2c has become s3c_device_i2c0
Signed-off-by: Jonas Bonn <jonas.bonn@gmail.com>
-rw-r--r-- | arch/arm/mach-s3c2410/mach-gta01.c | 8 | ||||
-rw-r--r-- | include/asm-arm/plat-s3c24xx/devs.h | 50 |
2 files changed, 4 insertions, 54 deletions
diff --git a/arch/arm/mach-s3c2410/mach-gta01.c b/arch/arm/mach-s3c2410/mach-gta01.c index db9fd082146..93389649f7d 100644 --- a/arch/arm/mach-s3c2410/mach-gta01.c +++ b/arch/arm/mach-s3c2410/mach-gta01.c @@ -68,11 +68,11 @@ #include <mach/gta01.h> #include <plat/regs-serial.h> -#include <asm/plat-s3c/nand.h> -#include <asm/plat-s3c24xx/devs.h> +#include <plat/nand.h> +#include <plat/devs.h> #include <plat/cpu.h> #include <plat/pm.h> -#include <asm/plat-s3c24xx/udc.h> +#include <plat/udc.h> #include <asm/plat-s3c24xx/neo1973.h> #include <mach/neo1973-pm-gsm.h> @@ -378,7 +378,7 @@ static struct platform_device *gta01_devices[] __initdata = { &s3c_device_usb, &s3c_device_lcd, &s3c_device_wdt, - &s3c_device_i2c, + &s3c_device_i2c0, &s3c_device_iis, &s3c_device_sdi, &s3c_device_usbgadget, diff --git a/include/asm-arm/plat-s3c24xx/devs.h b/include/asm-arm/plat-s3c24xx/devs.h deleted file mode 100644 index f89b9f800e1..00000000000 --- a/include/asm-arm/plat-s3c24xx/devs.h +++ /dev/null @@ -1,50 +0,0 @@ -/* linux/include/asm-arm/plat-s3c24xx/devs.h - * - * Copyright (c) 2004 Simtec Electronics - * Ben Dooks <ben@simtec.co.uk> - * - * Header file for s3c2410 standard platform devices - * - * 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. -*/ -#include <linux/platform_device.h> - -struct s3c24xx_uart_resources { - struct resource *resources; - unsigned long nr_resources; -}; - -extern struct s3c24xx_uart_resources s3c2410_uart_resources[]; - -extern struct platform_device *s3c24xx_uart_devs[]; -extern struct platform_device *s3c24xx_uart_src[]; - -extern struct platform_device s3c_device_timer[]; - -extern struct platform_device s3c_device_usb; -extern struct platform_device s3c_device_lcd; -extern struct platform_device s3c_device_wdt; -extern struct platform_device s3c_device_i2c; -extern struct platform_device s3c_device_iis; -extern struct platform_device s3c_device_rtc; -extern struct platform_device s3c_device_adc; -extern struct platform_device s3c_device_sdi; -extern struct platform_device s3c_device_hsmmc; - -extern struct platform_device s3c_device_spi0; -extern struct platform_device s3c_device_spi1; - -extern struct platform_device s3c_device_nand; - -extern struct platform_device s3c_device_usbgadget; -extern struct platform_device s3c_device_ts; - -/* s3c2440 specific devices */ - -#ifdef CONFIG_CPU_S3C2440 - -extern struct platform_device s3c_device_camif; - -#endif |