220-sound_kconfig.patch « patches-2.6.26 « generic-2.6 « linux « target - openwrt/upstream - upstream openwrt

about summary refs log tree commit diff stats

path: root/target/linux/generic-2.6/patches-2.6.26/220-sound_kconfig.patch

blob: d215d120779a9a0eb5d5c3630dca9a0183c51a0a (plain)

--- a/sound/core/Kconfig
+++ b/sound/core/Kconfig
@@ -9,7 +9,7 @@ config SND_PCM
 	depends on SND
 
 config SND_HWDEP
-	tristate
+	tristate "Sound hardware support"
 	depends on SND
 
 config SND_RAWMIDI

ariable.Class */ .highlight .vg { color: #dd7700 } /* Name.Variable.Global */ .highlight .vi { color: #3333bb } /* Name.Variable.Instance */ .highlight .vm { color: #336699 } /* Name.Variable.Magic */ .highlight .il { color: #0000DD; font-weight: bold } /* Literal.Number.Integer.Long */

--- a/drivers/net/r8169.c
+++ b/drivers/net/r8169.c
@@ -1539,7 +1539,7 @@ static const struct rtl_cfg_info {
 		.hw_start	= rtl_hw_start_8169,
 		.region		= 1,
 		.align		= 0,
-		.intr_event	= SYSErr | LinkChg | RxOverflow |
+		.intr_event	= LinkChg | RxOverflow |
 				  RxFIFOOver | TxErr | TxOK | RxOK | RxErr,
 		.napi_event	= RxFIFOOver | TxErr | TxOK | RxOK | RxOverflow,
 		.msi		= 0
@@ -1548,7 +1548,7 @@ static const struct rtl_cfg_info {
 		.hw_start	= rtl_hw_start_8168,
 		.region		= 2,
 		.align		= 8,
-		.intr_event	= SYSErr | LinkChg | RxOverflow |
+		.intr_event	= LinkChg | RxOverflow |
 				  TxErr | TxOK | RxOK | RxErr,
 		.napi_event	= TxErr | TxOK | RxOK | RxOverflow,
 		.msi		= RTL_FEATURE_MSI
@@ -1557,7 +1557,7 @@ static const struct rtl_cfg_info {
 		.hw_start	= rtl_hw_start_8101,
 		.region		= 2,
 		.align		= 8,
-		.intr_event	= SYSErr | LinkChg | RxOverflow | PCSTimeout |
+		.intr_event	= LinkChg | RxOverflow | PCSTimeout |
 				  RxFIFOOver | TxErr | TxOK | RxOK | RxErr,
 		.napi_event	= RxFIFOOver | TxErr | TxOK | RxOK | RxOverflow,
 		.msi		= RTL_FEATURE_MSI
@@ -2905,10 +2905,12 @@ static irqreturn_t rtl8169_interrupt(int
 			break;
 		}
 
+#if 0
 		if (unlikely(status & SYSErr)) {
 			rtl8169_pcierr_interrupt(dev);
 			break;
 		}
+#endif
 
 		if (status & LinkChg)
 			rtl8169_check_link_status(dev, tp, ioaddr);