From 9b72847a0df599447b5ecd2b210485a3417c112d Mon Sep 17 00:00:00 2001
From: "Luis R. Rodriguez" <mcgrof@frijolero.org>
Date: Mon, 23 Apr 2012 18:58:47 -0700
Subject: [PATCH] compat-wireless: adjust pr_fmt patch some more

Only printk.h is neeeded, no need to include kernel.h

mcgrof@flash ~/devel/compat-wireless (git::master)$ time ckmake; time ckmake
Trying kernel                  3.4.0-030400rc4-generic  [OK]
Trying kernel                     3.3.3-030303-generic  [OK]
Trying kernel                     3.2.2-030202-generic  [OK]
Trying kernel                    3.1.10-030110-generic  [OK]
Trying kernel                    3.0.18-030018-generic  [OK]
Trying kernel                  2.6.39-02063904-generic  [OK]
Trying kernel                  2.6.38-02063808-generic  [OK]
Trying kernel                  2.6.37-02063706-generic  [OK]
Trying kernel                  2.6.36-02063604-generic  [OK]
Trying kernel                  2.6.35-02063512-generic  [OK]
Trying kernel                  2.6.34-02063410-generic  [OK]
Trying kernel                  2.6.33-02063305-generic  [OK]
Trying kernel                  2.6.32-02063255-generic  [OK]
Trying kernel                  2.6.31-02063113-generic  [OK]
Trying kernel                  2.6.30-02063010-generic  [OK]
Trying kernel                  2.6.29-02062906-generic  [OK]
Trying kernel                  2.6.28-02062810-generic  [OK]
Trying kernel                    2.6.27-020627-generic  [OK]
Trying kernel                    2.6.26-020626-generic  [OK]
Trying kernel                    2.6.25-020625-generic  [OK]
Trying kernel                    2.6.24-020624-generic  [OK]

real    94m39.991s
user    287m51.955s
sys     26m37.828s

real    18m20.621s
user    41m8.998s
sys     8m59.742s

Signed-off-by: Luis R. Rodriguez <mcgrof@frijolero.org>
---
 patches/53-pr_fmt.patch | 74 ++++++++++++++---------------------------
 1 file changed, 25 insertions(+), 49 deletions(-)

diff --git a/patches/53-pr_fmt.patch b/patches/53-pr_fmt.patch
index 128737ac7db8..b759bea915df 100644
--- a/patches/53-pr_fmt.patch
+++ b/patches/53-pr_fmt.patch
@@ -3,7 +3,7 @@ compiler warnings. This is going to be sent upstream.
 
 --- a/drivers/bcma/bcma_private.h
 +++ b/drivers/bcma/bcma_private.h
-@@ -1,10 +1,11 @@
+@@ -1,10 +1,10 @@
  #ifndef LINUX_BCMA_PRIVATE_H_
  #define LINUX_BCMA_PRIVATE_H_
  
@@ -12,7 +12,6 @@ compiler warnings. This is going to be sent upstream.
  #define pr_fmt(fmt)		KBUILD_MODNAME ": " fmt
 -#endif
  
-+#include <linux/kernel.h>
 +#include <linux/printk.h>
  #include <linux/bcma/bcma.h>
  #include <linux/delay.h>
@@ -61,28 +60,26 @@ compiler warnings. This is going to be sent upstream.
  #include <linux/pci.h>
 --- a/drivers/net/wireless/libertas/cfg.c
 +++ b/drivers/net/wireless/libertas/cfg.c
-@@ -6,8 +6,11 @@
+@@ -6,8 +6,10 @@
   *
   */
  
 +#undef pr_fmt
  #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
  
-+#include <linux/kernel.h>
 +#include <linux/printk.h>
  #include <linux/hardirq.h>
  #include <linux/sched.h>
  #include <linux/wait.h>
 --- a/drivers/net/wireless/libertas/if_usb.c
 +++ b/drivers/net/wireless/libertas/if_usb.c
