1. 02 Jul, 2004 38 commits
  2. 01 Jul, 2004 2 commits
    • Matt Domsch's avatar
      [PATCH] EDD: x86-64 build fix · 004a3668
      Matt Domsch authored
      On Wed, Jun 30, 2004 at 01:22:21AM -0400, Jeff Garzik wrote:
      >   CC      arch/x86_64/kernel/setup.o
      > arch/x86_64/kernel/setup.c: In function `copy_edd':
      > arch/x86_64/kernel/setup.c:415: error: `EDD_MBR_SIGNATURE' undeclared=20
      > (first use in this function)
      > arch/x86_64/kernel/setup.c:415: error: (Each undeclared identifier is=20
      > reported only once
      > arch/x86_64/kernel/setup.c:415: error: for each function it appears in.)
      > arch/x86_64/kernel/setup.c:417: error: `EDD_MBR_SIG_NR' undeclared=20
      > (first use in this function)
      > make[1]: *** [arch/x86_64/kernel/setup.o] Error 1
      > make: *** [arch/x86_64/kernel] Error 2
      
      Arrgh.  On i386 it's in include/asm-i386/setup.h  On x86_64 it
      belongs in include/asm-x86_64/bootsetup.h.
      
      Patch below defines EDD_MBR_SIG_NR and EDD_MBR_SIGNATURE on x86_64.
      Signed-off-by: default avatarMatt_Domsch <Matt_Domsch@dell.com>
      004a3668
    • David S. Miller's avatar
      Merge davem@nuts.davemloft.net:/disk1/BK/net-2.6 · bf5c4064
      David S. Miller authored
      into kernel.bkbits.net:/home/davem/net-2.6
      bf5c4064