| Age | Commit message (Collapse) | Author |
|---|
|
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
|
|
> This is still a problem for s390 all{mod,yes}config as of yesterday:
>
> drivers/misc/aectc/aec_tc.c:75: error: implicit declaration of function 'ioread8'
Oops. We probably need depends on PCI.
Signed-off-by: Brandon Philips <bphilips@suse.de>
|
|
The allyesconfig build was giving this:
In file included from include/linux/gfp.h:4,
from include/linux/slab.h:14,
from include/linux/percpu.h:5,
from include2/asm/time.h:18,
from include2/asm/cputime.h:26,
from include/linux/sched.h:67,
from
arch/powerpc/kernel/asm-offsets.c:17:
include/linux/mmzone.h:791:2: error: #error Allocator MAX_ORDER exceeds SECTION_SIZE
Kconfig options are order depenendent, so move the setting of
FORCE_MAX_ZONEORDER to after the setting of PPC_64K_PAGES. Also add an
explicit !PPC_64K_PAGES.
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
|
|
Wrap PNP probe code in #ifdef CONFIG_PNP.
Without this change, we'll have unresolved references to
pnp_get_resource() function when CONFIG_PNP=n. (This is a
new interface that's not in mainline yet.)
Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com>
|
|
Wrap PNP probe code in #ifdef CONFIG_PNP.
Without this change, we'll have unresolved references to
pnp_get_resource() function when CONFIG_PNP=n. (This is a
new interface that's not in mainline yet.)
Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com>
|
|
Wrap PNP probe code in #ifdef CONFIG_PNP. We already do the same
for CONFIG_PCI.
Without this change, we'll have unresolved references to
pnp_get_resource() function when CONFIG_PNP=n. (This is a
new interface that's not in mainline yet.)
Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com>
|
|
Conflicts:
drivers/misc/Makefile
|
|
Conflicts:
drivers/base/topology.c
|
|
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
|
|
Conflicts:
Documentation/feature-removal-schedule.txt
arch/um/Kconfig.i386
arch/um/Kconfig.x86_64
arch/x86/kernel/acpi/Makefile
arch/x86/kernel/acpi/sleep.h
arch/x86/pci/acpi.c
arch/x86/pci/common.c
arch/x86/pci/pci.h
include/asm-x86/ide.h
include/asm-x86/semaphore_32.h
include/asm-x86/semaphore_64.h
include/asm-x86/trampoline.h
lib/Kconfig.debug
lib/Makefile
|
|
|
|
Conflicts:
fs/xfs/linux-2.6/xfs_ioctl.c
|
|
|
|
|
|
|
|
Conflicts:
MAINTAINERS
|
|
|
|
|
|
|
|
|
|
Conflicts:
fs/jbd2/journal.c
fs/jbd2/revoke.c
|
|
|
|
|
|
|
|
|
|
|
|
Conflicts:
lib/Kconfig.debug
|
|
Conflicts:
arch/ia64/kernel/mca.c
arch/ia64/mm/tlb.c
|
|
|
|
|
|
Conflicts:
arch/s390/lib/uaccess_pt.c
include/asm-s390/sysinfo.h
include/asm-x86/kvm_host.h
|
|
|
|
|
|
|
|
|
|
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
|
|
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
|
|
Conflicts:
arch/x86/kernel/setup_64.c
arch/x86/kernel/smpboot_64.c
include/asm-x86/smp_64.h
|
|
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
|
|
Conflicts:
drivers/infiniband/hw/amso1100/c2_provider.c
drivers/infiniband/hw/cxgb3/iwch_provider.c
drivers/infiniband/hw/nes/nes_verbs.c
|
|
Conflicts:
fs/xfs/linux-2.6/xfs_ioctl.c
fs/xfs/quota/xfs_qm_syscalls.c
fs/xfs/xfs_ialloc.c
fs/xfs/xfs_mount.c
|
|
|
|
|
|
Conflicts:
Documentation/ide/ide.txt
Documentation/kernel-parameters.txt
drivers/ide/ide.c
include/linux/Kbuild
|
|
|
|
|
|
|
|
|
|
|
|
|
