summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArtur Artamonov <freeartman@wechall.net>2013-09-27 11:57:13 +0300
committerArtur Artamonov <freeartman@wechall.net>2013-09-27 11:57:13 +0300
commit327364d24d6aacc3e59e5fc983e3ab0c3e99c779 (patch)
treec23f362bb223279a12de91b8ad9ac6574ce59b91
parentb88fd93a1f263f5728e106ea373fdbe1b3716930 (diff)
Removed 9997 patch, modified 0004
-rw-r--r--target/linux/realtek/patches-2.6.30/0004-rsdk-include-nonewfiles.patch2
-rw-r--r--target/linux/realtek/patches-2.6.30/9997-arch-rlx-bsp_rtl8196c-Makefile-config-path.patch22
2 files changed, 1 insertions, 23 deletions
diff --git a/target/linux/realtek/patches-2.6.30/0004-rsdk-include-nonewfiles.patch b/target/linux/realtek/patches-2.6.30/0004-rsdk-include-nonewfiles.patch
index f485a84f5..17770499b 100644
--- a/target/linux/realtek/patches-2.6.30/0004-rsdk-include-nonewfiles.patch
+++ b/target/linux/realtek/patches-2.6.30/0004-rsdk-include-nonewfiles.patch
@@ -325,7 +325,7 @@
-extern struct irq_desc *irq_to_desc(unsigned int irq);
+#if defined(CONFIG_RTL_819X) && !defined(CONFIG_RTL_8196C) && !defined(CONFIG_SPARSE_IRQ)
+ //__MIPS16 is defined at include/net/rtl/rtl_types.h
-+ extern __attribute__((mips16)) struct irq_desc *irq_to_desc(unsigned int irq);
++ extern struct irq_desc *irq_to_desc(unsigned int irq);
+#else
+ extern struct irq_desc *irq_to_desc(unsigned int irq);
+#endif
diff --git a/target/linux/realtek/patches-2.6.30/9997-arch-rlx-bsp_rtl8196c-Makefile-config-path.patch b/target/linux/realtek/patches-2.6.30/9997-arch-rlx-bsp_rtl8196c-Makefile-config-path.patch
deleted file mode 100644
index 909469733..000000000
--- a/target/linux/realtek/patches-2.6.30/9997-arch-rlx-bsp_rtl8196c-Makefile-config-path.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- files/arch/rlx/bsp_rtl8196c/Makefile 2013-05-02 01:47:48.000000000 +0300
-+++ files/arch/rlx/bsp_rtl8196c/Makefile.new 2013-05-11 17:20:45.000000000 +0300
-@@ -7,7 +7,7 @@
- #
- # RTL8196C
- #
--include $(DIR_LINUX)/.config
-+include $(TOPDIR)/.config
-
- core-y += arch/rlx/bsp/
- cflags-y += -Iinclude/asm-rlx -Iarch/rlx/bsp/
-@@ -20,8 +20,8 @@
- obj-$(CONFIG_PCI) += pci.o
-
- EXTRA_AFLAGS := $(CFLAGS)
--EXTRA_CFLAGS += -I$(DIR_LINUX)/drivers/net/rtl819x/AsicDriver
--EXTRA_CFLAGS += -I$(DIR_LINUX)/drivers/net/rtl819x/common
-+EXTRA_CFLAGS += -I$(TOPDIR)/drivers/net/rtl819x/AsicDriver
-+EXTRA_CFLAGS += -I$(TOPDIR)/drivers/net/rtl819x/common
- ifdef CONFIG_RTL_819X_SWCORE
- EXTRA_CFLAGS += -DCONFIG_RTL_819X_SWCORE
- endif