From: Kenji Kaneshige <kaneshige.kenji@jp.fujitsu.com>

This patch adds a hook 'pcibios_disable_device()' into pci_disable_device()
to call architecture specific PCI resource deallocation code.  It's a
opposite part of pcibios_enable_device().  We need this hook to deallocate
architecture specific PCI resource such as IRQ resource, etc..  This patch
is just for adding the hook, so 'pcibios_disable_device()' is defined as a
null function on all architecture so far.

I tested this patch on i386, x86_64 and ia64.  But it has not been tested
on other architectures because I don't have these machines.
Signed-off-by: Kenji Kaneshige <kaneshige.kenji@jp.fujitsu.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>

From: Bjorn Helgaas <bjorn.helgaas@hp.com>

Now that PCI interrupts are routed in pci_enable_device(), remove the
unconditional routing previously done in pci_acpi_init().

This has the potential to break drivers that don't use pci_enable_device()
correctly, so I also added a "pci=routeirq" kernel option that restores the
previous behavior.  I intend to remove that option, along with all the code
below, in a month or so.
Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>

From: Bjorn Helgaas <bjorn.helgaas@hp.com>

Jeff Garzik pointed out that I should have propagated the error returned
from pci_enable_device() rather than making up -ENODEV.

Propagate pci_enable_device() error returns rather than using -ENODEV.
Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>

From: Bjorn Helgaas <bjorn.helgaas@hp.com>

Move the "only do this once" stuff from acpi_register_gsi() into
eisa_set_level().
Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>

into kroah.com:/home/greg/linux/BK/pci-2.6

This patch fixes 3 problems with the nommu.c support code:

1. export mem_map and vmtruncate (to make them the same as MMU version)

2. update the total_vm usage in mmap routines
   Without this the OOM killer has no "badness" points to rate
   processes on...

   This patch was originally submitted by Giovanni Casoli
   <giovanni.casoli@atengineering.it> for a 2.4.26 kernel.
   I applied it to the 2.6.9 code.

3. provide stub for arch_get_unmapped_area
Signed-off-by: Greg Ungerer <gerg@uclinux.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Add code to support the apply_relocate_add() function, needed to
support all relocation types of the m68k and Coldfire families.
This code is straight out of the m68k support for this.

Patch was originally from Christian Magnusson
<christian.magnusson@runaware.com>
Signed-off-by: Greg Ungerer <gerg@snapgear.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Remove remaining unused shglcores.h include.
Signed-off-by: Greg Ungerer <gerg@snapgear.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Remove unused shglcore.h include.
Signed-off-by: Greg Ungerer <gerg@snapgear.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Clean up the definition of HZ on m68knommu systems.
There is really only a couple of cases to handle, most
boards use the traditional 100Hz still. Only special
case out those that don't. The current code is just
spaghetti.
Signed-off-by: Greg Ungerer <gerg@snapgear.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Remove unused SHGLCORE support.
Signed-off-by: Greg Ungerer <gerg@snapgear.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Remove uneeded includes. asm/delay.h is not needed here.
Signed-off-by: Greg Ungerer <gerg@snapgear.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Remove uneeded includes. asm/delay.h is not needed here.
Signed-off-by: Greg Ungerer <gerg@snapgear.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Remove uneeded includes. asm/delay.h is not needed here.
Signed-off-by: Greg Ungerer <gerg@snapgear.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Remove unused shglcore.h include from m68knommu/mm/memory.c
That file will be removed in an upcoming patch.
Signed-off-by: Greg Ungerer <gerg@snapgear.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Remove unused shglcore.h include from m68knommu/mm/init.c
That file will be removed in an upcoming patch.
Signed-off-by: Greg Ungerer <gerg@snapgear.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Kbuild can't fix up "-I $(src)/.." to the right directory
due to the particular magic transformations it does on -I
arguments. Remove the space, use "-I$(src)/.." and it works.

Hopefully Sam will fix this build issue. 

I think somebody should dress up as scripts/Makefile.lib
for Halloween. Now _that_ would be scary.

Noted by Al Viro, superhacker and endlessly patient person.

Sign up today!

You too can become a superhacker by setting up a cross-compile
environment for all architectures and building "allmodconfig"
trees all day long to find places where others have screwed up.

