Commit 0bc0748d authored by Steven Whitehouse's avatar Steven Whitehouse
Browse files

Merge branch 'master' into gfs2

parents b6397893 95064a75

Makefile

+1 −1
Original line number Diff line number Diff line 
VERSION = 2

PATCHLEVEL = 6

SUBLEVEL = 18

EXTRAVERSION = -rc6

EXTRAVERSION = -rc7

NAME=Crazed Snow-Weasel



# *DOCUMENTATION*

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 *` */