From 6936562161eb76de44dc0a8dc1017fcad3db49ba Mon Sep 17 00:00:00 2001
From: hauke <hauke@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Tue, 28 Jun 2011 19:33:50 +0000
Subject: kernel: update ssb and bcma to linux-next next-20110628

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@27299 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 target/linux/generic/patches-2.6.39/025-bcma_backport.patch | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'target/linux/generic/patches-2.6.39/025-bcma_backport.patch')

diff --git a/target/linux/generic/patches-2.6.39/025-bcma_backport.patch b/target/linux/generic/patches-2.6.39/025-bcma_backport.patch
index 333a3b57b..07b278e8c 100644
--- a/target/linux/generic/patches-2.6.39/025-bcma_backport.patch
+++ b/target/linux/generic/patches-2.6.39/025-bcma_backport.patch
@@ -916,7 +916,7 @@
 +}
 --- /dev/null
 +++ b/drivers/bcma/main.c
-@@ -0,0 +1,254 @@
+@@ -0,0 +1,255 @@
 +/*
 + * Broadcom specific AMBA
 + * Bus subsystem
@@ -926,6 +926,7 @@
 +
 +#include "bcma_private.h"
 +#include <linux/bcma/bcma.h>
++#include <linux/slab.h>
 +
 +MODULE_DESCRIPTION("Broadcom's specific AMBA driver");
 +MODULE_LICENSE("GPL");
-- 
cgit v1.2.3