If an arch Makefile overrides CROSS_COMPILE (e.g. parisc, mips, ...)
then the cc-option call in the main Makefile uses the wrong compiler 
to check for options.
Signed-off-by: Randolph Chung <tausq@debian.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

	FB_INTEL selects AGP_INTEL (i.e. intel-agp.c), which is i386-only.
AGP_INTEL itself depends on X86 && !X86_64 and for a good reason - it doesn't
build elsewhere.

	Added dependency to FB_INTEL itself; as it is allmodconfig had been
broken on everything outside i386.
Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

into ppc970.osdl.org:/home/torvalds/v2.6/linux

into ppc970.osdl.org:/home/torvalds/v2.6/linux

Host drivers should now use the scatterlist rather than accessing
the request directly.  This marks the request pointer as being
deprecated so that host driver authors get a chance to fix their
drivers up before we remove this member.

This converts the PXA MCI driver to use the supplied scatter list
rather than accessing the struct request directly, thereby making
this host driver independent of the block layer.

We also clean up the driver to use a consistent driver name for
resources.

Convert MMCI driver to use the scatter list provided by the upper
MMC layers.  This removes all knowledge of struct request from the
MMCI driver.

This is intended to remove block layer knowledge from MMC host
drivers.  Host drivers are expected to use the scatter list for
data transfers rather than accessing the struct request.

into ppc970.osdl.org:/home/torvalds/v2.6/linux

into ppc970.osdl.org:/home/torvalds/v2.6/linux

Patch from Nicolas Pitre

- eliminate difference between ARMv3 and ARMv4 versions of io-readsl
- unified little/big endian support
- misc optimisations

Signed-off-by: Nicolas Pitre 

Patch from Tony Lindgren

This patch by Dirk Behme, Todd Poynor et al adds power management
support for OMAP. Suspend works on at least 1510 and 16xx.

Signed-off-by: Tony Lindgren

Patch from Ben Dooks

This patch does the following:

- move the clock initialisation to just after the cpu init
- add the two clocks for the s3c2440
- add dclk0/1 and clkout0/1 definitions
- add list of clocks to the board specific struct
- fix initialisation of the clock control
- update handling of parent clocks for >1 parent

this fixes the following problems:

- serial console with no clock sources
- clocks specific to various boards
- hang if LCD controller enabled at start time

Signed-off-by: Ben Dooks 

Patch from Ben Dooks

Allow power managemnet support for the Simtec EB2410ITX (BAST)

Signed-off-by: Ben Dooks 

Patch from Ben Dooks

Allow the uncompressing messages to be sent to the UART
specified in the kernel configuration, instead of just
UART 0. This includes the Kconfig update to make this
option available all the time, and to rename it's
description text.

This patch also fixes s3c2440 support for the
uncompressor

Signed-off-by: Ben Dooks 

Patch from Ben Dooks

Header file for BAST Power Management unit register
definitions

Signed-off-by: Ben Dooks 

Patch from Ben Dooks

Clean warnings about unsigned long / unsigned int printk args
and update comment on debugging

Depends on patch 2134/3

Signed-off-by: Ben Dooks 

Patch from Ben Dooks

Updated default configurations for s3c2410 and bast

Signed-off-by: Ben Dooks 

Patch from Ben Dooks

Update the following in Documentation/arm/Samsing-S3C24XX/

- mtd merge update
- list of contributors
- change history

Signed-off-by: Ben Dooks 

Patch from Ben Dooks

Attached is the fix for the S3C2410_UDC_MAXP_REG
definition.

Signed-off-by: Ben Dooks 
Signed-off-by: Arnaud Patard 

Patch from Ben Dooks

Fix the mis-definition of the following registers / bits
in the s3c2410 LCD controller register header:

- S3C2410_LCDCON1_MMODE
- S3C2410_LCDCON1_ENVID
- S3C2410_LCDCON3_HBPD
- S3C2410_LCDCON3_WDLY

and adds the following missing register definitoons

- S3C2410_LCDBANK
- S3C2410_LCDBASEU
- S3C2410_OFFSIZE
- S3C2410_PAGEWIDTH

thanks to Arnaud Patard for finding these problems

Signed-off-by: Ben Dooks 
Signed-off-by: Arnaud Patard