mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2025-04-21 12:27:27 +03:00
[kernel] update to 2.6.25.12
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@11933 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
@@ -11,7 +11,7 @@ BOARD:=brcm47xx
|
||||
BOARDNAME:=Broadcom BCM947xx/953xx
|
||||
FEATURES:=squashfs usb
|
||||
|
||||
LINUX_VERSION:=2.6.25.10
|
||||
LINUX_VERSION:=2.6.25.12
|
||||
|
||||
include $(INCLUDE_DIR)/target.mk
|
||||
DEFAULT_PACKAGES += kmod-switch kmod-diag
|
||||
|
||||
@@ -6,11 +6,9 @@ the PCI core, if our host-bus is not PCI.
|
||||
Reported-by: Steve Brown <sbrown@cortland.com>
|
||||
Signed-off-by: Michael Buesch <mb@bu3sch.de>
|
||||
|
||||
Index: wireless-testing/drivers/ssb/driver_pcicore.c
|
||||
===================================================================
|
||||
--- wireless-testing.orig/drivers/ssb/driver_pcicore.c 2008-06-10 13:58:23.000000000 +0200
|
||||
+++ wireless-testing/drivers/ssb/driver_pcicore.c 2008-07-04 23:16:02.000000000 +0200
|
||||
@@ -537,6 +537,13 @@ int ssb_pcicore_dev_irqvecs_enable(struc
|
||||
--- a/drivers/ssb/driver_pcicore.c
|
||||
+++ b/drivers/ssb/driver_pcicore.c
|
||||
@@ -519,6 +519,13 @@
|
||||
int err = 0;
|
||||
u32 tmp;
|
||||
|
||||
|
||||
@@ -1,9 +1,7 @@
|
||||
Add gpio_is_valid() for bcm47xx
|
||||
Index: linux-2.6.25.10/arch/mips/bcm47xx/gpio.c
|
||||
===================================================================
|
||||
--- linux-2.6.25.10.orig/arch/mips/bcm47xx/gpio.c 2008-07-20 20:48:44.000000000 +0200
|
||||
+++ linux-2.6.25.10/arch/mips/bcm47xx/gpio.c 2008-07-20 20:57:55.000000000 +0200
|
||||
@@ -77,3 +77,15 @@ int bcm47xx_gpio_direction_output(unsign
|
||||
--- a/arch/mips/bcm47xx/gpio.c
|
||||
+++ b/arch/mips/bcm47xx/gpio.c
|
||||
@@ -77,3 +77,15 @@
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(bcm47xx_gpio_direction_output);
|
||||
|
||||
@@ -19,11 +17,9 @@ Index: linux-2.6.25.10/arch/mips/bcm47xx/gpio.c
|
||||
+ return 0;
|
||||
+}
|
||||
+EXPORT_SYMBOL_GPL(bcm47xx_gpio_is_valid);
|
||||
Index: linux-2.6.25.10/include/asm-mips/mach-bcm47xx/gpio.h
|
||||
===================================================================
|
||||
--- linux-2.6.25.10.orig/include/asm-mips/mach-bcm47xx/gpio.h 2008-07-20 20:48:44.000000000 +0200
|
||||
+++ linux-2.6.25.10/include/asm-mips/mach-bcm47xx/gpio.h 2008-07-20 20:49:20.000000000 +0200
|
||||
@@ -17,6 +17,7 @@ extern int bcm47xx_gpio_get_value(unsign
|
||||
--- a/include/asm-mips/mach-bcm47xx/gpio.h
|
||||
+++ b/include/asm-mips/mach-bcm47xx/gpio.h
|
||||
@@ -17,6 +17,7 @@
|
||||
extern void bcm47xx_gpio_set_value(unsigned gpio, int value);
|
||||
extern int bcm47xx_gpio_direction_input(unsigned gpio);
|
||||
extern int bcm47xx_gpio_direction_output(unsigned gpio, int value);
|
||||
@@ -31,7 +27,7 @@ Index: linux-2.6.25.10/include/asm-mips/mach-bcm47xx/gpio.h
|
||||
|
||||
static inline int gpio_request(unsigned gpio, const char *label)
|
||||
{
|
||||
@@ -52,6 +53,8 @@ static inline int gpio_direction_output(
|
||||
@@ -52,6 +53,8 @@
|
||||
return bcm47xx_gpio_direction_output(gpio, value);
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user