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

Commit 49b75b87 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* 'for-linus-merged' of master.kernel.org:/home/rmk/linux-2.6-arm:
  [ARM] 5177/1: arm/mach-sa1100/Makefile: remove CONFIG_SA1100_USB
  [ARM] 5166/1: magician: add MAINTAINERS entry
  [ARM] fix pnx4008 build errors
  [ARM] Fix SMP booting with non-zero PHYS_OFFSET
  [ARM] 5185/1: Fix spi num_chipselect for lubbock
  [ARM] Move include/asm-arm/arch-* to arch/arm/*/include/mach
  [ARM] Add support for arch/arm/mach-*/include and arch/arm/plat-*/include
  [ARM] Remove asm/hardware.h, use asm/arch/hardware.h instead
  [ARM] Eliminate useless includes of asm/mach-types.h
  [ARM] Fix circular include dependency with IRQ headers
  avr32: Use <mach/foo.h> instead of <asm/arch/foo.h>
  avr32: Introduce arch/avr32/mach-*/include/mach
  avr32: Move include/asm-avr32 to arch/avr32/include/asm
  [ARM] sa1100_wdt: use reset_status to remember watchdog reset status
  [ARM] pxa: introduce reset_status and clear_reset_status for driver's usage
  [ARM] pxa: introduce reset.h for reset specific header information
parents f1c7f79b 097d9eb5

Documentation/arm/IXP4xx

+1 −1
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ Linux currently supports the following features on the IXP4xx chips: 
- Flash access (MTD/JFFS)

- I2C through GPIO on IXP42x

- GPIO for input/output/interrupts 

  See include/asm-arm/arch-ixp4xx/platform.h for access functions.

  See arch/arm/mach-ixp4xx/include/mach/platform.h for access functions.

- Timers (watchdog, OS)



The following components of the chips are not supported by Linux and

Documentation/arm/Interrupts

+1 −1
Original line number Diff line number Diff line
@@ -158,7 +158,7 @@ So, what's changed? 
   be re-checked for pending events.  (see the Neponset IRQ handler for

   details).



7. fixup_irq() is gone, as is include/asm-arm/arch-*/irq.h

7. fixup_irq() is gone, as is arch/arm/mach-*/include/mach/irq.h



Please note that this will not solve all problems - some of them are

hardware based.  Mixing level-based and edge-based IRQs on the same

Documentation/arm/README

+2 −2
Original line number Diff line number Diff line
@@ -79,7 +79,7 @@ Machine/Platform support 
  To this end, we now have arch/arm/mach-$(MACHINE) directories which are

  designed to house the non-driver files for a particular machine (eg, PCI,

  memory management, architecture definitions etc).  For all future

  machines, there should be a corresponding include/asm-arm/arch-$(MACHINE)

  machines, there should be a corresponding arch/arm/mach-$(MACHINE)/include/mach

  directory.
@@ -176,7 +176,7 @@ Kernel entry (head.S) 
  class typically based around one or more system on a chip devices, and

  acts as a natural container around the actual implementations.  These

  classes are given directories - arch/arm/mach-<class> and

  include/asm-arm/arch-<class> - which contain the source files to

  arch/arm/mach-<class> - which contain the source files to/include/mach

  support the machine class.  This directories also contain any machine

  specific supporting code.

Documentation/arm/Samsung-S3C24XX/GPIO.txt

+4 −4
Original line number Diff line number Diff line
@@ -16,13 +16,13 @@ Introduction 
Headers

-------



  See include/asm-arm/arch-s3c2410/regs-gpio.h for the list

  See arch/arm/mach-s3c2410/include/mach/regs-gpio.h for the list

  of GPIO pins, and the configuration values for them. This

  is included by using #include <asm/arch/regs-gpio.h>

  is included by using #include <mach/regs-gpio.h>



  The GPIO management functions are defined in the hardware

  header include/asm-arm/arch-s3c2410/hardware.h which can be

  included by #include <asm/arch/hardware.h>

  header arch/arm/mach-s3c2410/include/mach/hardware.h which can be

  included by #include <mach/hardware.h>



  A useful amount of documentation can be found in the hardware

  header on how the GPIO functions (and others) work.

Documentation/arm/Samsung-S3C24XX/Overview.txt

+1 −1
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ Layout 
  in arch/arm/mach-s3c2410 and S3C2440 in arch/arm/mach-s3c2440



  Register, kernel and platform data definitions are held in the

  include/asm-arm/arch-s3c2410 directory.

  arch/arm/mach-s3c2410 directory./include/mach





Machines