---

yaml
---
r: 19859
b: refs/heads/master
c: 471ef05
h: refs/heads/master
i:
  19857: 9ba5098
  19855: 11f5b40
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: eeb059e0a69369753b3e45426958f751f0b8fc89
+refs/heads/master: 471ef051bc3b980e2f38cbe9112eac7bfe4d6633

trunk/Makefile

@@ -442,7 +442,7 @@ export KBUILD_DEFCONFIG
 config %config: scripts_basic outputmakefile FORCE
 	$(Q)mkdir -p include/linux
 	$(Q)$(MAKE) $(build)=scripts/kconfig $@
-	$(Q)$(MAKE) -C $(srctree) KBUILD_SRC= .kernelrelease
+	$(Q)$(MAKE) .kernelrelease
 
 else
 # ===========================================================================

trunk/arch/cris/Makefile

@@ -119,7 +119,7 @@ $(SRC_ARCH)/.links:
 	@ln -sfn $(SRC_ARCH)/$(SARCH)/lib $(SRC_ARCH)/lib
 	@ln -sfn $(SRC_ARCH)/$(SARCH) $(SRC_ARCH)/arch
 	@ln -sfn $(SRC_ARCH)/$(SARCH)/vmlinux.lds.S $(SRC_ARCH)/kernel/vmlinux.lds.S
-	@ln -sfn $(SRC_ARCH)/$(SARCH)/kernel/asm-offsets.c $(SRC_ARCH)/kernel/asm-offsets.c
+	@ln -sfn $(SRC_ARCH)/$(SARCH)/asm-offsets.c $(SRC_ARCH)/kernel/asm-offsets.c
 	@touch $@
 
 # Create link to sub arch includes

trunk/drivers/net/e100.c

@@ -2752,8 +2752,6 @@ static int e100_resume(struct pci_dev *pdev)
 	retval = pci_enable_wake(pdev, 0, 0);
 	if (retval)
 		DPRINTK(PROBE,ERR, "Error clearing wake events\n");
-	if(e100_hw_init(nic))
-		DPRINTK(HW, ERR, "e100_hw_init failed\n");
 
 	netif_device_attach(netdev);
 	if(netif_running(netdev))

trunk/scripts/kconfig/lxdialog/Makefile

@@ -2,11 +2,8 @@
 #
 
 check-lxdialog  := $(srctree)/$(src)/check-lxdialog.sh
-
-# Use reursively expanded variables so we do not call gcc unless
-# we really need to do so. (Do not call gcc as part of make mrproper)
-HOST_EXTRACFLAGS = $(shell $(CONFIG_SHELL) $(check-lxdialog) -ccflags)
-HOST_LOADLIBES   = $(shell $(CONFIG_SHELL) $(check-lxdialog) -ldflags $(HOSTCC))
+HOST_EXTRACFLAGS:= $(shell $(CONFIG_SHELL) $(check-lxdialog) -ccflags)
+HOST_LOADLIBES  := $(shell $(CONFIG_SHELL) $(check-lxdialog) -ldflags $(HOSTCC))
 
 HOST_EXTRACFLAGS += -DLOCALE 
 

trunk/scripts/kconfig/lxdialog/check-lxdialog.sh

@@ -4,17 +4,17 @@
 # What library to link
 ldflags()
 {
-	$cc -print-file-name=libncursesw.so | grep -q /
+	echo "main() {}" | $cc -lncursesw -xc - -o /dev/null 2> /dev/null
 	if [ $? -eq 0 ]; then
 		echo '-lncursesw'
 		exit
 	fi
-	$cc -print-file-name=libncurses.so | grep -q /
+	echo "main() {}" | $cc -lncurses -xc - -o /dev/null 2> /dev/null
 	if [ $? -eq 0 ]; then
 		echo '-lncurses'
 		exit
 	fi
-	$cc -print-file-name=libcurses.so | grep -q /
+	echo "main() {}" | $cc -lcurses -xc - -o /dev/null 2> /dev/null
 	if [ $? -eq 0 ]; then
 		echo '-lcurses'
 		exit
@@ -36,13 +36,10 @@ ccflags()
 	fi
 }
 
-# Temp file, try to clean up after us
-tmp=.lxdialog.tmp
-trap "rm -f $tmp" 0 1 2 3 15
-
+compiler=""
 # Check if we can link to ncurses
 check() {
-	echo "main() {}" | $cc -xc - -o $tmp 2> /dev/null
+	echo "main() {}" | $cc -xc - -o /dev/null 2> /dev/null
 	if [ $? != 0 ]; then
 		echo " *** Unable to find the ncurses libraries."          1>&2
 		echo " *** make menuconfig require the ncurses libraries"  1>&2
@@ -62,7 +59,6 @@ if [ $# == 0 ]; then
 	exit 1
 fi
 
-cc=""
 case "$1" in
 	"-check")
 		shift