Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm

* 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm:
  [ARM] 5182/1: pxa: Fix pcm990 compilation
  [ARM] Fix explicit asm(-arm)?/arch-foo references
  [ARM] move include/asm-arm to arch/arm/include/asm
  [ARM] Remove explicit dependency for misc.o from compressed/Makefile
  [ARM] initrd: claim initrd memory exclusively
  [ARM] pxa: add support for L2 outer cache on XScale3 (attempt 2)
  [ARM] 5180/1: at91: Fix at91_nand -> atmel_nand rename fallout
  [ARM] add Sascha Hauer as Freescale i.MX Maintainer
  [ARM] i.MX: add missing clock functions exports
  [ARM] i.MX: remove set_imx_fb_info() export
  [ARM] mx1ads: make mmc platform data available for modules
  [ARM] mx2: add missing Kconfig dependency
This commit is contained in:
Linus Torvalds 2008-08-03 10:39:02 -07:00
commit 7e31aa11fc
207 changed files with 349 additions and 167 deletions

View file

@ -502,6 +502,12 @@ L: openezx-devel@lists.openezx.org (subscribers-only)
W: http://www.openezx.org/ W: http://www.openezx.org/
S: Maintained S: Maintained
ARM/FREESCALE IMX / MXC ARM ARCHITECTURE
P: Sascha Hauer
M: kernel@pengutronix.de
L: linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
S: Maintained
ARM/GLOMATION GESBC9312SX MACHINE SUPPORT ARM/GLOMATION GESBC9312SX MACHINE SUPPORT
P: Lennert Buytenhek P: Lennert Buytenhek
M: kernel@wantstofly.org M: kernel@wantstofly.org

View file

@ -112,6 +112,3 @@ $(obj)/font.c: $(FONTC)
$(obj)/vmlinux.lds: $(obj)/vmlinux.lds.in arch/arm/boot/Makefile .config $(obj)/vmlinux.lds: $(obj)/vmlinux.lds.in arch/arm/boot/Makefile .config
@sed "$(SEDFLAGS)" < $< > $@ @sed "$(SEDFLAGS)" < $< > $@
$(obj)/misc.o: $(obj)/misc.c include/asm/arch/uncompress.h lib/inflate.c

View file

@ -1,5 +1,5 @@
/* /*
* linux/include/asm-arm/assembler.h * arch/arm/include/asm/assembler.h
* *
* Copyright (C) 1996-2000 Russell King * Copyright (C) 1996-2000 Russell King
* *

View file

@ -1,5 +1,5 @@
/* /*
* linux/include/asm-arm/atomic.h * arch/arm/include/asm/atomic.h
* *
* Copyright (C) 1996 Russell King. * Copyright (C) 1996 Russell King.
* Copyright (C) 2002 Deep Blue Solutions Ltd. * Copyright (C) 2002 Deep Blue Solutions Ltd.

View file

@ -1,5 +1,5 @@
/* /*
* linux/include/asm-arm/bugs.h * arch/arm/include/asm/bugs.h
* *
* Copyright (C) 1995-2003 Russell King * Copyright (C) 1995-2003 Russell King
* *

View file

@ -1,5 +1,5 @@
/* /*
* linux/include/asm-arm/byteorder.h * arch/arm/include/asm/byteorder.h
* *
* ARM Endian-ness. In little endian mode, the data bus is connected such * ARM Endian-ness. In little endian mode, the data bus is connected such
* that byte accesses appear as: * that byte accesses appear as:

View file

@ -1,5 +1,5 @@
/* /*
* linux/include/asm-arm/cache.h * arch/arm/include/asm/cache.h
*/ */
#ifndef __ASMARM_CACHE_H #ifndef __ASMARM_CACHE_H
#define __ASMARM_CACHE_H #define __ASMARM_CACHE_H

View file

