Merge branch 'for-2.6.27' of git://git.infradead.org/users/dwmw2/firmware-2.6

* 'for-2.6.27' of git://git.infradead.org/users/dwmw2/firmware-2.6: (64 commits)
  firmware: convert sb16_csp driver to use firmware loader exclusively
  dsp56k: use request_firmware
  edgeport-ti: use request_firmware()
  edgeport: use request_firmware()
  vicam: use request_firmware()
  dabusb: use request_firmware()
  cpia2: use request_firmware()
  ip2: use request_firmware()
  firmware: convert Ambassador ATM driver to request_firmware()
  whiteheat: use request_firmware()
  ti_usb_3410_5052: use request_firmware()
  emi62: use request_firmware()
  emi26: use request_firmware()
  keyspan_pda: use request_firmware()
  keyspan: use request_firmware()
  ttusb-budget: use request_firmware()
  kaweth: use request_firmware()
  smctr: use request_firmware()
  firmware: convert ymfpci driver to use firmware loader exclusively
  firmware: convert maestro3 driver to use firmware loader exclusively
  ...

Fix up trivial conflicts with BKL removal in drivers/char/dsp56k.c and
drivers/char/ip2/ip2main.c manually.

1 files changed, 7 insertions, 0 deletions

diff --git a/include/asm-generic/vmlinux.lds.h b/include/asm-generic/vmlinux.lds.h
index bf2851f93937..b20409404c7d 100644
--- a/include/asm-generic/vmlinux.lds.h
+++ b/include/asm-generic/vmlinux.lds.h
@@ -88,6 +88,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) = .;              \