aboutsummaryrefslogtreecommitdiffstats
path: root/target
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2009-09-26 21:23:53 +0000
committerHauke Mehrtens <hauke@hauke-m.de>2009-09-26 21:23:53 +0000
commit80574578ec9794f58bd98c1d31fba52c617cb03c (patch)
tree633a9ec8ccfa6cd59b53894d8b5fb5cd1f09534a /target
parent00eeac51a01cc78346ef51356eb7f03ee48357a0 (diff)
downloadupstream-80574578ec9794f58bd98c1d31fba52c617cb03c.tar.gz
upstream-80574578ec9794f58bd98c1d31fba52c617cb03c.tar.bz2
upstream-80574578ec9794f58bd98c1d31fba52c617cb03c.zip
small fixes mostly for kernel 2.6.31
- libsas needs symbols from scsi_transport_sas - autoload line in pppoe was missing - rfkill-input does not exist in kernel 2.6.31 - password for download server of r8101 changed - r8101 and siit do not build with kernel 2.6.31 - fix build of net sched esfq SVN-Revision: 17752
Diffstat (limited to 'target')
-rw-r--r--target/linux/generic-2.6/config-2.6.3116
-rw-r--r--target/linux/generic-2.6/patches-2.6.31/200-sched_esfq.patch2
2 files changed, 17 insertions, 1 deletions
diff --git a/target/linux/generic-2.6/config-2.6.31 b/target/linux/generic-2.6/config-2.6.31
index c4566c08f8..2e2e14e855 100644
--- a/target/linux/generic-2.6/config-2.6.31
+++ b/target/linux/generic-2.6/config-2.6.31
@@ -152,7 +152,9 @@ CONFIG_BINFMT_ELF=y
# CONFIG_BLK_CPQ_CISS_DA is not set
# CONFIG_BLK_CPQ_DA is not set
# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
+# CONFIG_BLK_DEV_4DRIVES is not set
# CONFIG_BLK_DEV_AEC62XX is not set
+# CONFIG_BLK_DEV_ALI14XX is not set
# CONFIG_BLK_DEV_ALI15X3 is not set
# CONFIG_BLK_DEV_AMD74XX is not set
# CONFIG_BLK_DEV_ATIIXP is not set
@@ -164,9 +166,11 @@ CONFIG_BINFMT_ELF=y
# CONFIG_BLK_DEV_CS5520 is not set
# CONFIG_BLK_DEV_CS5530 is not set
# CONFIG_BLK_DEV_CS5535 is not set
+# CONFIG_BLK_DEV_CS5536 is not set
# CONFIG_BLK_DEV_CY82C693 is not set
# CONFIG_BLK_DEV_DAC960 is not set
# CONFIG_BLK_DEV_DELKIN is not set
+# CONFIG_BLK_DEV_DTC2278 is not set
# CONFIG_BLK_DEV_FD is not set
# CONFIG_BLK_DEV_GENERIC is not set
# CONFIG_BLK_DEV_HD_IDE is not set
@@ -174,6 +178,7 @@ CONFIG_BINFMT_ELF=y
# CONFIG_BLK_DEV_HD_ONLY is not set
# CONFIG_BLK_DEV_HPT34X is not set
# CONFIG_BLK_DEV_HPT366 is not set
+# CONFIG_BLK_DEV_HT6560B is not set
# CONFIG_BLK_DEV_IDEACPI is not set
# CONFIG_BLK_DEV_IDECD is not set
# CONFIG_BLK_DEV_IDECS is not set
@@ -200,6 +205,7 @@ CONFIG_BLK_DEV_INITRD=y
# CONFIG_BLK_DEV_PDC202XX_OLD is not set
# CONFIG_BLK_DEV_PIIX is not set
# CONFIG_BLK_DEV_PLATFORM is not set
+# CONFIG_BLK_DEV_QD65XX is not set
# CONFIG_BLK_DEV_RAM is not set
# CONFIG_BLK_DEV_RZ1000 is not set
# CONFIG_BLK_DEV_SC1200 is not set
@@ -215,6 +221,7 @@ CONFIG_BLK_DEV_INITRD=y
# CONFIG_BLK_DEV_TRIFLEX is not set
# CONFIG_BLK_DEV_TRM290 is not set
# CONFIG_BLK_DEV_UB is not set
+# CONFIG_BLK_DEV_UMC8672 is not set
# CONFIG_BLK_DEV_UMEM is not set
# CONFIG_BLK_DEV_VIA82CXXX is not set
# CONFIG_BLK_DEV_XIP is not set
@@ -401,6 +408,7 @@ CONFIG_CRYPTO_UNLZMA=y
# CONFIG_CRYPTO_XTS is not set
CONFIG_CRYPTO=y
CONFIG_CRYPTO_ZLIB=y
+# CONFIG_CUSE is not set
# CONFIG_DAB is not set
# CONFIG_DAVICOM_PHY is not set
# CONFIG_DCB is not set
@@ -936,6 +944,7 @@ CONFIG_JOLIET=y
# CONFIG_KALLSYMS is not set
# CONFIG_KARMA_PARTITION is not set
# CONFIG_KEXEC is not set
+# CONFIG_KEYBOARD_LM8323 is not set
# CONFIG_KEYS is not set
# CONFIG_KMEMTRACE is not set
CONFIG_KMOD=y
@@ -1031,9 +1040,11 @@ CONFIG_MISC_FILESYSTEMS=y
# CONFIG_MISDN is not set
# CONFIG_MKISS is not set
# CONFIG_MMC_ARMMMCI is not set
+# CONFIG_MMC_CB710 is not set
# CONFIG_MMC is not set
# CONFIG_MMC_SDRICOH_CS is not set
# CONFIG_MMC_TEST is not set
+# CONFIG_MMC_VIA_SDMMC is not set
CONFIG_MMU=y
# CONFIG_MODULE_FORCE_LOAD is not set
# CONFIG_MODULE_FORCE_UNLOAD is not set
@@ -1045,6 +1056,7 @@ CONFIG_MODULE_UNLOAD=y
# CONFIG_MOUSE_INPORT is not set
# CONFIG_MOUSE_LOGIBM is not set
# CONFIG_MOUSE_PC110PAD is not set
+# CONFIG_MOUSE_SYNAPTICS_I2C is not set
# CONFIG_MSDOS_FS is not set
CONFIG_MSDOS_PARTITION=y
# CONFIG_MTD_ABSENT is not set
@@ -1195,6 +1207,7 @@ CONFIG_NETFILTER_ADVANCED=y
# CONFIG_NETFILTER_XT_MATCH_MAC is not set
# CONFIG_NETFILTER_XT_MATCH_MARK is not set
# CONFIG_NETFILTER_XT_MATCH_MULTIPORT is not set
+# CONFIG_NETFILTER_XT_MATCH_OSF is not set
# CONFIG_NETFILTER_XT_MATCH_OWNER is not set
# CONFIG_NETFILTER_XT_MATCH_PHYSDEV is not set
# CONFIG_NETFILTER_XT_MATCH_PKTTYPE is not set
@@ -1323,6 +1336,7 @@ CONFIG_NFSD_V4=y
# CONFIG_NFS_V3_ACL is not set
CONFIG_NFS_V3=y
CONFIG_NFS_V4=y
+# CONFIG_NFS_V4_1 is not set
# CONFIG_NFTL is not set
# CONFIG_NILFS2_FS is not set
CONFIG_NL80211=y
@@ -1780,6 +1794,7 @@ CONFIG_SELECT_MEMORY_MODEL=y
# CONFIG_SENSORS_SMSC47M192 is not set
# CONFIG_SENSORS_SMSC47M1 is not set
# CONFIG_SENSORS_THMC50 is not set
+# CONFIG_SENSORS_TMP401 is not set
# CONFIG_SENSORS_TSL2550 is not set
# CONFIG_SENSORS_VIA686A is not set
# CONFIG_SENSORS_VT1211 is not set
@@ -1823,6 +1838,7 @@ CONFIG_SLAB=y
# CONFIG_SLOB is not set
# CONFIG_SLUB_DEBUG is not set
# CONFIG_SLUB is not set
+# CONFIG_SMARTJOYPLUS_FF is not set
# CONFIG_SMB_FS is not set
# CONFIG_SMB_NLS_DEFAULT is not set
# CONFIG_SMC911X is not set
diff --git a/target/linux/generic-2.6/patches-2.6.31/200-sched_esfq.patch b/target/linux/generic-2.6/patches-2.6.31/200-sched_esfq.patch
index f72c0e3705..fb28e90858 100644
--- a/target/linux/generic-2.6/patches-2.6.31/200-sched_esfq.patch
+++ b/target/linux/generic-2.6/patches-2.6.31/200-sched_esfq.patch
@@ -268,7 +268,7 @@
+ break;
+ }
+ default:
-+ info.dst = (u32)(unsigned long)skb->dst;
++ info.dst = (u32)(unsigned long)skb_dst(skb);
+ info.src = (u32)(unsigned long)skb->sk;
+ info.proto = skb->protocol;
+ }