git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
linux 2.6.16.38 w/ vs2.0.3-rc1
[linux-2.6.git]
/
arch
/
arm
/
mach-s3c2410
/
mach-smdk2410.c
diff --git
a/arch/arm/mach-s3c2410/mach-smdk2410.c
b/arch/arm/mach-s3c2410/mach-smdk2410.c
index
2db932d
..
1e76e1f
100644
(file)
--- a/
arch/arm/mach-s3c2410/mach-smdk2410.c
+++ b/
arch/arm/mach-s3c2410/mach-smdk2410.c
@@
-28,8
+28,7
@@
* Ben Dooks <ben@simtec.co.uk>
*
* 10-Mar-2005 LCVR Changed S3C2410_VA to S3C24XX_VA
* Ben Dooks <ben@simtec.co.uk>
*
* 10-Mar-2005 LCVR Changed S3C2410_VA to S3C24XX_VA
- * 20-Sep-2005 BJD Added static to non-exported items
- * 01-Apr-2006 BJD Moved init code to common smdk
+ * 20-Sep-2005 BJD Added static to non-exported items
*
***********************************************************************/
*
***********************************************************************/
@@
-55,8
+54,6
@@
#include "devs.h"
#include "cpu.h"
#include "devs.h"
#include "cpu.h"
-#include "common-smdk.h"
-
static struct map_desc smdk2410_iodesc[] __initdata = {
/* nothing here yet */
};
static struct map_desc smdk2410_iodesc[] __initdata = {
/* nothing here yet */
};
@@
-110,6
+107,11
@@
static void __init smdk2410_map_io(void)
s3c24xx_set_board(&smdk2410_board);
}
s3c24xx_set_board(&smdk2410_board);
}
+static void __init smdk2410_init_irq(void)
+{
+ s3c24xx_init_irq();
+}
+
MACHINE_START(SMDK2410, "SMDK2410") /* @TODO: request a new identifier and switch
* to SMDK2410 */
/* Maintainer: Jonas Dietsche */
MACHINE_START(SMDK2410, "SMDK2410") /* @TODO: request a new identifier and switch
* to SMDK2410 */
/* Maintainer: Jonas Dietsche */
@@
-117,8
+119,7
@@
MACHINE_START(SMDK2410, "SMDK2410") /* @TODO: request a new identifier and switc
.io_pg_offst = (((u32)S3C24XX_VA_UART) >> 18) & 0xfffc,
.boot_params = S3C2410_SDRAM_PA + 0x100,
.map_io = smdk2410_map_io,
.io_pg_offst = (((u32)S3C24XX_VA_UART) >> 18) & 0xfffc,
.boot_params = S3C2410_SDRAM_PA + 0x100,
.map_io = smdk2410_map_io,
- .init_irq = s3c24xx_init_irq,
- .init_machine = smdk_machine_init,
+ .init_irq = smdk2410_init_irq,
.timer = &s3c24xx_timer,
MACHINE_END
.timer = &s3c24xx_timer,
MACHINE_END