-@@ -2,8 +2,11 @@
+@@ -2,8 +2,10 @@
   * This file contains functions used in USB interface module.
   */
  
 +#undef pr_fmt
  #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
  
-+#include <linux/kernel.h>
 +#include <linux/printk.h>
  #include <linux/delay.h>
  #include <linux/module.h>
@@ -103,88 +100,82 @@ compiler warnings. This is going to be sent upstream.
  #include <linux/firmware.h>
 --- a/drivers/net/wireless/libertas/if_spi.c
 +++ b/drivers/net/wireless/libertas/if_spi.c
-@@ -17,8 +17,11 @@
+@@ -17,8 +17,10 @@
   * (at your option) any later version.
   */
  
 +#undef pr_fmt
  #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
  
-+#include <linux/kernel.h>
 +#include <linux/printk.h>
  #include <linux/hardirq.h>
  #include <linux/interrupt.h>
  #include <linux/module.h>
 --- a/drivers/net/wireless/libertas/rx.c
 +++ b/drivers/net/wireless/libertas/rx.c
-@@ -2,8 +2,11 @@
+@@ -2,8 +2,10 @@
   * This file contains the handling of RX in wlan driver.
   */
  
 +#undef pr_fmt
  #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
  
-+#include <linux/kernel.h>
 +#include <linux/printk.h>
  #include <linux/etherdevice.h>
  #include <linux/hardirq.h>
  #include <linux/slab.h>
 --- a/drivers/net/wireless/libertas/if_cs.c
 +++ b/drivers/net/wireless/libertas/if_cs.c
-@@ -21,8 +21,11 @@
+@@ -21,8 +21,10 @@
  
  */
  
 +#undef pr_fmt
  #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
  
-+#include <linux/kernel.h>
 +#include <linux/printk.h>
  #include <linux/module.h>
  #include <linux/slab.h>
  #include <linux/delay.h>
 --- a/drivers/net/wireless/libertas/mesh.c
 +++ b/drivers/net/wireless/libertas/mesh.c
-@@ -1,5 +1,8 @@
+@@ -1,5 +1,7 @@
 +#undef pr_fmt
  #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
  
-+#include <linux/kernel.h>
 +#include <linux/printk.h>
  #include <linux/delay.h>
  #include <linux/etherdevice.h>
  #include <linux/hardirq.h>
 --- a/drivers/net/wireless/libertas/main.c
 +++ b/drivers/net/wireless/libertas/main.c
-@@ -4,8 +4,11 @@
+@@ -4,8 +4,10 @@
   * thread etc..
   */
  
 +#undef pr_fmt
  #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
  
-+#include <linux/kernel.h>
 +#include <linux/printk.h>
  #include <linux/module.h>
  #include <linux/delay.h>
  #include <linux/etherdevice.h>
 --- a/drivers/net/wireless/libertas_tf/cmd.c
 +++ b/drivers/net/wireless/libertas_tf/cmd.c
-@@ -7,8 +7,11 @@
+@@ -7,8 +7,10 @@
   *  the Free Software Foundation; either version 2 of the License, or (at
   *  your option) any later version.
   */
 +#undef pr_fmt
  #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
  
-+#include <linux/kernel.h>
 +#include <linux/printk.h>
  #include <linux/hardirq.h>
  #include <linux/slab.h>
  #include <linux/export.h>
 --- a/drivers/net/wireless/libertas_tf/if_usb.c
 +++ b/drivers/net/wireless/libertas_tf/if_usb.c
-@@ -9,11 +9,14 @@
+@@ -9,11 +9,13 @@
   */
  #define DRV_NAME "lbtf_usb"
  
@@ -194,21 +185,19 @@ compiler warnings. This is going to be sent upstream.
  #include "libertas_tf.h"
  #include "if_usb.h"
  
