Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

[linux-2.6] / include / asm-um / common.lds.S

diff --git a/include/asm-um/common.lds.S b/include/asm-um/common.lds.S
index b16222b428218206e2e04e1dad1a2cf99ec12610..e3f010bd12b3cbaa9f724f768a884b1ae3021f3e 100644 (file)
--- a/include/asm-um/common.lds.S
+++ b/include/asm-um/common.lds.S
@@ -15,11 +15,13 @@
   PROVIDE (_unprotected_end = .);
 
   . = ALIGN(4096);
-  .note : { *(note.*) }
+  .note : { *(.note.*) }
   __start___ex_table = .;
   __ex_table : { *(__ex_table) }
   __stop___ex_table = .;
 
+  BUG_TABLE
+
   __uml_setup_start = .;
   .uml.setup.init : { *(.uml.setup.init) }
   __uml_setup_end = .;