projects
/
openwrt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[rdc] use Alain Knaff's bzip2/lzma patch instead of the old lzma patch
[openwrt.git]
/
target
/
linux
/
brcm47xx
/
patches-2.6.25
/
700-ssb-gigabit-ethernet-driver.patch
diff --git
a/target/linux/brcm47xx/patches-2.6.25/700-ssb-gigabit-ethernet-driver.patch
b/target/linux/brcm47xx/patches-2.6.25/700-ssb-gigabit-ethernet-driver.patch
index
0291096
..
1ed53e5
100644
(file)
--- a/
target/linux/brcm47xx/patches-2.6.25/700-ssb-gigabit-ethernet-driver.patch
+++ b/
target/linux/brcm47xx/patches-2.6.25/700-ssb-gigabit-ethernet-driver.patch
@@
-1,7
+1,5
@@
-Index: linux-2.6.25.4/drivers/ssb/Kconfig
-===================================================================
---- linux-2.6.25.4.orig/drivers/ssb/Kconfig
-+++ linux-2.6.25.4/drivers/ssb/Kconfig
+--- a/drivers/ssb/Kconfig
++++ b/drivers/ssb/Kconfig
@@ -125,4 +125,13 @@ config SSB_DRIVER_EXTIF
If unsure, say N
@@ -125,4 +125,13 @@ config SSB_DRIVER_EXTIF
If unsure, say N
@@
-16,10
+14,8
@@
Index: linux-2.6.25.4/drivers/ssb/Kconfig
+ If unsure, say N
+
endmenu
+ If unsure, say N
+
endmenu
-Index: linux-2.6.25.4/drivers/ssb/Makefile
-===================================================================
---- linux-2.6.25.4.orig/drivers/ssb/Makefile
-+++ linux-2.6.25.4/drivers/ssb/Makefile
+--- a/drivers/ssb/Makefile
++++ b/drivers/ssb/Makefile
@@ -11,6 +11,7 @@ ssb-y += driver_chipcommon.o
ssb-$(CONFIG_SSB_DRIVER_MIPS) += driver_mipscore.o
ssb-$(CONFIG_SSB_DRIVER_EXTIF) += driver_extif.o
@@ -11,6 +11,7 @@ ssb-y += driver_chipcommon.o
ssb-$(CONFIG_SSB_DRIVER_MIPS) += driver_mipscore.o
ssb-$(CONFIG_SSB_DRIVER_EXTIF) += driver_extif.o
@@
-28,10
+24,8
@@
Index: linux-2.6.25.4/drivers/ssb/Makefile
# b43 pci-ssb-bridge driver
# Not strictly a part of SSB, but kept here for convenience
# b43 pci-ssb-bridge driver
# Not strictly a part of SSB, but kept here for convenience
-Index: linux-2.6.25.4/drivers/ssb/driver_gige.c
-===================================================================
--- /dev/null
--- /dev/null
-+++
linux-2.6.25.4
/drivers/ssb/driver_gige.c
++++
b
/drivers/ssb/driver_gige.c
@@ -0,0 +1,294 @@
+/*
+ * Sonics Silicon Backplane
@@ -0,0 +1,294 @@
+/*
+ * Sonics Silicon Backplane
@@
-327,10
+321,8
@@
Index: linux-2.6.25.4/drivers/ssb/driver_gige.c
+{
+ return ssb_driver_register(&ssb_gige_driver);
+}
+{
+ return ssb_driver_register(&ssb_gige_driver);
+}
-Index: linux-2.6.25.4/include/linux/ssb/ssb_driver_gige.h
-===================================================================
--- /dev/null
--- /dev/null
-+++
linux-2.6.25.4
/include/linux/ssb/ssb_driver_gige.h
++++
b
/include/linux/ssb/ssb_driver_gige.h
@@ -0,0 +1,174 @@
+#ifndef LINUX_SSB_DRIVER_GIGE_H_
+#define LINUX_SSB_DRIVER_GIGE_H_
@@ -0,0 +1,174 @@
+#ifndef LINUX_SSB_DRIVER_GIGE_H_
+#define LINUX_SSB_DRIVER_GIGE_H_
@@
-506,10
+498,8
@@
Index: linux-2.6.25.4/include/linux/ssb/ssb_driver_gige.h
+
+#endif /* CONFIG_SSB_DRIVER_GIGE */
+#endif /* LINUX_SSB_DRIVER_GIGE_H_ */
+
+#endif /* CONFIG_SSB_DRIVER_GIGE */
+#endif /* LINUX_SSB_DRIVER_GIGE_H_ */
-Index: linux-2.6.25.4/drivers/ssb/driver_pcicore.c
-===================================================================
---- linux-2.6.25.4.orig/drivers/ssb/driver_pcicore.c
-+++ linux-2.6.25.4/drivers/ssb/driver_pcicore.c
+--- a/drivers/ssb/driver_pcicore.c
++++ b/drivers/ssb/driver_pcicore.c
@@ -60,78 +60,6 @@ static DEFINE_SPINLOCK(cfgspace_lock);
/* Core to access the external PCI config space. Can only have one. */
static struct ssb_pcicore *extpci_core;
@@ -60,78 +60,6 @@ static DEFINE_SPINLOCK(cfgspace_lock);
/* Core to access the external PCI config space. Can only have one. */
static struct ssb_pcicore *extpci_core;
@@
-685,10
+675,8
@@
Index: linux-2.6.25.4/drivers/ssb/driver_pcicore.c
static void ssb_pcicore_init_hostmode(struct ssb_pcicore *pc)
{
u32 val;
static void ssb_pcicore_init_hostmode(struct ssb_pcicore *pc)
{
u32 val;
-Index: linux-2.6.25.4/drivers/ssb/embedded.c
-===================================================================
---- linux-2.6.25.4.orig/drivers/ssb/embedded.c
-+++ linux-2.6.25.4/drivers/ssb/embedded.c
+--- a/drivers/ssb/embedded.c
++++ b/drivers/ssb/embedded.c
@@ -10,6 +10,9 @@
#include <linux/ssb/ssb.h>
@@ -10,6 +10,9 @@
#include <linux/ssb/ssb.h>
@@
-790,10
+778,8
@@
Index: linux-2.6.25.4/drivers/ssb/embedded.c
+
+ return -ENODEV;
+}
+
+ return -ENODEV;
+}
-Index: linux-2.6.25.4/include/linux/ssb/ssb.h
-===================================================================
---- linux-2.6.25.4.orig/include/linux/ssb/ssb.h
-+++ linux-2.6.25.4/include/linux/ssb/ssb.h
+--- a/include/linux/ssb/ssb.h
++++ b/include/linux/ssb/ssb.h
@@ -426,5 +426,12 @@ extern int ssb_bus_powerup(struct ssb_bu
extern u32 ssb_admatch_base(u32 adm);
extern u32 ssb_admatch_size(u32 adm);
@@ -426,5 +426,12 @@ extern int ssb_bus_powerup(struct ssb_bu
extern u32 ssb_admatch_base(u32 adm);
extern u32 ssb_admatch_size(u32 adm);
@@
-807,10
+793,8
@@
Index: linux-2.6.25.4/include/linux/ssb/ssb.h
+#endif /* CONFIG_SSB_EMBEDDED */
#endif /* LINUX_SSB_H_ */
+#endif /* CONFIG_SSB_EMBEDDED */
#endif /* LINUX_SSB_H_ */
-Index: linux-2.6.25.4/include/linux/ssb/ssb_driver_pci.h
-===================================================================
---- linux-2.6.25.4.orig/include/linux/ssb/ssb_driver_pci.h
-+++ linux-2.6.25.4/include/linux/ssb/ssb_driver_pci.h
+--- a/include/linux/ssb/ssb_driver_pci.h
++++ b/include/linux/ssb/ssb_driver_pci.h
@@ -1,6 +1,11 @@
#ifndef LINUX_SSB_PCICORE_H_
#define LINUX_SSB_PCICORE_H_
@@ -1,6 +1,11 @@
#ifndef LINUX_SSB_PCICORE_H_
#define LINUX_SSB_PCICORE_H_
@@
-850,10
+834,8
@@
Index: linux-2.6.25.4/include/linux/ssb/ssb_driver_pci.h
+
#endif /* CONFIG_SSB_DRIVER_PCICORE */
#endif /* LINUX_SSB_PCICORE_H_ */
+
#endif /* CONFIG_SSB_DRIVER_PCICORE */
#endif /* LINUX_SSB_PCICORE_H_ */
-Index: linux-2.6.25.4/drivers/ssb/main.c
-===================================================================
---- linux-2.6.25.4.orig/drivers/ssb/main.c
-+++ linux-2.6.25.4/drivers/ssb/main.c
+--- a/drivers/ssb/main.c
++++ b/drivers/ssb/main.c
@@ -14,6 +14,7 @@
#include <linux/io.h>
#include <linux/ssb/ssb.h>
@@ -14,6 +14,7 @@
#include <linux/io.h>
#include <linux/ssb/ssb.h>
@@
-912,10
+894,8
@@
Index: linux-2.6.25.4/drivers/ssb/main.c
b43_pci_ssb_bridge_exit();
bus_unregister(&ssb_bustype);
}
b43_pci_ssb_bridge_exit();
bus_unregister(&ssb_bustype);
}
-Index: linux-2.6.25.4/drivers/ssb/ssb_private.h
-===================================================================
---- linux-2.6.25.4.orig/drivers/ssb/ssb_private.h
-+++ linux-2.6.25.4/drivers/ssb/ssb_private.h
+--- a/drivers/ssb/ssb_private.h
++++ b/drivers/ssb/ssb_private.h
@@ -118,6 +118,8 @@ extern u32 ssb_calc_clock_rate(u32 pllty
extern int ssb_devices_freeze(struct ssb_bus *bus);
extern int ssb_devices_thaw(struct ssb_bus *bus);
@@ -118,6 +118,8 @@ extern u32 ssb_calc_clock_rate(u32 pllty
extern int ssb_devices_freeze(struct ssb_bus *bus);
extern int ssb_devices_thaw(struct ssb_bus *bus);
@@
-925,10
+905,8
@@
Index: linux-2.6.25.4/drivers/ssb/ssb_private.h
/* b43_pci_bridge.c */
#ifdef CONFIG_SSB_B43_PCI_BRIDGE
/* b43_pci_bridge.c */
#ifdef CONFIG_SSB_B43_PCI_BRIDGE
-Index: linux-2.6.25.4/drivers/net/tg3.c
-===================================================================
---- linux-2.6.25.4.orig/drivers/net/tg3.c
-+++ linux-2.6.25.4/drivers/net/tg3.c
+--- a/drivers/net/tg3.c
++++ b/drivers/net/tg3.c
@@ -38,6 +38,7 @@
#include <linux/workqueue.h>
#include <linux/prefetch.h>
@@ -38,6 +38,7 @@
#include <linux/workqueue.h>
#include <linux/prefetch.h>
@@
-1212,10
+1190,8
@@
Index: linux-2.6.25.4/drivers/net/tg3.c
/* The word/byte swap controls here control register access byte
* swapping. DMA data byte swapping is controlled in the GRC_MODE
/* The word/byte swap controls here control register access byte
* swapping. DMA data byte swapping is controlled in the GRC_MODE
-Index: linux-2.6.25.4/drivers/net/tg3.h
-===================================================================
---- linux-2.6.25.4.orig/drivers/net/tg3.h
-+++ linux-2.6.25.4/drivers/net/tg3.h
+--- a/drivers/net/tg3.h
++++ b/drivers/net/tg3.h
@@ -2477,6 +2477,9 @@ struct tg3 {
#define TG3_FLG3_ENABLE_APE 0x00000002
#define TG3_FLG3_5761_5784_AX_FIXES 0x00000004
@@ -2477,6 +2477,9 @@ struct tg3 {
#define TG3_FLG3_ENABLE_APE 0x00000002
#define TG3_FLG3_5761_5784_AX_FIXES 0x00000004
@@
-1243,10
+1219,8
@@
Index: linux-2.6.25.4/drivers/net/tg3.h
struct tg3_hw_stats *hw_stats;
dma_addr_t stats_mapping;
struct tg3_hw_stats *hw_stats;
dma_addr_t stats_mapping;
-Index: linux-2.6.25.4/drivers/ssb/driver_mipscore.c
-===================================================================
---- linux-2.6.25.4.orig/drivers/ssb/driver_mipscore.c
-+++ linux-2.6.25.4/drivers/ssb/driver_mipscore.c
+--- a/drivers/ssb/driver_mipscore.c
++++ b/drivers/ssb/driver_mipscore.c
@@ -212,6 +212,7 @@ void ssb_mipscore_init(struct ssb_mipsco
/* fallthrough */
case SSB_DEV_PCI:
@@ -212,6 +212,7 @@ void ssb_mipscore_init(struct ssb_mipsco
/* fallthrough */
case SSB_DEV_PCI:
This page took
0.025544 seconds
and
4
git commands to generate.
projects / openwrt.git / blobdiff