diff options
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-08-18 09:38:56 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-08-18 09:38:56 -0700 |
commit | ed72df448250a6da72b65e7881eb63c5ded3475f (patch) | |
tree | cff147d103f1578380b0c3c324630d9c75945fb3 /include/linux | |
parent | 505683675cf0ed903765f160ad633f77ab90a9d4 (diff) | |
parent | 118142080a75fc1ce599c73b7894a71b4813828e (diff) | |
download | kernel_samsung_smdk4412-ed72df448250a6da72b65e7881eb63c5ded3475f.zip kernel_samsung_smdk4412-ed72df448250a6da72b65e7881eb63c5ded3475f.tar.gz kernel_samsung_smdk4412-ed72df448250a6da72b65e7881eb63c5ded3475f.tar.bz2 |
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6:
Cross-compilation between e.g. i386 -> 64bit could break -> work around it
[IA64] Enable early console for Ski simulator
[IA64] forbid ptrace changes psr.ri to 3
[IA64] Failure to grow RBS
[IA64] Fix processor_get_freq
[IA64] SGI Altix : fix a force_interrupt bug on altix
[IA64] Update arch/ia64/configs/* s/SLAB/SLUB/
[IA64] get back PT_IA_64_UNWIND program header
[IA64] need NOTES in vmlinux.lds.S
[IA64] make unwinder stop at last frame of the bootloader
[IA64] Clean up CPE handler registration
[IA64] Include Kconfig.preempt
[IA64] SN2 needs platform specific irq_to_vector() function.
[IA64] Use atomic64_read to read an atomic64_t.
[IA64] disable irq's and check need_resched before safe_halt
Diffstat (limited to 'include/linux')
-rw-r--r-- | include/linux/mod_devicetable.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/linux/mod_devicetable.h b/include/linux/mod_devicetable.h index 2ada8ee..4dc5fa8 100644 --- a/include/linux/mod_devicetable.h +++ b/include/linux/mod_devicetable.h @@ -159,7 +159,8 @@ struct ap_device_id { #define AP_DEVICE_ID_MATCH_DEVICE_TYPE 0x01 -#define ACPI_ID_LEN 9 +#define ACPI_ID_LEN 16 /* only 9 bytes needed here, 16 bytes are used */ + /* to workaround crosscompile issues */ struct acpi_device_id { __u8 id[ACPI_ID_LEN]; |