diff options
author | Natanael Copa <ncopa@alpinelinux.org> | 2012-11-06 07:39:51 +0000 |
---|---|---|
committer | Natanael Copa <ncopa@alpinelinux.org> | 2012-11-06 08:06:01 +0000 |
commit | 84b1d96fbb167d27a47d4445f2595f63debe503e (patch) | |
tree | b0229509097c9e837d005211e071c1c787648299 | |
parent | 07fcda55a1894ac6b09554475a168560634c9baa (diff) | |
download | alpine_aports-84b1d96fbb167d27a47d4445f2595f63debe503e.tar.bz2 alpine_aports-84b1d96fbb167d27a47d4445f2595f63debe503e.tar.xz alpine_aports-84b1d96fbb167d27a47d4445f2595f63debe503e.zip |
main/linux-vserver: enable dvb and upgrade to 3.6.6 kernel
-rw-r--r-- | main/linux-vserver/APKBUILD | 10 | ||||
-rw-r--r-- | main/linux-vserver/kernelconfig.x86 | 159 | ||||
-rw-r--r-- | main/linux-vserver/kernelconfig.x86_64 | 159 | ||||
-rw-r--r-- | main/linux-vserver/patch-3.6.6-vs2.3.4.3-noxfs-nocow.diff (renamed from main/linux-vserver/patch-3.6.4-vs2.3.4.3-noxfs-nocow.diff) | 2 |
4 files changed, 320 insertions, 10 deletions
diff --git a/main/linux-vserver/APKBUILD b/main/linux-vserver/APKBUILD index 72f0114ff1..d333eb7358 100644 --- a/main/linux-vserver/APKBUILD +++ b/main/linux-vserver/APKBUILD | |||
@@ -2,7 +2,7 @@ | |||
2 | 2 | ||
3 | _flavor=vserver | 3 | _flavor=vserver |
4 | pkgname=linux-${_flavor} | 4 | pkgname=linux-${_flavor} |
5 | pkgver=3.6.4 | 5 | pkgver=3.6.6 |
6 | pkgrel=0 | 6 | pkgrel=0 |
7 | _vsver=vs2.3.4.3-noxfs-nocow | 7 | _vsver=vs2.3.4.3-noxfs-nocow |
8 | 8 | ||
@@ -136,7 +136,7 @@ dev() { | |||
136 | } | 136 | } |
137 | 137 | ||
138 | md5sums="1a1760420eac802c541a20ab51a093d1 linux-3.6.tar.xz | 138 | md5sums="1a1760420eac802c541a20ab51a093d1 linux-3.6.tar.xz |
139 | d7efab4da2682c44662b684026b059f7 patch-3.6.4.xz | 139 | 11d6d8749d4612a77f43f0531c0f2824 patch-3.6.6.xz |
140 | 000ac741af5c678ad80b333a22306a7b patch-3.6.4-vs2.3.4.3-noxfs-nocow.diff | 140 | 5be3e577aa4bd603b2b45d8e2a597f38 patch-3.6.6-vs2.3.4.3-noxfs-nocow.diff |
141 | a2f41b951b1923e2520ef610f37ec55b kernelconfig.x86 | 141 | 207e74fd8e1ed06be50f2c149b3b1020 kernelconfig.x86 |
142 | a7ae4e8a88d495109b63354cfa8e4fcd kernelconfig.x86_64" | 142 | c7024467717b4f4fc9c6972a9992a4e6 kernelconfig.x86_64" |
diff --git a/main/linux-vserver/kernelconfig.x86 b/main/linux-vserver/kernelconfig.x86 index 416c591567..bdc63077b8 100644 --- a/main/linux-vserver/kernelconfig.x86 +++ b/main/linux-vserver/kernelconfig.x86 | |||
@@ -1,6 +1,6 @@ | |||
1 | # | 1 | # |
2 | # Automatically generated file; DO NOT EDIT. | 2 | # Automatically generated file; DO NOT EDIT. |
3 | # Linux/i386 3.6.2-vs2.3.4.3-noxfs-nocow Kernel Configuration | 3 | # Linux/i386 3.6.6-vs2.3.4.3-noxfs-nocow Kernel Configuration |
4 | # | 4 | # |
5 | # CONFIG_64BIT is not set | 5 | # CONFIG_64BIT is not set |
6 | CONFIG_X86_32=y | 6 | CONFIG_X86_32=y |
@@ -3234,19 +3234,28 @@ CONFIG_MEDIA_SUPPORT=m | |||
3234 | # | 3234 | # |
3235 | CONFIG_MEDIA_CAMERA_SUPPORT=y | 3235 | CONFIG_MEDIA_CAMERA_SUPPORT=y |
3236 | # CONFIG_MEDIA_ANALOG_TV_SUPPORT is not set | 3236 | # CONFIG_MEDIA_ANALOG_TV_SUPPORT is not set |
3237 | # CONFIG_MEDIA_DIGITAL_TV_SUPPORT is not set | 3237 | CONFIG_MEDIA_DIGITAL_TV_SUPPORT=y |
3238 | # CONFIG_MEDIA_RADIO_SUPPORT is not set | 3238 | # CONFIG_MEDIA_RADIO_SUPPORT is not set |
3239 | # CONFIG_MEDIA_RC_SUPPORT is not set | 3239 | # CONFIG_MEDIA_RC_SUPPORT is not set |
3240 | CONFIG_MEDIA_CONTROLLER=y | 3240 | CONFIG_MEDIA_CONTROLLER=y |
3241 | CONFIG_VIDEO_DEV=m | 3241 | CONFIG_VIDEO_DEV=m |
3242 | CONFIG_VIDEO_V4L2_COMMON=m | 3242 | CONFIG_VIDEO_V4L2_COMMON=m |
3243 | CONFIG_VIDEO_V4L2_SUBDEV_API=y | 3243 | CONFIG_VIDEO_V4L2_SUBDEV_API=y |
3244 | CONFIG_DVB_CORE=m | ||
3245 | CONFIG_DVB_NET=y | ||
3244 | 3246 | ||
3245 | # | 3247 | # |
3246 | # Media drivers | 3248 | # Media drivers |
3247 | # | 3249 | # |
3250 | CONFIG_VIDEO_SAA7146=m | ||
3251 | CONFIG_VIDEO_SAA7146_VV=m | ||
3252 | # CONFIG_MEDIA_ATTACH is not set | ||
3253 | CONFIG_MEDIA_TUNER_SIMPLE=m | ||
3254 | CONFIG_MEDIA_TUNER_TDA9887=m | ||
3255 | CONFIG_MEDIA_TUNER_MT2131=m | ||
3248 | CONFIG_VIDEO_V4L2=m | 3256 | CONFIG_VIDEO_V4L2=m |
3249 | CONFIG_VIDEOBUF_GEN=m | 3257 | CONFIG_VIDEOBUF_GEN=m |
3258 | CONFIG_VIDEOBUF_DMA_SG=m | ||
3250 | CONFIG_VIDEOBUF_VMALLOC=m | 3259 | CONFIG_VIDEOBUF_VMALLOC=m |
3251 | CONFIG_VIDEO_TVEEPROM=m | 3260 | CONFIG_VIDEO_TVEEPROM=m |
3252 | CONFIG_VIDEO_TUNER=m | 3261 | CONFIG_VIDEO_TUNER=m |
@@ -3424,10 +3433,156 @@ CONFIG_USB_SN9C102=m | |||
3424 | # | 3433 | # |
3425 | CONFIG_VIDEO_EM28XX=m | 3434 | CONFIG_VIDEO_EM28XX=m |
3426 | CONFIG_VIDEO_EM28XX_ALSA=m | 3435 | CONFIG_VIDEO_EM28XX_ALSA=m |
3436 | # CONFIG_VIDEO_EM28XX_DVB is not set | ||
3427 | # CONFIG_V4L_ISA_PARPORT_DRIVERS is not set | 3437 | # CONFIG_V4L_ISA_PARPORT_DRIVERS is not set |
3428 | # CONFIG_V4L_PLATFORM_DRIVERS is not set | 3438 | # CONFIG_V4L_PLATFORM_DRIVERS is not set |
3429 | CONFIG_V4L_MEM2MEM_DRIVERS=y | 3439 | CONFIG_V4L_MEM2MEM_DRIVERS=y |
3430 | CONFIG_VIDEO_MEM2MEM_TESTDEV=m | 3440 | CONFIG_VIDEO_MEM2MEM_TESTDEV=m |
3441 | CONFIG_DVB_MAX_ADAPTERS=8 | ||
3442 | # CONFIG_DVB_DYNAMIC_MINORS is not set | ||
3443 | CONFIG_DVB_CAPTURE_DRIVERS=y | ||
3444 | |||
3445 | # | ||
3446 | # Supported SAA7146 based PCI Adapters | ||
3447 | # | ||
3448 | CONFIG_TTPCI_EEPROM=m | ||
3449 | CONFIG_DVB_AV7110=m | ||
3450 | CONFIG_DVB_AV7110_OSD=y | ||
3451 | CONFIG_DVB_BUDGET_CORE=m | ||
3452 | CONFIG_DVB_BUDGET=m | ||
3453 | CONFIG_DVB_BUDGET_AV=m | ||
3454 | CONFIG_DVB_BUDGET_PATCH=m | ||
3455 | |||
3456 | # | ||
3457 | # Supported USB Adapters | ||
3458 | # | ||
3459 | CONFIG_DVB_TTUSB_BUDGET=m | ||
3460 | CONFIG_DVB_TTUSB_DEC=m | ||
3461 | |||
3462 | # | ||
3463 | # Supported FlexCopII (B2C2) Adapters | ||
3464 | # | ||
3465 | CONFIG_DVB_B2C2_FLEXCOP=m | ||
3466 | CONFIG_DVB_B2C2_FLEXCOP_PCI=m | ||
3467 | CONFIG_DVB_B2C2_FLEXCOP_USB=m | ||
3468 | # CONFIG_DVB_B2C2_FLEXCOP_DEBUG is not set | ||
3469 | |||
3470 | # | ||
3471 | # Supported BT878 Adapters | ||
3472 | # | ||
3473 | |||
3474 | # | ||
3475 | # Supported Pluto2 Adapters | ||
3476 | # | ||
3477 | CONFIG_DVB_PLUTO2=m | ||
3478 | |||
3479 | # | ||
3480 | # Supported SDMC DM1105 Adapters | ||
3481 | # | ||
3482 | |||
3483 | # | ||
3484 | # Supported FireWire (IEEE 1394) Adapters | ||
3485 | # | ||
3486 | CONFIG_DVB_FIREDTV=m | ||
3487 | CONFIG_DVB_FIREDTV_INPUT=y | ||
3488 | |||
3489 | # | ||
3490 | # Supported Earthsoft PT1 Adapters | ||
3491 | # | ||
3492 | CONFIG_DVB_PT1=m | ||
3493 | |||
3494 | # | ||
3495 | # Supported Mantis Adapters | ||
3496 | # | ||
3497 | |||
3498 | # | ||
3499 | # Supported nGene Adapters | ||
3500 | # | ||
3501 | CONFIG_DVB_NGENE=m | ||
3502 | |||
3503 | # | ||
3504 | # Supported ddbridge ('Octopus') Adapters | ||
3505 | # | ||
3506 | CONFIG_DVB_DDBRIDGE=m | ||
3507 | |||
3508 | # | ||
3509 | # Supported DVB Frontends | ||
3510 | # | ||
3511 | # CONFIG_DVB_FE_CUSTOMISE is not set | ||
3512 | |||
3513 | # | ||
3514 | # Multistandard (satellite) frontends | ||
3515 | # | ||
3516 | CONFIG_DVB_STB0899=m | ||
3517 | CONFIG_DVB_STV090x=m | ||
3518 | CONFIG_DVB_STV6110x=m | ||
3519 | |||
3520 | # | ||
3521 | # Multistandard (cable + terrestrial) frontends | ||
3522 | # | ||
3523 | CONFIG_DVB_DRXK=m | ||
3524 | CONFIG_DVB_TDA18271C2DD=m | ||
3525 | |||
3526 | # | ||
3527 | # DVB-S (satellite) frontends | ||
3528 | # | ||
3529 | CONFIG_DVB_CX24123=m | ||
3530 | CONFIG_DVB_MT312=m | ||
3531 | CONFIG_DVB_S5H1420=m | ||
3532 | CONFIG_DVB_STV0299=m | ||
3533 | CONFIG_DVB_TDA8083=m | ||
3534 | CONFIG_DVB_TDA10086=m | ||
3535 | CONFIG_DVB_TDA8261=m | ||
3536 | CONFIG_DVB_VES1X93=m | ||
3537 | CONFIG_DVB_TUNER_ITD1000=m | ||
3538 | CONFIG_DVB_TUNER_CX24113=m | ||
3539 | CONFIG_DVB_TDA826X=m | ||
3540 | CONFIG_DVB_TUA6100=m | ||
3541 | |||
3542 | # | ||
3543 | # DVB-T (terrestrial) frontends | ||
3544 | # | ||
3545 | CONFIG_DVB_SP8870=m | ||
3546 | CONFIG_DVB_CX22700=m | ||
3547 | CONFIG_DVB_L64781=m | ||
3548 | CONFIG_DVB_TDA1004X=m | ||
3549 | CONFIG_DVB_MT352=m | ||
3550 | |||
3551 | # | ||
3552 | # DVB-C (cable) frontends | ||
3553 | # | ||
3554 | CONFIG_DVB_VES1820=m | ||
3555 | CONFIG_DVB_TDA10021=m | ||
3556 | CONFIG_DVB_TDA10023=m | ||
3557 | CONFIG_DVB_STV0297=m | ||
3558 | |||
3559 | # | ||
3560 | # ATSC (North American/Korean Terrestrial/Cable DTV) frontends | ||
3561 | # | ||
3562 | CONFIG_DVB_NXT200X=m | ||
3563 | CONFIG_DVB_BCM3510=m | ||
3564 | CONFIG_DVB_LGDT330X=m | ||
3565 | |||
3566 | # | ||
3567 | # ISDB-T (terrestrial) frontends | ||
3568 | # | ||
3569 | |||
3570 | # | ||
3571 | # Digital terrestrial only tuners/PLL | ||
3572 | # | ||
3573 | CONFIG_DVB_PLL=m | ||
3574 | |||
3575 | # | ||
3576 | # SEC control devices for DVB-S | ||
3577 | # | ||
3578 | CONFIG_DVB_LNBP21=m | ||
3579 | CONFIG_DVB_ISL6421=m | ||
3580 | CONFIG_DVB_ISL6423=m | ||
3581 | |||
3582 | # | ||
3583 | # Tools to develop new frontends | ||
3584 | # | ||
3585 | # CONFIG_DVB_DUMMY_FE is not set | ||
3431 | 3586 | ||
3432 | # | 3587 | # |
3433 | # Graphics support | 3588 | # Graphics support |
diff --git a/main/linux-vserver/kernelconfig.x86_64 b/main/linux-vserver/kernelconfig.x86_64 index 889204b6ab..0da3acb1ec 100644 --- a/main/linux-vserver/kernelconfig.x86_64 +++ b/main/linux-vserver/kernelconfig.x86_64 | |||
@@ -1,6 +1,6 @@ | |||
1 | # | 1 | # |
2 | # Automatically generated file; DO NOT EDIT. | 2 | # Automatically generated file; DO NOT EDIT. |
3 | # Linux/x86_64 3.6.3-vs2.3.4.3-noxfs-nocow Kernel Configuration | 3 | # Linux/x86_64 3.6.6-vs2.3.4.3-noxfs-nocow Kernel Configuration |
4 | # | 4 | # |
5 | CONFIG_64BIT=y | 5 | CONFIG_64BIT=y |
6 | # CONFIG_X86_32 is not set | 6 | # CONFIG_X86_32 is not set |
@@ -3188,19 +3188,28 @@ CONFIG_MEDIA_SUPPORT=m | |||
3188 | # | 3188 | # |
3189 | CONFIG_MEDIA_CAMERA_SUPPORT=y | 3189 | CONFIG_MEDIA_CAMERA_SUPPORT=y |
3190 | # CONFIG_MEDIA_ANALOG_TV_SUPPORT is not set | 3190 | # CONFIG_MEDIA_ANALOG_TV_SUPPORT is not set |
3191 | # CONFIG_MEDIA_DIGITAL_TV_SUPPORT is not set | 3191 | CONFIG_MEDIA_DIGITAL_TV_SUPPORT=y |
3192 | # CONFIG_MEDIA_RADIO_SUPPORT is not set | 3192 | # CONFIG_MEDIA_RADIO_SUPPORT is not set |
3193 | # CONFIG_MEDIA_RC_SUPPORT is not set | 3193 | # CONFIG_MEDIA_RC_SUPPORT is not set |
3194 | CONFIG_MEDIA_CONTROLLER=y | 3194 | CONFIG_MEDIA_CONTROLLER=y |
3195 | CONFIG_VIDEO_DEV=m | 3195 | CONFIG_VIDEO_DEV=m |
3196 | CONFIG_VIDEO_V4L2_COMMON=m | 3196 | CONFIG_VIDEO_V4L2_COMMON=m |
3197 | CONFIG_VIDEO_V4L2_SUBDEV_API=y | 3197 | CONFIG_VIDEO_V4L2_SUBDEV_API=y |
3198 | CONFIG_DVB_CORE=m | ||
3199 | CONFIG_DVB_NET=y | ||
3198 | 3200 | ||
3199 | # | 3201 | # |
3200 | # Media drivers | 3202 | # Media drivers |
3201 | # | 3203 | # |
3204 | CONFIG_VIDEO_SAA7146=m | ||
3205 | CONFIG_VIDEO_SAA7146_VV=m | ||
3206 | # CONFIG_MEDIA_ATTACH is not set | ||
3207 | CONFIG_MEDIA_TUNER_SIMPLE=m | ||
3208 | CONFIG_MEDIA_TUNER_TDA9887=m | ||
3209 | CONFIG_MEDIA_TUNER_MT2131=m | ||
3202 | CONFIG_VIDEO_V4L2=m | 3210 | CONFIG_VIDEO_V4L2=m |
3203 | CONFIG_VIDEOBUF_GEN=m | 3211 | CONFIG_VIDEOBUF_GEN=m |
3212 | CONFIG_VIDEOBUF_DMA_SG=m | ||
3204 | CONFIG_VIDEOBUF_VMALLOC=m | 3213 | CONFIG_VIDEOBUF_VMALLOC=m |
3205 | CONFIG_VIDEO_TVEEPROM=m | 3214 | CONFIG_VIDEO_TVEEPROM=m |
3206 | CONFIG_VIDEO_TUNER=m | 3215 | CONFIG_VIDEO_TUNER=m |
@@ -3378,10 +3387,156 @@ CONFIG_USB_SN9C102=m | |||
3378 | # | 3387 | # |
3379 | CONFIG_VIDEO_EM28XX=m | 3388 | CONFIG_VIDEO_EM28XX=m |
3380 | CONFIG_VIDEO_EM28XX_ALSA=m | 3389 | CONFIG_VIDEO_EM28XX_ALSA=m |
3390 | # CONFIG_VIDEO_EM28XX_DVB is not set | ||
3381 | # CONFIG_V4L_ISA_PARPORT_DRIVERS is not set | 3391 | # CONFIG_V4L_ISA_PARPORT_DRIVERS is not set |
3382 | # CONFIG_V4L_PLATFORM_DRIVERS is not set | 3392 | # CONFIG_V4L_PLATFORM_DRIVERS is not set |
3383 | CONFIG_V4L_MEM2MEM_DRIVERS=y | 3393 | CONFIG_V4L_MEM2MEM_DRIVERS=y |
3384 | CONFIG_VIDEO_MEM2MEM_TESTDEV=m | 3394 | CONFIG_VIDEO_MEM2MEM_TESTDEV=m |
3395 | CONFIG_DVB_MAX_ADAPTERS=8 | ||
3396 | # CONFIG_DVB_DYNAMIC_MINORS is not set | ||
3397 | CONFIG_DVB_CAPTURE_DRIVERS=y | ||
3398 | |||
3399 | # | ||
3400 | # Supported SAA7146 based PCI Adapters | ||
3401 | # | ||
3402 | CONFIG_TTPCI_EEPROM=m | ||
3403 | CONFIG_DVB_AV7110=m | ||
3404 | CONFIG_DVB_AV7110_OSD=y | ||
3405 | CONFIG_DVB_BUDGET_CORE=m | ||
3406 | CONFIG_DVB_BUDGET=m | ||
3407 | CONFIG_DVB_BUDGET_AV=m | ||
3408 | CONFIG_DVB_BUDGET_PATCH=m | ||
3409 | |||
3410 | # | ||
3411 | # Supported USB Adapters | ||
3412 | # | ||
3413 | CONFIG_DVB_TTUSB_BUDGET=m | ||
3414 | CONFIG_DVB_TTUSB_DEC=m | ||
3415 | |||
3416 | # | ||
3417 | # Supported FlexCopII (B2C2) Adapters | ||
3418 | # | ||
3419 | CONFIG_DVB_B2C2_FLEXCOP=m | ||
3420 | CONFIG_DVB_B2C2_FLEXCOP_PCI=m | ||
3421 | CONFIG_DVB_B2C2_FLEXCOP_USB=m | ||
3422 | # CONFIG_DVB_B2C2_FLEXCOP_DEBUG is not set | ||
3423 | |||
3424 | # | ||
3425 | # Supported BT878 Adapters | ||
3426 | # | ||
3427 | |||
3428 | # | ||
3429 | # Supported Pluto2 Adapters | ||
3430 | # | ||
3431 | CONFIG_DVB_PLUTO2=m | ||
3432 | |||
3433 | # | ||
3434 | # Supported SDMC DM1105 Adapters | ||
3435 | # | ||
3436 | |||
3437 | # | ||
3438 | # Supported FireWire (IEEE 1394) Adapters | ||
3439 | # | ||
3440 | CONFIG_DVB_FIREDTV=m | ||
3441 | CONFIG_DVB_FIREDTV_INPUT=y | ||
3442 | |||
3443 | # | ||
3444 | # Supported Earthsoft PT1 Adapters | ||
3445 | # | ||
3446 | CONFIG_DVB_PT1=m | ||
3447 | |||
3448 | # | ||
3449 | # Supported Mantis Adapters | ||
3450 | # | ||
3451 | |||
3452 | # | ||
3453 | # Supported nGene Adapters | ||
3454 | # | ||
3455 | CONFIG_DVB_NGENE=m | ||
3456 | |||
3457 | # | ||
3458 | # Supported ddbridge ('Octopus') Adapters | ||
3459 | # | ||
3460 | CONFIG_DVB_DDBRIDGE=m | ||
3461 | |||
3462 | # | ||
3463 | # Supported DVB Frontends | ||
3464 | # | ||
3465 | # CONFIG_DVB_FE_CUSTOMISE is not set | ||
3466 | |||
3467 | # | ||
3468 | # Multistandard (satellite) frontends | ||
3469 | # | ||
3470 | CONFIG_DVB_STB0899=m | ||
3471 | CONFIG_DVB_STV090x=m | ||
3472 | CONFIG_DVB_STV6110x=m | ||
3473 | |||
3474 | # | ||
3475 | # Multistandard (cable + terrestrial) frontends | ||
3476 | # | ||
3477 | CONFIG_DVB_DRXK=m | ||
3478 | CONFIG_DVB_TDA18271C2DD=m | ||
3479 | |||
3480 | # | ||
3481 | # DVB-S (satellite) frontends | ||
3482 | # | ||
3483 | CONFIG_DVB_CX24123=m | ||
3484 | CONFIG_DVB_MT312=m | ||
3485 | CONFIG_DVB_S5H1420=m | ||
3486 | CONFIG_DVB_STV0299=m | ||
3487 | CONFIG_DVB_TDA8083=m | ||
3488 | CONFIG_DVB_TDA10086=m | ||
3489 | CONFIG_DVB_TDA8261=m | ||
3490 | CONFIG_DVB_VES1X93=m | ||
3491 | CONFIG_DVB_TUNER_ITD1000=m | ||
3492 | CONFIG_DVB_TUNER_CX24113=m | ||
3493 | CONFIG_DVB_TDA826X=m | ||
3494 | CONFIG_DVB_TUA6100=m | ||
3495 | |||
3496 | # | ||
3497 | # DVB-T (terrestrial) frontends | ||
3498 | # | ||
3499 | CONFIG_DVB_SP8870=m | ||
3500 | CONFIG_DVB_CX22700=m | ||
3501 | CONFIG_DVB_L64781=m | ||
3502 | CONFIG_DVB_TDA1004X=m | ||
3503 | CONFIG_DVB_MT352=m | ||
3504 | |||
3505 | # | ||
3506 | # DVB-C (cable) frontends | ||
3507 | # | ||
3508 | CONFIG_DVB_VES1820=m | ||
3509 | CONFIG_DVB_TDA10021=m | ||
3510 | CONFIG_DVB_TDA10023=m | ||
3511 | CONFIG_DVB_STV0297=m | ||
3512 | |||
3513 | # | ||
3514 | # ATSC (North American/Korean Terrestrial/Cable DTV) frontends | ||
3515 | # | ||
3516 | CONFIG_DVB_NXT200X=m | ||
3517 | CONFIG_DVB_BCM3510=m | ||
3518 | CONFIG_DVB_LGDT330X=m | ||
3519 | |||
3520 | # | ||
3521 | # ISDB-T (terrestrial) frontends | ||
3522 | # | ||
3523 | |||
3524 | # | ||
3525 | # Digital terrestrial only tuners/PLL | ||
3526 | # | ||
3527 | CONFIG_DVB_PLL=m | ||
3528 | |||
3529 | # | ||
3530 | # SEC control devices for DVB-S | ||
3531 | # | ||
3532 | CONFIG_DVB_LNBP21=m | ||
3533 | CONFIG_DVB_ISL6421=m | ||
3534 | CONFIG_DVB_ISL6423=m | ||
3535 | |||
3536 | # | ||
3537 | # Tools to develop new frontends | ||
3538 | # | ||
3539 | # CONFIG_DVB_DUMMY_FE is not set | ||
3385 | 3540 | ||
3386 | # | 3541 | # |
3387 | # Graphics support | 3542 | # Graphics support |
diff --git a/main/linux-vserver/patch-3.6.4-vs2.3.4.3-noxfs-nocow.diff b/main/linux-vserver/patch-3.6.6-vs2.3.4.3-noxfs-nocow.diff index 60c747cc24..174508fedb 100644 --- a/main/linux-vserver/patch-3.6.4-vs2.3.4.3-noxfs-nocow.diff +++ b/main/linux-vserver/patch-3.6.6-vs2.3.4.3-noxfs-nocow.diff | |||
@@ -162,7 +162,7 @@ diff -NurpP --minimal linux-3.6/Makefile linux-3.6-vs2.3.4.3-noxfs-nocow/Makefil | |||
162 | @@ -1,7 +1,7 @@ | 162 | @@ -1,7 +1,7 @@ |
163 | VERSION = 3 | 163 | VERSION = 3 |
164 | PATCHLEVEL = 6 | 164 | PATCHLEVEL = 6 |
165 | SUBLEVEL = 4 | 165 | SUBLEVEL = 6 |
166 | -EXTRAVERSION = | 166 | -EXTRAVERSION = |
167 | +EXTRAVERSION = -vs2.3.4.3-noxfs-nocow | 167 | +EXTRAVERSION = -vs2.3.4.3-noxfs-nocow |
168 | NAME = Terrified Chipmunk | 168 | NAME = Terrified Chipmunk |