@ -1,5 +1,5 @@
/* /*
* linux/include/asm-arm/cacheflush.h * arch/arm/include/asm/cacheflush.h
* *
* Copyright (C) 1999-2002 Russell King * Copyright (C) 1999-2002 Russell King
* *

View file

@ -1,5 +1,5 @@
/* /*
* linux/include/asm-arm/checksum.h * arch/arm/include/asm/checksum.h
* *
* IP checksum routines * IP checksum routines
* *

View file

@ -1,5 +1,5 @@
/* /*
* linux/include/asm-arm/cpu-multi32.h * arch/arm/include/asm/cpu-multi32.h
* *
* Copyright (C) 2000 Russell King * Copyright (C) 2000 Russell King
* *

View file

@ -1,5 +1,5 @@
/* /*
* linux/include/asm-arm/cpu-single.h * arch/arm/include/asm/cpu-single.h
* *
* Copyright (C) 2000 Russell King * Copyright (C) 2000 Russell King
* *

View file

@ -1,5 +1,5 @@
/* /*
* linux/include/asm-arm/cpu.h * arch/arm/include/asm/cpu.h
* *
* Copyright (C) 2004-2005 ARM Ltd. * Copyright (C) 2004-2005 ARM Ltd.
* *

View file

@ -1,5 +1,5 @@
/* /*
* linux/include/asm-arm/domain.h * arch/arm/include/asm/domain.h
* *
* Copyright (C) 1999 Russell King. * Copyright (C) 1999 Russell King.
* *

View file

@ -1,5 +1,5 @@
/* /*
* linux/include/asm-arm/ecard.h * arch/arm/include/asm/ecard.h
* *
* definitions for expansion cards * definitions for expansion cards
* *

View file

@ -1,5 +1,5 @@
/* /*
* linux/include/asm-arm/fiq.h * arch/arm/include/asm/fiq.h
* *
* Support for FIQ on ARM architectures. * Support for FIQ on ARM architectures.
* Written by Philip Blundell <philb@gnu.org>, 1998 * Written by Philip Blundell <philb@gnu.org>, 1998

View file

@ -1,5 +1,5 @@
/* /*
* include/asm-arm/flat.h -- uClinux flat-format executables * arch/arm/include/asm/flat.h -- uClinux flat-format executables
*/ */
#ifndef __ARM_FLAT_H__ #ifndef __ARM_FLAT_H__

View file

