Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5a05e5bf authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge master.kernel.org:/home/rmk/linux-2.6-arm 

* master.kernel.org:/home/rmk/linux-2.6-arm:
  [ARM] 3778/1: S3C24XX: remove changelogs from include/asm-arm/arch-s3c2410 [simtec]
  [ARM] 3783/1: S3C2412: fix IRQ_EINT0 to IRQ_EINT3 handling
  [ARM] 3779/1: S3C24XX: remove changelogs from include/asm-arm/arch-s3c2410 [left]
  [ARM] 3777/1: S3C24XX:  remove changelogs from include/asm-arm/arch-s3c2410 [regs-*.h]
  [ARM] 3776/1: S3C24XX: remove changelogs from include/asm-arm/arch-s3c2410
  [ARM] 3775/1: S3C24XX: do not add same sysdev_driver to two classes
  [ARM] 3774/1: S3C24XX: SMDK2413 has two machine IDs
  [ARM] 3773/1: Add the HWCAP_VFP bit for the ARM926 CPUs
  [ARM] 3772/1: Fix compilation error in mach-ixp4xx/nslu2*
  [ARM] 3767/1: S3C24XX: remove changelog comments from arch/arm/mach-s3c2410
  [ARM] 3766/1: Fix typo in ARM _raw_read_trylock
parents 08a55c01 d17f901d

arch/arm/mach-ixp4xx/nslu2-pci.c

+1 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 


#include <linux/pci.h>

#include <linux/init.h>

#include <linux/irq.h>



#include <asm/mach/pci.h>

#include <asm/mach-types.h>

arch/arm/mach-ixp4xx/nslu2-power.c

+1 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 


#include <linux/module.h>

#include <linux/reboot.h>

#include <linux/irq.h>

#include <linux/interrupt.h>

#include <linux/reboot.h>

arch/arm/mach-s3c2410/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ obj-$(CONFIG_PM_SIMTEC) += pm-simtec.o 


# S3C2412 support

obj-$(CONFIG_CPU_S3C2412)	+= s3c2412.o

obj-$(CONFIG_CPU_S3C2412)	+= s3c2412-irq.o

obj-$(CONFIG_CPU_S3C2412)	+= s3c2412-clock.o



#

arch/arm/mach-s3c2410/cpu.h

+0 −10
Original line number Diff line number Diff line
@@ -8,16 +8,6 @@ 
 * 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.

 *

 * Modifications:

 *     24-Aug-2004 BJD  Start of generic S3C24XX support

 *     18-Oct-2004 BJD  Moved board struct into this file

 *     04-Jan-2005 BJD  New uart initialisation

 *     10-Jan-2005 BJD  Moved generic init here, specific to cpu headers

 *     14-Jan-2005 BJD  Added s3c24xx_init_clocks() call

 *     10-Mar-2005 LCVR Changed S3C2410_{VA,SZ} to S3C24XX_{VA,SZ} & IODESC_ENT

 *     14-Mar-2005 BJD  Updated for __iomem

 *     15-Jan-2006 LCVR Updated S3C2410_PA_##x to new S3C24XX_PA_##x macro

*/



/* todo - fix when rmk changes iodescs to use `void __iomem *` */

arch/arm/mach-s3c2410/devs.c

+2 −10
Original line number Diff line number Diff line
@@ -3,20 +3,12 @@ 
 * Copyright (c) 2004 Simtec Electronics

 *	Ben Dooks <ben@simtec.co.uk>

 *

 * Base S3C2410 platform device definitions

 * Base S3C24XX platform device definitions

 *

 * 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.

 *

 * Modifications:

 *     15-Jan-2006 LCVR Using S3C24XX_PA_##x macro for common S3C24XX devices

 *     10-Mar-2005 LCVR Changed S3C2410_{VA,SZ} to S3C24XX_{VA,SZ}

 *     10-Feb-2005 BJD  Added camera from guillaume.gourat@nexvision.tv

 *     29-Aug-2004 BJD  Added timers 0 through 3

 *     29-Aug-2004 BJD  Changed index of devices we only have one of to -1

 *     21-Aug-2004 BJD  Added IRQ_TICK to RTC resources

 *     18-Aug-2004 BJD  Created initial version

*/



#include <linux/kernel.h>