aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/brcm47xx/patches-2.6.23
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2008-01-27 14:49:55 +0000
committerFelix Fietkau <nbd@openwrt.org>2008-01-27 14:49:55 +0000
commit069c77c0920085983b4bd5a516061eaaeb664ef6 (patch)
tree1093f550689fd87a7fe1300f7b9ac76755214827 /target/linux/brcm47xx/patches-2.6.23
parent16cb9611c59c2ee1387a060b5128264e819e81bd (diff)
downloadupstream-069c77c0920085983b4bd5a516061eaaeb664ef6.tar.gz
upstream-069c77c0920085983b4bd5a516061eaaeb664ef6.tar.bz2
upstream-069c77c0920085983b4bd5a516061eaaeb664ef6.zip
add brcm47xx patch by crazy_imp to fix a patch chunk for drivers/Makefile
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@10279 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/brcm47xx/patches-2.6.23')
-rw-r--r--target/linux/brcm47xx/patches-2.6.23/100-board_support.patch24
1 files changed, 12 insertions, 12 deletions
diff --git a/target/linux/brcm47xx/patches-2.6.23/100-board_support.patch b/target/linux/brcm47xx/patches-2.6.23/100-board_support.patch
index 5b11e58058..7f28f340fc 100644
--- a/target/linux/brcm47xx/patches-2.6.23/100-board_support.patch
+++ b/target/linux/brcm47xx/patches-2.6.23/100-board_support.patch
@@ -142,15 +142,6 @@ Index: linux-2.6.23/drivers/Kconfig
source "drivers/mfd/Kconfig"
source "drivers/media/Kconfig"
-Index: linux-2.6.23/drivers/Makefile
-===================================================================
---- linux-2.6.23.orig/drivers/Makefile 2007-10-13 02:23:06.710510659 +0200
-+++ linux-2.6.23/drivers/Makefile 2007-10-13 02:27:08.120267817 +0200
-@@ -88,3 +88,4 @@
- obj-$(CONFIG_HID) += hid/
- obj-$(CONFIG_PPC_PS3) += ps3/
- obj-$(CONFIG_OF) += of/
-+obj-$(CONFIG_SSB) += ssb/
Index: linux-2.6.23/include/asm-mips/bootinfo.h
===================================================================
--- linux-2.6.23.orig/include/asm-mips/bootinfo.h 2007-10-13 02:23:06.718511119 +0200
@@ -198,10 +189,19 @@ Index: linux-2.6.23/include/asm-mips/cpu.h
/*
* ISA Level encodings
-Index: linux-2.6.23/include/linux/pci_ids.h
+Index: linux-2.6.23.1/drivers/Makefile
+===================================================================
+--- linux-2.6.23.1.orig/drivers/Makefile 2008-01-27 04:34:31.000000000 +0100
++++ linux-2.6.23.1/drivers/Makefile 2008-01-27 04:39:57.000000000 +0100
+@@ -89,3 +89,4 @@
+ obj-$(CONFIG_PPC_PS3) += ps3/
+ obj-$(CONFIG_OF) += of/
+ obj-$(CONFIG_GPIO_DEVICE) += gpio/
++obj-$(CONFIG_SSB) += ssb/
+Index: linux-2.6.23.1/include/linux/pci_ids.h
===================================================================
---- linux-2.6.23.orig/include/linux/pci_ids.h 2007-10-13 02:23:06.734512028 +0200
-+++ linux-2.6.23/include/linux/pci_ids.h 2007-10-13 02:23:11.218767569 +0200
+--- linux-2.6.23.1.orig/include/linux/pci_ids.h 2008-01-27 04:55:18.000000000 +0100
++++ linux-2.6.23.1/include/linux/pci_ids.h 2008-01-27 04:55:22.000000000 +0100
@@ -1972,6 +1972,7 @@
#define PCI_DEVICE_ID_TIGON3_5906M 0x1713
#define PCI_DEVICE_ID_BCM4401 0x4401