diff options
| author | David Woodhouse <David.Woodhouse@intel.com> | 2008-07-14 18:49:04 -0400 |
|---|---|---|
| committer | David Woodhouse <David.Woodhouse@intel.com> | 2008-07-14 18:51:11 -0400 |
| commit | 751851af7aae9b8bd5a60b3897209081fbc18b2b (patch) | |
| tree | 5cb8dbb71d691a760da61e319796800ee42cc1c5 /include/asm-generic | |
| parent | a41eebab7537890409ea9dfe0fcda9b5fbdb090d (diff) | |
| parent | d71792ac3d48df6693f7b339e02494efc27036c3 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Conflicts:
sound/pci/Kconfig
Diffstat (limited to 'include/asm-generic')
| -rw-r--r-- | include/asm-generic/vmlinux.lds.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/include/asm-generic/vmlinux.lds.h b/include/asm-generic/vmlinux.lds.h index f1992dc5c424..7170ad374876 100644 --- a/include/asm-generic/vmlinux.lds.h +++ b/include/asm-generic/vmlinux.lds.h | |||
| @@ -86,6 +86,13 @@ | |||
| 86 | VMLINUX_SYMBOL(__end_pci_fixups_resume) = .; \ | 86 | VMLINUX_SYMBOL(__end_pci_fixups_resume) = .; \ |
| 87 | } \ | 87 | } \ |
| 88 | \ | 88 | \ |
| 89 | /* Built-in firmware blobs */ \ | ||
| 90 | .builtin_fw : AT(ADDR(.builtin_fw) - LOAD_OFFSET) { \ | ||
| 91 | VMLINUX_SYMBOL(__start_builtin_fw) = .; \ | ||
| 92 | *(.builtin_fw) \ | ||
| 93 | VMLINUX_SYMBOL(__end_builtin_fw) = .; \ | ||
| 94 | } \ | ||
| 95 | \ | ||
| 89 | /* RapidIO route ops */ \ | 96 | /* RapidIO route ops */ \ |
| 90 | .rio_route : AT(ADDR(.rio_route) - LOAD_OFFSET) { \ | 97 | .rio_route : AT(ADDR(.rio_route) - LOAD_OFFSET) { \ |
| 91 | VMLINUX_SYMBOL(__start_rio_route_ops) = .; \ | 98 | VMLINUX_SYMBOL(__start_rio_route_ops) = .; \ |