1. 30 Mar, 2009 38 commits
  2. 29 Mar, 2009 2 commits
    • Linus Torvalds's avatar
      Merge branch 'bzip2-lzma-for-linus' of... · 0d34fb8e
      Linus Torvalds authored
      Merge branch 'bzip2-lzma-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-tip
      
      * 'bzip2-lzma-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-tip:
        bzip2/lzma: don't ask for compression mode for the default initramfs
        bzip2/lzma: consistently capitalize LZMA in Kconfig
        bzip2/lzma: clarify the meaning of the CONFIG_RD_ options
        bzip2/lzma: move CONFIG_RD_* options under CONFIG_EMBEDDED
      0d34fb8e
    • Ralf Baechle's avatar
      Fix build error in <linux/irq.h> · 503e5763
      Ralf Baechle authored
      <linux/irq.h> relies on <linux/gfp.h> and <linux/topology.h> having been
      included previous.  If not, the errors like below will result.
      
          CC      arch/mips/mti-malta/malta-int.o
        In file included from arch/mips/mti-malta/malta-int.c:25:
        include/linux/irq.h: In function ‘init_alloc_desc_masks’:
        include/linux/irq.h:444: error: implicit declaration of function ‘cpu_to_node’
        include/linux/irq.h:446: error: ‘GFP_ATOMIC’ undeclared (first use in this function)
        include/linux/irq.h:446: error: (Each undeclared identifier is reported only once
        include/linux/irq.h:446: error: for each function it appears in.)
        make[3]: *** [arch/mips/mti-malta/malta-int.o] Error 1
        make[2]: *** [arch/mips/mti-malta] Error 2
        make[1]: *** [sub-make] Error 2
      
      Fixed by including the two missing headers.
      Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      503e5763