[kernel] r19078 - dists/sid/linux/debian/patches/debian

[Ben Hutchings]

Author: benh
Date: Mon Jun  4 00:11:03 2012
New Revision: 19078

Log:
Refresh some Debian-specific patches

Modified:
   dists/sid/linux/debian/patches/debian/arch-sh4-fix-uimage-build.patch
   dists/sid/linux/debian/patches/debian/bcma-Do-not-claim-PCI-device-IDs-also-claimed-by-brc.patch
   dists/sid/linux/debian/patches/debian/kernelvariables.patch
   dists/sid/linux/debian/patches/debian/version.patch

Modified: dists/sid/linux/debian/patches/debian/arch-sh4-fix-uimage-build.patch
==============================================================================
--- dists/sid/linux/debian/patches/debian/arch-sh4-fix-uimage-build.patch	Sun Jun  3 23:29:42 2012	(r19077)
+++ dists/sid/linux/debian/patches/debian/arch-sh4-fix-uimage-build.patch	Mon Jun  4 00:11:03 2012	(r19078)
@@ -1,5 +1,5 @@
---- a/arch/sh/Makefile	2009-12-03 12:51:21.000000000 +0900
-+++ b/arch/sh/Makefile	2010-02-04 15:47:57.000000000 +0900
+--- a/arch/sh/Makefile
++++ b/arch/sh/Makefile
 @@ -75,7 +75,6 @@
  
  # Give the various platforms the opportunity to set default image types
@@ -7,4 +7,4 @@
 -defaultimage-$(CONFIG_SH_SH7785LCR)		:= uImage
  defaultimage-$(CONFIG_SH_RSK)			:= uImage
  defaultimage-$(CONFIG_SH_URQUELL)		:= uImage
- defaultimage-$(CONFIG_SH_7206_SOLUTION_ENGINE)	:= vmlinux
+ defaultimage-$(CONFIG_SH_MIGOR)			:= uImage

Modified: dists/sid/linux/debian/patches/debian/bcma-Do-not-claim-PCI-device-IDs-also-claimed-by-brc.patch
==============================================================================
--- dists/sid/linux/debian/patches/debian/bcma-Do-not-claim-PCI-device-IDs-also-claimed-by-brc.patch	Sun Jun  3 23:29:42 2012	(r19077)
+++ dists/sid/linux/debian/patches/debian/bcma-Do-not-claim-PCI-device-IDs-also-claimed-by-brc.patch	Mon Jun  4 00:11:03 2012	(r19078)
@@ -12,12 +12,10 @@
  drivers/net/wireless/brcm80211/Kconfig |    1 -
  2 files changed, 3 insertions(+), 2 deletions(-)
 
-diff --git a/drivers/bcma/host_pci.c b/drivers/bcma/host_pci.c
-index 1b51d8b..1f43cd4 100644
 --- a/drivers/bcma/host_pci.c
 +++ b/drivers/bcma/host_pci.c
-@@ -225,11 +225,13 @@ static void bcma_host_pci_remove(struct pci_dev *dev)
- }
+@@ -263,11 +263,13 @@
+ #endif /* CONFIG_PM */
  
  static DEFINE_PCI_DEVICE_TABLE(bcma_pci_bridge_tbl) = {
 +#if !IS_ENABLED(CONFIG_BRCMSMAC)
@@ -31,11 +29,9 @@
  	{ 0, },
  };
  MODULE_DEVICE_TABLE(pci, bcma_pci_bridge_tbl);
-diff --git a/drivers/net/wireless/brcm80211/Kconfig b/drivers/net/wireless/brcm80211/Kconfig
-index 2069fc8..d5784ee 100644
 --- a/drivers/net/wireless/brcm80211/Kconfig
 +++ b/drivers/net/wireless/brcm80211/Kconfig
-@@ -5,7 +5,6 @@ config BRCMSMAC
+@@ -5,7 +5,6 @@
  	tristate "Broadcom IEEE802.11n PCIe SoftMAC WLAN driver"
  	depends on PCI
  	depends on MAC80211
@@ -43,6 +39,3 @@
  	select BRCMUTIL
  	select FW_LOADER
  	select CRC_CCITT
--- 
-1.7.7.3
-

Modified: dists/sid/linux/debian/patches/debian/kernelvariables.patch
==============================================================================
--- dists/sid/linux/debian/patches/debian/kernelvariables.patch	Sun Jun  3 23:29:42 2012	(r19077)
+++ dists/sid/linux/debian/patches/debian/kernelvariables.patch	Mon Jun  4 00:11:03 2012	(r19078)
@@ -13,8 +13,8 @@
 
 --- a/Makefile
 +++ b/Makefile
-@@ -198,46 +198,6 @@
- CROSS_COMPILE	?=
+@@ -195,46 +195,6 @@
+ ARCH		?= $(SUBARCH)
  CROSS_COMPILE	?= $(CONFIG_CROSS_COMPILE:"%"=%)
  
 -# Architecture as present in compile.h
@@ -60,7 +60,7 @@
  KCONFIG_CONFIG	?= .config
  export KCONFIG_CONFIG
  
-@@ -354,6 +314,44 @@ LDFLAGS_MODULE  =
+@@ -354,6 +314,44 @@
  AFLAGS_KERNEL	=
  CFLAGS_GCOV	= -fprofile-arcs -ftest-coverage
  

Modified: dists/sid/linux/debian/patches/debian/version.patch
==============================================================================
--- dists/sid/linux/debian/patches/debian/version.patch	Sun Jun  3 23:29:42 2012	(r19077)
+++ dists/sid/linux/debian/patches/debian/version.patch	Mon Jun  4 00:11:03 2012	(r19078)
@@ -22,7 +22,7 @@
 
 --- a/init/version.c
 +++ b/init/version.c
-@@ -36,12 +36,31 @@ struct uts_namespace init_uts_ns = {
+@@ -37,12 +37,31 @@
  };
  EXPORT_SYMBOL_GPL(init_uts_ns);
  
@@ -59,7 +59,7 @@
  	" (" LINUX_COMPILER ") %s\n";
 --- a/scripts/mkcompile_h
 +++ b/scripts/mkcompile_h
-@@ -73,7 +73,25 @@ UTS_TRUNCATE="sed -e s/\(.\{1,$UTS_LEN\}\).*/\1/"
+@@ -73,8 +73,26 @@
  
    echo \#define UTS_VERSION \"`echo $UTS_VERSION | $UTS_TRUNCATE`\"
  
@@ -87,3 +87,4 @@
 +  fi
  
    echo \#define LINUX_COMPILER \"`$CC -v 2>&1 | tail -n 1`\"
+ ) > .tmpcompile