refresh 2.6.26 patches
SVN-Revision: 13135
This commit is contained in:
@@ -1,6 +1,6 @@
|
||||
--- a/arch/mips/Kconfig
|
||||
+++ b/arch/mips/Kconfig
|
||||
@@ -59,6 +59,18 @@
|
||||
@@ -59,6 +59,18 @@ config BCM47XX
|
||||
help
|
||||
Support for BCM47XX based boards
|
||||
|
||||
@@ -19,7 +19,7 @@
|
||||
config MIPS_COBALT
|
||||
bool "Cobalt Server"
|
||||
select CEVT_R4K
|
||||
@@ -687,6 +699,7 @@
|
||||
@@ -687,6 +699,7 @@ config WR_PPMC
|
||||
|
||||
endchoice
|
||||
|
||||
@@ -29,7 +29,7 @@
|
||||
source "arch/mips/jazz/Kconfig"
|
||||
--- a/arch/mips/Makefile
|
||||
+++ b/arch/mips/Makefile
|
||||
@@ -276,6 +276,13 @@
|
||||
@@ -276,6 +276,13 @@ libs-$(CONFIG_MIPS_XXS1500) += arch/mips
|
||||
load-$(CONFIG_MIPS_XXS1500) += 0xffffffff80100000
|
||||
|
||||
#
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
--- a/drivers/mtd/devices/Kconfig
|
||||
+++ b/drivers/mtd/devices/Kconfig
|
||||
@@ -84,6 +84,10 @@
|
||||
@@ -84,6 +84,10 @@ config M25PXX_USE_FAST_READ
|
||||
help
|
||||
This option enables FAST_READ access supported by ST M25Pxx.
|
||||
|
||||
@@ -13,7 +13,7 @@
|
||||
help
|
||||
--- a/drivers/mtd/devices/Makefile
|
||||
+++ b/drivers/mtd/devices/Makefile
|
||||
@@ -17,3 +17,4 @@
|
||||
@@ -17,3 +17,4 @@ obj-$(CONFIG_MTD_LART) += lart.o
|
||||
obj-$(CONFIG_MTD_BLOCK2MTD) += block2mtd.o
|
||||
obj-$(CONFIG_MTD_DATAFLASH) += mtd_dataflash.o
|
||||
obj-$(CONFIG_MTD_M25P80) += m25p80.o
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
--- a/drivers/watchdog/Kconfig
|
||||
+++ b/drivers/watchdog/Kconfig
|
||||
@@ -683,6 +683,12 @@
|
||||
@@ -683,6 +683,12 @@ config TXX9_WDT
|
||||
help
|
||||
Hardware driver for the built-in watchdog timer on TXx9 MIPS SoCs.
|
||||
|
||||
@@ -15,7 +15,7 @@
|
||||
# POWERPC Architecture
|
||||
--- a/drivers/watchdog/Makefile
|
||||
+++ b/drivers/watchdog/Makefile
|
||||
@@ -97,6 +97,7 @@
|
||||
@@ -97,6 +97,7 @@ obj-$(CONFIG_WDT_RM9K_GPI) += rm9k_wdt.o
|
||||
obj-$(CONFIG_SIBYTE_WDOG) += sb_wdog.o
|
||||
obj-$(CONFIG_AR7_WDT) += ar7_wdt.o
|
||||
obj-$(CONFIG_TXX9_WDT) += txx9wdt.o
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
--- a/drivers/net/Kconfig
|
||||
+++ b/drivers/net/Kconfig
|
||||
@@ -367,6 +367,12 @@
|
||||
@@ -367,6 +367,12 @@ config AX88796_93CX6
|
||||
help
|
||||
Select this if your platform comes with an external 93CX6 eeprom.
|
||||
|
||||
@@ -15,7 +15,7 @@
|
||||
depends on PPC_PMAC && PPC32
|
||||
--- a/drivers/net/Makefile
|
||||
+++ b/drivers/net/Makefile
|
||||
@@ -194,6 +194,7 @@
|
||||
@@ -194,6 +194,7 @@ obj-$(CONFIG_EQUALIZER) += eql.o
|
||||
obj-$(CONFIG_KORINA) += korina.o
|
||||
obj-$(CONFIG_MIPS_JAZZ_SONIC) += jazzsonic.o
|
||||
obj-$(CONFIG_MIPS_AU1X00_ENET) += au1000_eth.o
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
--- a/drivers/net/ar2313/ar2313.c
|
||||
+++ b/drivers/net/ar2313/ar2313.c
|
||||
@@ -291,7 +291,7 @@
|
||||
@@ -291,7 +291,7 @@ int __init ar2313_probe(struct platform_
|
||||
sp->mii_bus.write = mdiobus_write;
|
||||
sp->mii_bus.reset = mdiobus_reset;
|
||||
sp->mii_bus.name = "ar2313_eth_mii";
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
--- a/drivers/mtd/redboot.c
|
||||
+++ b/drivers/mtd/redboot.c
|
||||
@@ -62,31 +62,32 @@
|
||||
@@ -62,31 +62,32 @@ static int parse_redboot_partitions(stru
|
||||
static char nullstring[] = "unallocated";
|
||||
#endif
|
||||
|
||||
@@ -40,7 +40,7 @@
|
||||
printk(KERN_NOTICE "Searching for RedBoot partition table in %s at offset 0x%lx\n",
|
||||
master->name, offset);
|
||||
|
||||
@@ -158,6 +159,11 @@
|
||||
@@ -158,6 +159,11 @@ static int parse_redboot_partitions(stru
|
||||
}
|
||||
if (i == numslots) {
|
||||
/* Didn't find it */
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
--- a/net/core/dev.c
|
||||
+++ b/net/core/dev.c
|
||||
@@ -3786,8 +3786,8 @@
|
||||
@@ -3786,8 +3786,8 @@ int register_netdevice(struct net_device
|
||||
/* Fix illegal SG+CSUM combinations. */
|
||||
if ((dev->features & NETIF_F_SG) &&
|
||||
!(dev->features & NETIF_F_ALL_CSUM)) {
|
||||
@@ -11,7 +11,7 @@
|
||||
dev->features &= ~NETIF_F_SG;
|
||||
}
|
||||
|
||||
@@ -3800,9 +3800,9 @@
|
||||
@@ -3800,9 +3800,9 @@ int register_netdevice(struct net_device
|
||||
}
|
||||
if (dev->features & NETIF_F_UFO) {
|
||||
if (!(dev->features & NETIF_F_HW_CSUM)) {
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
--- a/arch/mips/kernel/cevt-r4k.c
|
||||
+++ b/arch/mips/kernel/cevt-r4k.c
|
||||
@@ -205,6 +205,7 @@
|
||||
@@ -205,6 +205,7 @@ static int c0_compare_int_usable(void)
|
||||
while ((int)(read_c0_count() - cnt) <= 0)
|
||||
; /* Wait for expiry */
|
||||
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
|
||||
extern asmlinkage void handle_int(void);
|
||||
extern asmlinkage void handle_tlbm(void);
|
||||
@@ -1464,6 +1465,8 @@
|
||||
@@ -1464,6 +1465,8 @@ void __cpuinit per_cpu_trap_init(void)
|
||||
*/
|
||||
if (cpu_has_mips_r2) {
|
||||
cp0_compare_irq = (read_c0_intctl() >> 29) & 7;
|
||||
@@ -19,7 +19,7 @@
|
||||
cp0_perfcount_irq = -1;
|
||||
--- a/include/asm-mips/time.h
|
||||
+++ b/include/asm-mips/time.h
|
||||
@@ -53,6 +53,7 @@
|
||||
@@ -53,6 +53,7 @@ extern int (*perf_irq)(void);
|
||||
#ifdef CONFIG_CEVT_R4K
|
||||
extern int mips_clockevent_init(void);
|
||||
extern unsigned int __weak get_c0_compare_int(void);
|
||||
@@ -29,7 +29,7 @@
|
||||
{
|
||||
--- a/arch/mips/atheros/board.c
|
||||
+++ b/arch/mips/atheros/board.c
|
||||
@@ -205,6 +205,11 @@
|
||||
@@ -265,6 +265,11 @@ void (*board_time_init)(void);
|
||||
void __init plat_time_init(void) {
|
||||
board_time_init();
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user