lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
Conflicts:

	sound/pci/Kconfig
This commit is contained in:
David Woodhouse
2008-07-14 15:49:04 -07:00
parent a41eebab75 d71792ac3d
commit 751851af7a
181 changed files with 29649 additions and 50283 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
include/asm-generic/vmlinux.lds.h
View File

@@ -86,6 +86,13 @@
VMLINUX_SYMBOL(__end_pci_fixups_resume) = .; \
} \
\
/* Built-in firmware blobs */ \
.builtin_fw : AT(ADDR(.builtin_fw) - LOAD_OFFSET) { \
VMLINUX_SYMBOL(__start_builtin_fw) = .; \
*(.builtin_fw) \
VMLINUX_SYMBOL(__end_builtin_fw) = .; \
} \
\
/* RapidIO route ops */ \
.rio_route : AT(ADDR(.rio_route) - LOAD_OFFSET) { \
VMLINUX_SYMBOL(__start_rio_route_ops) = .; \