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
|
||||
@@ -18,6 +18,23 @@
|
||||
@@ -18,6 +18,23 @@ choice
|
||||
prompt "System type"
|
||||
default SGI_IP22
|
||||
|
||||
@@ -26,7 +26,7 @@
|
||||
|
||||
--- a/arch/mips/kernel/traps.c
|
||||
+++ b/arch/mips/kernel/traps.c
|
||||
@@ -1188,9 +1188,22 @@
|
||||
@@ -1188,9 +1188,22 @@ void *set_except_vector(int n, void *add
|
||||
|
||||
exception_handlers[n] = handler;
|
||||
if (n == 0 && cpu_has_divec) {
|
||||
@@ -54,7 +54,7 @@
|
||||
}
|
||||
--- a/arch/mips/Makefile
|
||||
+++ b/arch/mips/Makefile
|
||||
@@ -167,6 +167,13 @@
|
||||
@@ -167,6 +167,13 @@ libs-$(CONFIG_SIBYTE_CFE) += arch/mips/s
|
||||
#
|
||||
|
||||
#
|
||||
@@ -70,7 +70,7 @@
|
||||
core-$(CONFIG_MACH_JAZZ) += arch/mips/jazz/
|
||||
--- a/include/asm-mips/page.h
|
||||
+++ b/include/asm-mips/page.h
|
||||
@@ -182,8 +182,10 @@
|
||||
@@ -182,8 +182,10 @@ typedef struct { unsigned long pgprot; }
|
||||
#define VM_DATA_DEFAULT_FLAGS (VM_READ | VM_WRITE | VM_EXEC | \
|
||||
VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
--- a/drivers/mtd/Kconfig
|
||||
+++ b/drivers/mtd/Kconfig
|
||||
@@ -174,6 +174,12 @@
|
||||
@@ -174,6 +174,12 @@ config MTD_AR7_PARTS
|
||||
---help---
|
||||
TI AR7 partitioning support
|
||||
|
||||
@@ -15,7 +15,7 @@
|
||||
config MTD_CHAR
|
||||
--- a/drivers/mtd/Makefile
|
||||
+++ b/drivers/mtd/Makefile
|
||||
@@ -13,6 +13,7 @@
|
||||
@@ -13,6 +13,7 @@ obj-$(CONFIG_MTD_CMDLINE_PARTS) += cmdli
|
||||
obj-$(CONFIG_MTD_AFS_PARTS) += afs.o
|
||||
obj-$(CONFIG_MTD_AR7_PARTS) += ar7part.o
|
||||
obj-$(CONFIG_MTD_OF_PARTS) += ofpart.o
|
||||
@@ -25,7 +25,7 @@
|
||||
obj-$(CONFIG_MTD_CHAR) += mtdchar.o
|
||||
--- a/drivers/mtd/maps/physmap.c
|
||||
+++ b/drivers/mtd/maps/physmap.c
|
||||
@@ -87,7 +87,8 @@
|
||||
@@ -87,7 +87,8 @@ static int physmap_flash_remove(struct p
|
||||
|
||||
static const char *rom_probe_types[] = { "cfi_probe", "jedec_probe", "map_rom", NULL };
|
||||
#ifdef CONFIG_MTD_PARTITIONS
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
--- a/drivers/char/Kconfig
|
||||
+++ b/drivers/char/Kconfig
|
||||
@@ -960,6 +960,15 @@
|
||||
@@ -960,6 +960,15 @@ config MWAVE
|
||||
To compile this driver as a module, choose M here: the
|
||||
module will be called mwave.
|
||||
|
||||
@@ -18,7 +18,7 @@
|
||||
depends on SCx200
|
||||
--- a/drivers/char/Makefile
|
||||
+++ b/drivers/char/Makefile
|
||||
@@ -91,6 +91,7 @@
|
||||
@@ -91,6 +91,7 @@ obj-$(CONFIG_COBALT_LCD) += lcd.o
|
||||
obj-$(CONFIG_PPDEV) += ppdev.o
|
||||
obj-$(CONFIG_NWBUTTON) += nwbutton.o
|
||||
obj-$(CONFIG_NWFLASH) += nwflash.o
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
--- a/drivers/Kconfig
|
||||
+++ b/drivers/Kconfig
|
||||
@@ -100,5 +100,7 @@
|
||||
@@ -100,5 +100,7 @@ source "drivers/auxdisplay/Kconfig"
|
||||
|
||||
source "drivers/uio/Kconfig"
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
endmenu
|
||||
--- a/drivers/Makefile
|
||||
+++ b/drivers/Makefile
|
||||
@@ -92,5 +92,6 @@
|
||||
@@ -92,5 +92,6 @@ obj-$(CONFIG_DCA) += dca/
|
||||
obj-$(CONFIG_HID) += hid/
|
||||
obj-$(CONFIG_PPC_PS3) += ps3/
|
||||
obj-$(CONFIG_OF) += of/
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
--- a/drivers/net/Kconfig
|
||||
+++ b/drivers/net/Kconfig
|
||||
@@ -1867,7 +1867,7 @@
|
||||
@@ -1867,7 +1867,7 @@ config SC92031
|
||||
|
||||
config CPMAC
|
||||
tristate "TI AR7 CPMAC Ethernet support (EXPERIMENTAL)"
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
struct ar7_bin_rec {
|
||||
unsigned int checksum;
|
||||
unsigned int length;
|
||||
@@ -47,7 +51,8 @@
|
||||
@@ -47,7 +51,8 @@ static int create_mtd_partitions(struct
|
||||
unsigned long origin)
|
||||
{
|
||||
struct ar7_bin_rec header;
|
||||
@@ -21,7 +21,7 @@
|
||||
unsigned int pre_size = master->erasesize, post_size = 0;
|
||||
unsigned int root_offset = ROOT_OFFSET;
|
||||
|
||||
@@ -66,7 +71,7 @@
|
||||
@@ -66,7 +71,7 @@ static int create_mtd_partitions(struct
|
||||
do { /* Try 10 blocks starting from master->erasesize */
|
||||
offset = pre_size;
|
||||
master->read(master, offset,
|
||||
@@ -30,7 +30,7 @@
|
||||
if (!strncmp((char *)&header, "TIENV0.8", 8))
|
||||
ar7_parts[1].offset = pre_size;
|
||||
if (header.checksum == LOADER_MAGIC1)
|
||||
@@ -88,7 +93,7 @@
|
||||
@@ -88,7 +93,7 @@ static int create_mtd_partitions(struct
|
||||
while (header.length) {
|
||||
offset += sizeof(header) + header.length;
|
||||
master->read(master, offset, sizeof(header),
|
||||
@@ -39,7 +39,7 @@
|
||||
}
|
||||
root_offset = offset + sizeof(header) + 4;
|
||||
break;
|
||||
@@ -96,10 +101,10 @@
|
||||
@@ -96,10 +101,10 @@ static int create_mtd_partitions(struct
|
||||
while (header.length) {
|
||||
offset += sizeof(header) + header.length;
|
||||
master->read(master, offset, sizeof(header),
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
--- a/drivers/serial/8250.c
|
||||
+++ b/drivers/serial/8250.c
|
||||
@@ -266,6 +266,13 @@
|
||||
@@ -266,6 +266,13 @@ static const struct serial8250_config ua
|
||||
.fcr = UART_FCR_ENABLE_FIFO | UART_FCR_R_TRIG_10,
|
||||
.flags = UART_CAP_FIFO,
|
||||
},
|
||||
@@ -14,7 +14,7 @@
|
||||
};
|
||||
|
||||
#if defined (CONFIG_SERIAL_8250_AU1X00)
|
||||
@@ -2524,7 +2531,11 @@
|
||||
@@ -2524,7 +2531,11 @@ static void serial8250_console_putchar(s
|
||||
{
|
||||
struct uart_8250_port *up = (struct uart_8250_port *)port;
|
||||
|
||||
|
||||
@@ -19,7 +19,7 @@ because other drivers do it in the same way.
|
||||
|
||||
--- a/drivers/net/cpmac.c
|
||||
+++ b/drivers/net/cpmac.c
|
||||
@@ -627,7 +627,7 @@
|
||||
@@ -627,7 +627,7 @@ static void cpmac_end_xmit(struct net_de
|
||||
dev_kfree_skb_irq(desc->skb);
|
||||
desc->skb = NULL;
|
||||
#ifdef CONFIG_NETDEVICES_MULTIQUEUE
|
||||
@@ -28,7 +28,7 @@ because other drivers do it in the same way.
|
||||
netif_wake_subqueue(dev, queue);
|
||||
#else
|
||||
if (netif_queue_stopped(dev))
|
||||
@@ -638,7 +638,7 @@
|
||||
@@ -638,7 +638,7 @@ static void cpmac_end_xmit(struct net_de
|
||||
printk(KERN_WARNING
|
||||
"%s: end_xmit: spurious interrupt\n", dev->name);
|
||||
#ifdef CONFIG_NETDEVICES_MULTIQUEUE
|
||||
@@ -37,7 +37,7 @@ because other drivers do it in the same way.
|
||||
netif_wake_subqueue(dev, queue);
|
||||
#else
|
||||
if (netif_queue_stopped(dev))
|
||||
@@ -1124,7 +1124,7 @@
|
||||
@@ -1124,7 +1124,7 @@ static int external_switch;
|
||||
|
||||
static int __devinit cpmac_probe(struct platform_device *pdev)
|
||||
{
|
||||
@@ -46,7 +46,7 @@ because other drivers do it in the same way.
|
||||
char *mdio_bus_id = "0";
|
||||
struct resource *mem;
|
||||
struct cpmac_priv *priv;
|
||||
@@ -1152,7 +1152,11 @@
|
||||
@@ -1152,7 +1152,11 @@ static int __devinit cpmac_probe(struct
|
||||
}
|
||||
}
|
||||
|
||||
@@ -58,7 +58,7 @@ because other drivers do it in the same way.
|
||||
|
||||
if (!dev) {
|
||||
printk(KERN_ERR "cpmac: Unable to allocate net_device\n");
|
||||
@@ -1179,7 +1183,9 @@
|
||||
@@ -1179,7 +1183,9 @@ static int __devinit cpmac_probe(struct
|
||||
dev->set_multicast_list = cpmac_set_multicast_list;
|
||||
dev->tx_timeout = cpmac_tx_timeout;
|
||||
dev->ethtool_ops = &cpmac_ethtool_ops;
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
--- a/drivers/net/cpmac.c
|
||||
+++ b/drivers/net/cpmac.c
|
||||
@@ -948,7 +948,8 @@
|
||||
@@ -948,7 +948,8 @@ static void cpmac_adjust_link(struct net
|
||||
int new_state = 0;
|
||||
|
||||
spin_lock(&priv->lock);
|
||||
@@ -10,7 +10,7 @@
|
||||
netif_start_queue(dev);
|
||||
if (priv->phy->duplex != priv->oldduplex) {
|
||||
new_state = 1;
|
||||
@@ -960,11 +961,11 @@
|
||||
@@ -960,11 +961,11 @@ static void cpmac_adjust_link(struct net
|
||||
priv->oldspeed = priv->phy->speed;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user