-+#include <linux/kernel.h>
 +#include <linux/printk.h>
  #include <linux/delay.h>
  #include <linux/module.h>
  #include <linux/firmware.h>
 --- a/drivers/net/wireless/libertas_tf/main.c
 +++ b/drivers/net/wireless/libertas_tf/main.c
-@@ -7,8 +7,11 @@
+@@ -7,8 +7,10 @@
   *  the Free Software Foundation; either version 2 of the License, or (at
   *  your option) any later version.
   */
 +#undef pr_fmt
  #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
  
-+#include <linux/kernel.h>
 +#include <linux/printk.h>
  #include <linux/hardirq.h>
  #include <linux/slab.h>
@@ -229,21 +218,20 @@ compiler warnings. This is going to be sent upstream.
  
 --- a/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c
 +++ b/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c
-@@ -15,8 +15,11 @@
+@@ -15,8 +15,10 @@
   */
  
  #define __UNDEF_NO_VERSION__
 +#undef pr_fmt
  #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
  
-+#include <linux/kernel.h>
 +#include <linux/printk.h>
  #include <linux/etherdevice.h>
  #include <linux/sched.h>
  #include <linux/firmware.h>
 --- a/drivers/net/wireless/brcm80211/brcmsmac/dma.c
 +++ b/drivers/net/wireless/brcm80211/brcmsmac/dma.c
-@@ -13,9 +13,11 @@
+@@ -13,9 +13,10 @@
   * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
   * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
   */
@@ -251,77 +239,71 @@ compiler warnings. This is going to be sent upstream.
 +#undef pr_fmt
  #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
  
-+#include <linux/kernel.h>
 +#include <linux/printk.h>
  #include <linux/slab.h>
  #include <linux/delay.h>
  #include <linux/pci.h>
 --- a/drivers/net/wireless/brcm80211/brcmsmac/main.c
 +++ b/drivers/net/wireless/brcm80211/brcmsmac/main.c
-@@ -14,8 +14,11 @@
+@@ -14,8 +14,10 @@
   * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
   */
  
 +#undef pr_fmt
  #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
  
-+#include <linux/kernel.h>
 +#include <linux/printk.h>
  #include <linux/pci_ids.h>
  #include <linux/if_ether.h>
  #include <net/mac80211.h>
 --- a/drivers/net/wireless/brcm80211/brcmutil/utils.c
 +++ b/drivers/net/wireless/brcm80211/brcmutil/utils.c
-@@ -14,8 +14,11 @@
+@@ -14,8 +14,10 @@
   * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
   */
  
 +#undef pr_fmt
  #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
  
-+#include <linux/kernel.h>
 +#include <linux/printk.h>
  #include <linux/netdevice.h>
  #include <linux/module.h>
  
 --- a/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh_sdmmc.c
 +++ b/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh_sdmmc.c
-@@ -14,8 +14,11 @@
+@@ -14,8 +14,10 @@
   * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
   */
  
 +#undef pr_fmt
  #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
  
-+#include <linux/kernel.h>
 +#include <linux/printk.h>
  #include <linux/types.h>
  #include <linux/netdevice.h>
  #include <linux/mmc/sdio.h>
 --- a/drivers/net/wireless/brcm80211/brcmfmac/dhd_cdc.c
 +++ b/drivers/net/wireless/brcm80211/brcmfmac/dhd_cdc.c
-@@ -19,8 +19,11 @@
+@@ -19,8 +19,10 @@
   * For certain dcmd codes, the dongle interprets string data from the host.
   ******************************************************************************/
  
 +#undef pr_fmt
  #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
  
-+#include <linux/kernel.h>
 +#include <linux/printk.h>
  #include <linux/types.h>
  #include <linux/netdevice.h>
  #include <linux/sched.h>
 --- a/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c
 +++ b/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c
-@@ -15,8 +15,11 @@
+@@ -15,8 +15,10 @@
   */
  /* ****************** SDIO CARD Interface Functions **************************/
  
 +#undef pr_fmt
  #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
  