@ -1,5 +1,5 @@
/* /*
* linux/include/asm-arm/floppy.h * arch/arm/include/asm/floppy.h
* *
* Copyright (C) 1996-2000 Russell King * Copyright (C) 1996-2000 Russell King
* *

View file

@ -1,5 +1,5 @@
/* /*
* linux/include/asm-arm/fpstate.h * arch/arm/include/asm/fpstate.h
* *
* Copyright (C) 1995 Russell King * Copyright (C) 1995 Russell King
* *

View file

@ -1,5 +1,5 @@
/* /*
* linux/include/asm-arm/glue.h * arch/arm/include/asm/glue.h
* *
* Copyright (C) 1997-1999 Russell King * Copyright (C) 1997-1999 Russell King
* Copyright (C) 2000-2002 Deep Blue Solutions Ltd. * Copyright (C) 2000-2002 Deep Blue Solutions Ltd.

View file

@ -1,5 +1,5 @@
/* /*
* linux/include/asm-arm/hardware.h * arch/arm/include/asm/hardware.h
* *
* Copyright (C) 1996 Russell King * Copyright (C) 1996 Russell King
* *

View file

@ -1,5 +1,5 @@
/* /*
* include/asm-arm/hardware/cache-l2x0.h * arch/arm/include/asm/hardware/cache-l2x0.h
* *
* Copyright (C) 2007 ARM Limited * Copyright (C) 2007 ARM Limited
* *

View file

@ -1,5 +1,5 @@
/* /*
* linux/include/asm-arm/hardware/clps7111.h * arch/arm/include/asm/hardware/clps7111.h
* *
* This file contains the hardware definitions of the CLPS7111 internal * This file contains the hardware definitions of the CLPS7111 internal
* registers. * registers.

View file

@ -1,5 +1,5 @@
/* /*
* linux/include/asm-arm/hardware/cs89712.h * arch/arm/include/asm/hardware/cs89712.h
* *
* This file contains the hardware definitions of the CS89712 * This file contains the hardware definitions of the CS89712
* additional internal registers. * additional internal registers.

View file

@ -1,5 +1,5 @@
/* /*
* linux/include/asm-arm/hardware/debug-8250.S * arch/arm/include/asm/hardware/debug-8250.S
* *
* Copyright (C) 1994-1999 Russell King * Copyright (C) 1994-1999 Russell King
* *

View file

@ -1,4 +1,4 @@
/* linux/include/asm-arm/hardware/debug-pl01x.S /* arch/arm/include/asm/hardware/debug-pl01x.S
* *
* Debugging macro include header * Debugging macro include header
* *

View file

@ -1,5 +1,5 @@
/* /*
* linux/include/asm-arm/hardware/dec21285.h * arch/arm/include/asm/hardware/dec21285.h
* *
* Copyright (C) 1998 Russell King * Copyright (C) 1998 Russell King
* *

View file

@ -1,5 +1,5 @@
/* /*
* include/asm-arm/hardware/entry-macro-iomd.S * arch/arm/include/asm/hardware/entry-macro-iomd.S
* *
* Low-level IRQ helper macros for IOC/IOMD based platforms * Low-level IRQ helper macros for IOC/IOMD based platforms
* *

View file

@ -1,5 +1,5 @@
/* /*
* linux/include/asm-arm/hardware/ep7211.h * arch/arm/include/asm/hardware/ep7211.h
* *
* This file contains the hardware definitions of the EP7211 internal * This file contains the hardware definitions of the EP7211 internal
* registers. * registers.

View file

@ -1,5 +1,5 @@
/* /*
* linux/include/asm-arm/hardware/ep7212.h * arch/arm/include/asm/hardware/ep7212.h
* *
* This file contains the hardware definitions of the EP7212 internal * This file contains the hardware definitions of the EP7212 internal
* registers. * registers.

View file

@ -1,5 +1,5 @@
/* /*
* linux/include/asm-arm/hardware/gic.h * arch/arm/include/asm/hardware/gic.h
* *
* Copyright (C) 2002 ARM Limited, All Rights Reserved. * Copyright (C) 2002 ARM Limited, All Rights Reserved.
* *

View file

@ -1,5 +1,5 @@
/* /*
* linux/include/asm-arm/hardware/icst307.h * arch/arm/include/asm/hardware/icst307.h
* *
* Copyright (C) 2003 Deep Blue Solutions, Ltd, All Rights Reserved. * Copyright (C) 2003 Deep Blue Solutions, Ltd, All Rights Reserved.
* *

View file

@ -1,5 +1,5 @@
/* /*
* linux/include/asm-arm/hardware/icst525.h * arch/arm/include/asm/hardware/icst525.h
* *
* Copyright (C) 2003 Deep Blue Solutions, Ltd, All Rights Reserved. * Copyright (C) 2003 Deep Blue Solutions, Ltd, All Rights Reserved.
* *

View file

@ -1,5 +1,5 @@
/* /*
* linux/include/asm-arm/hardware/ioc.h * arch/arm/include/asm/hardware/ioc.h
* *
* Copyright (C) Russell King * Copyright (C) Russell King
* *

View file

@ -1,5 +1,5 @@
/* /*
* linux/include/asm-arm/hardware/iomd.h * arch/arm/include/asm/hardware/iomd.h
* *
* Copyright (C) 1999 Russell King * Copyright (C) 1999 Russell King
* *

View file

@ -1,5 +1,5 @@
/* /*
* linux/include/asm-arm/hardware/iop3xx-gpio.h * arch/arm/include/asm/hardware/iop3xx-gpio.h
* *
* IOP3xx GPIO wrappers * IOP3xx GPIO wrappers
* *

View file

@ -1,5 +1,5 @@
/* /*
* include/asm-arm/hardware/iop3xx.h * arch/arm/include/asm/hardware/iop3xx.h
* *
* Intel IOP32X and IOP33X register definitions * Intel IOP32X and IOP33X register definitions
* *

View file

@ -1,5 +1,5 @@
/* /*
* linux/include/asm-arm/hardware/locomo.h * arch/arm/include/asm/hardware/locomo.h
* *
* This file contains the definitions for the LoCoMo G/A Chip * This file contains the definitions for the LoCoMo G/A Chip
* *

View file

@ -1,5 +1,5 @@
/* /*
* linux/include/asm-arm/hardware/memc.h * arch/arm/include/asm/hardware/memc.h
* *
* Copyright (C) Russell King. * Copyright (C) Russell King.
* *

View file

@ -1,5 +1,5 @@
/* /*
* linux/include/asm-arm/hardware/pci_v3.h * arch/arm/include/asm/hardware/pci_v3.h
* *
* Internal header file PCI V3 chip * Internal header file PCI V3 chip
* *

View file

@ -1,5 +1,5 @@
/* /*
* linux/include/asm-arm/hardware/sa1111.h * arch/arm/include/asm/hardware/sa1111.h
* *
* Copyright (C) 2000 John G Dorsey <john+@cs.cmu.edu> * Copyright (C) 2000 John G Dorsey <john+@cs.cmu.edu>
* *

View file

@ -1,5 +1,5 @@
/* /*
* linux/include/asm-arm/hardware/vic.h * arch/arm/include/asm/hardware/vic.h
* *
* Copyright (c) ARM Limited 2003. All rights reserved. * Copyright (c) ARM Limited 2003. All rights reserved.
* *

View file

@ -1,5 +1,5 @@
/* /*
* linux/include/asm-arm/ide.h * arch/arm/include/asm/ide.h
* *
* Copyright (C) 1994-1996 Linus Torvalds & authors * Copyright (C) 1994-1996 Linus Torvalds & authors
*/ */

