Len Brown e56d953d19 ACPI: IA64=y ACPI=n build fix ...

ia64's sim_defconfig uses CONFIG_ACPI=n
which now #define's acpi_disabled in <linux/acpi.h>

So we shouldn't re-define it here in <asm/acpi.h>

Signed-off-by: Len Brown <len.brown@intel.com>

2009-09-27 04:17:21 -04:00

..

alpha

Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-fixes

2009-09-26 10:51:54 -07:00

arm

make Linux bootable on ARM again

2009-09-26 10:06:53 -07:00

avr32

Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-next

2009-09-23 15:37:02 -07:00

blackfin

blackfin: Cleanup linker script using new linker script macros.

2009-09-24 17:16:22 -07:00

cris

Merge branch 'for-linus' of git://repo.or.cz/cris-mirror

2009-09-24 17:08:56 -07:00

frv

FRV: Flash mappings for the MB93090-MB00 motherboard

2009-09-24 17:18:38 -07:00

h8300

h8300: Cleanup linker script using new linker script macros.

2009-09-24 17:16:22 -07:00

ia64

ACPI: IA64=y ACPI=n build fix

2009-09-27 04:17:21 -04:00

m32r

Merge branch 'for-linus' of git://www.linux-m32r.org/git/takata/linux-2.6_dev

2009-09-24 17:25:09 -07:00

m68k

headers: utsname.h redux

2009-09-23 18:13:10 -07:00

m68knommu

headers: utsname.h redux

2009-09-23 18:13:10 -07:00

microblaze

Merge branch 'for-linus' of git://git.monstr.eu/linux-2.6-microblaze

2009-09-24 09:01:44 -07:00

mips

mips: fix build of vmlinux.lds

2009-09-25 19:49:27 +02:00

mn10300

mn10300: Clean up linker script using higher-level macros.

2009-09-24 17:16:22 -07:00

parisc

parisc: Remove useless altinstructions code copied from x86.

2009-09-24 17:16:21 -07:00

powerpc

Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc

2009-09-24 17:22:31 -07:00

s390

sysctl: remove "struct file *" argument of ->proc_handler

2009-09-24 07:21:04 -07:00

score

Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-next

2009-09-23 15:37:02 -07:00

sh

sh: Add support DMA Engine to SH7780

2009-09-25 12:19:33 +09:00

sparc

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6

2009-09-26 10:08:23 -07:00

um

um: Clean up linker script using standard macros.

2009-09-24 17:16:22 -07:00

x86

ACPI: fix Compaq Evo N800c (Pentium 4m) boot hang regression

2009-09-27 03:43:42 -04:00

xtensa

xtensa: Cleanup linker script using new linker script macros.

2009-09-24 17:16:21 -07:00

.gitignore

…

Kconfig

oprofile: fix oprofile regression: select RING_BUFFER_ALLOW_SWAP

2009-09-17 15:53:42 -04:00