refresh patches and configuration

SVN-Revision: 14722
This commit is contained in:
Hauke Mehrtens
2009-03-01 20:19:55 +00:00
parent 1b922ab410
commit 4c548fbaca
22 changed files with 121 additions and 255 deletions

View File

@@ -1,4 +1,3 @@
diff --git a/arch/mips/include/asm/bootinfo.h b/arch/mips/include/asm/bootinfo.h
--- a/arch/mips/include/asm/bootinfo.h
+++ b/arch/mips/include/asm/bootinfo.h
@@ -57,6 +57,12 @@
@@ -14,10 +13,9 @@ diff --git a/arch/mips/include/asm/bootinfo.h b/arch/mips/include/asm/bootinfo.h
#define CL_SIZE COMMAND_LINE_SIZE
extern char *system_type;
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@ -2061,6 +2061,7 @@
@@ -2068,6 +2068,7 @@
#define PCI_DEVICE_ID_TIGON3_5906M 0x1713
#define PCI_DEVICE_ID_BCM4401 0x4401
#define PCI_DEVICE_ID_BCM4401B0 0x4402