-+#include <linux/kernel.h>
 +#include <linux/printk.h>
  #include <linux/types.h>
  #include <linux/netdevice.h>
@@ -357,14 +339,13 @@ compiler warnings. This is going to be sent upstream.
  #include <linux/netdevice.h>
 --- a/drivers/net/wireless/brcm80211/brcmfmac/sdio_chip.c
 +++ b/drivers/net/wireless/brcm80211/brcmfmac/sdio_chip.c
-@@ -15,8 +15,11 @@
+@@ -15,8 +15,10 @@
   */
  /* ***** SDIO interface chip backplane handle functions ***** */
  
 +#undef pr_fmt
  #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
  
-+#include <linux/kernel.h>
 +#include <linux/printk.h>
  #include <linux/types.h>
  #include <linux/netdevice.h>
@@ -395,14 +376,13 @@ compiler warnings. This is going to be sent upstream.
  #include <linux/types.h>
 --- a/net/wireless/lib80211.c
 +++ b/net/wireless/lib80211.c
-@@ -13,8 +13,11 @@
+@@ -13,8 +13,10 @@
   *
   */
  
 +#undef pr_fmt
  #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
  
-+#include <linux/kernel.h>
 +#include <linux/printk.h>
  #include <linux/module.h>
  #include <linux/ctype.h>
@@ -423,14 +403,13 @@ compiler warnings. This is going to be sent upstream.
  #include <linux/list.h>
 --- a/net/wireless/core.c
 +++ b/net/wireless/core.c
-@@ -4,8 +4,11 @@
+@@ -4,8 +4,10 @@
   * Copyright 2006-2010		Johannes Berg <johannes@sipsolutions.net>
   */
  
 +#undef pr_fmt
  #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
  
-+#include <linux/kernel.h>
 +#include <linux/printk.h>
  #include <linux/if.h>
  #include <linux/module.h>
@@ -453,42 +432,39 @@ compiler warnings. This is going to be sent upstream.
  #include <asm/errno.h>
 --- a/net/wireless/lib80211_crypt_tkip.c
 +++ b/net/wireless/lib80211_crypt_tkip.c
-@@ -10,8 +10,11 @@
+@@ -10,8 +10,10 @@
   * more details.
   */
  
 +#undef pr_fmt
  #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
  
-+#include <linux/kernel.h>
 +#include <linux/printk.h>
  #include <linux/err.h>
  #include <linux/module.h>
  #include <linux/init.h>
 --- a/drivers/net/wireless/brcm80211/brcmsmac/aiutils.c
 +++ b/drivers/net/wireless/brcm80211/brcmsmac/aiutils.c
-@@ -16,8 +16,11 @@
+@@ -16,8 +16,10 @@
   * File contents: support functions for PCI/PCIe
   */
  
 +#undef pr_fmt
  #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
  
-+#include <linux/kernel.h>
 +#include <linux/printk.h>
  #include <linux/delay.h>
  #include <linux/pci.h>
  
 --- a/drivers/net/wireless/rtlwifi/wifi.h
 +++ b/drivers/net/wireless/rtlwifi/wifi.h
-@@ -30,8 +30,11 @@
+@@ -30,8 +30,10 @@
  #ifndef __RTL_WIFI_H__
  #define __RTL_WIFI_H__
  
 +#undef pr_fmt
  #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
  
-+#include <linux/kernel.h>
 +#include <linux/printk.h>
  #include <linux/sched.h>
  #include <linux/firmware.h>
@@ -601,7 +577,7 @@ compiler warnings. This is going to be sent upstream.
  
  #include <asm/unaligned.h>
  
-+#include <linux/printk.h>		/* To determine if a card is pci-e */
++#include <linux/printk.h>
  #include <linux/pci.h>		/* To determine if a card is pci-e */
  #include <linux/log2.h>
  #include <linux/platform_device.h>
-- 
2.30.2