View file

@ -1,5 +1,5 @@
/* /*
* linux/include/asm-arm/io.h * arch/arm/include/asm/io.h
* *
* Copyright (C) 1996-2000 Russell King * Copyright (C) 1996-2000 Russell King
* *

View file

@ -1,5 +1,5 @@
/* /*
* include/asm-arm/kprobes.h * arch/arm/include/asm/kprobes.h
* *
* Copyright (C) 2006, 2007 Motorola Inc. * Copyright (C) 2006, 2007 Motorola Inc.
* *

View file

@ -1,5 +1,5 @@
/* /*
* linux/include/asm-arm/leds.h * arch/arm/include/asm/leds.h
* *
* Copyright (C) 1998 Russell King * Copyright (C) 1998 Russell King
* *

View file

@ -1,5 +1,5 @@
/* /*
* linux/include/asm-arm/locks.h * arch/arm/include/asm/locks.h
* *
* Copyright (C) 2000 Russell King * Copyright (C) 2000 Russell King
* *

View file

@ -1,5 +1,5 @@
/* /*
* linux/include/asm-arm/mach/arch.h * arch/arm/include/asm/mach/arch.h
* *
* Copyright (C) 2000 Russell King * Copyright (C) 2000 Russell King
* *

View file

@ -1,5 +1,5 @@
/* /*
* linux/include/asm-arm/mach/dma.h * arch/arm/include/asm/mach/dma.h
* *
* Copyright (C) 1998-2000 Russell King * Copyright (C) 1998-2000 Russell King
* *

View file

@ -1,5 +1,5 @@
/* /*
* linux/include/asm-arm/mach/flash.h * arch/arm/include/asm/mach/flash.h
* *
* Copyright (C) 2003 Russell King, All Rights Reserved. * Copyright (C) 2003 Russell King, All Rights Reserved.
* *

View file

@ -1,5 +1,5 @@
/* /*
* linux/include/asm-arm/mach/irda.h * arch/arm/include/asm/mach/irda.h
* *
* Copyright (C) 2004 Russell King. * Copyright (C) 2004 Russell King.
* *

View file

@ -1,5 +1,5 @@
/* /*
* linux/include/asm-arm/mach/irq.h * arch/arm/include/asm/mach/irq.h
* *
* Copyright (C) 1995-2000 Russell King. * Copyright (C) 1995-2000 Russell King.
* *

View file

@ -1,5 +1,5 @@
/* /*
* linux/include/asm-arm/map.h * arch/arm/include/asm/map.h
* *
* Copyright (C) 1999-2000 Russell King * Copyright (C) 1999-2000 Russell King
* *

Some files were not shown because too many files have changed in this diff Show more