Merge. 1.7
author"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Tue May 18 22:59:08 2010 +0200 (2010-05-18)
branch1.7
changeset 1951583c6e1510f5
parent 1949 838fb48dcd00
parent 1950 492937e513a0
child 1995 baac9973521e
Merge.
     1.1 --- a/config/kernel/linux.in	Tue May 18 22:58:49 2010 +0200
     1.2 +++ b/config/kernel/linux.in	Tue May 18 22:59:08 2010 +0200
     1.3 @@ -34,14 +34,6 @@
     1.4  # Don't remove next line
     1.5  # CT_INSERT_VERSION_BELOW
     1.6  
     1.7 -config KERNEL_V_2_6_33_4
     1.8 -    bool
     1.9 -    prompt "2.6.33.4"
    1.10 -
    1.11 -config KERNEL_V_2_6_33_3
    1.12 -    bool
    1.13 -    prompt "2.6.33.3"
    1.14 -
    1.15  config KERNEL_V_2_6_33_2
    1.16      bool
    1.17      prompt "2.6.33.2"
    1.18 @@ -54,9 +46,9 @@
    1.19      bool
    1.20      prompt "2.6.33"
    1.21  
    1.22 -config KERNEL_V_2_6_32_13
    1.23 +config KERNEL_V_2_6_32_11
    1.24      bool
    1.25 -    prompt "2.6.32.13"
    1.26 +    prompt "2.6.32.11"
    1.27  
    1.28  config KERNEL_V_2_6_31_13
    1.29      bool
    1.30 @@ -66,6 +58,16 @@
    1.31      bool
    1.32      prompt "2.6.30.10"
    1.33  
    1.34 +config KERNEL_V_2_6_29_6
    1.35 +    bool
    1.36 +    prompt "2.6.29.6 (OBSOLETE)"
    1.37 +    depends on OBSOLETE
    1.38 +
    1.39 +config KERNEL_V_2_6_28_10
    1.40 +    bool
    1.41 +    prompt "2.6.28.10 (OBSOLETE)"
    1.42 +    depends on OBSOLETE
    1.43 +
    1.44  config KERNEL_V_2_6_27_46
    1.45      bool
    1.46      prompt "2.6.27.46 (long-term stable)"
    1.47 @@ -89,14 +91,14 @@
    1.48      string
    1.49  # Don't remove next line
    1.50  # CT_INSERT_VERSION_STRING_BELOW
    1.51 -    default "2.6.33.4" if KERNEL_V_2_6_33_4
    1.52 -    default "2.6.33.3" if KERNEL_V_2_6_33_3
    1.53      default "2.6.33.2" if KERNEL_V_2_6_33_2
    1.54      default "2.6.33.1" if KERNEL_V_2_6_33_1
    1.55      default "2.6.33" if KERNEL_V_2_6_33
    1.56 -    default "2.6.32.13" if KERNEL_V_2_6_32_13
    1.57 +    default "2.6.32.11" if KERNEL_V_2_6_32_11
    1.58      default "2.6.31.13" if KERNEL_V_2_6_31_13
    1.59      default "2.6.30.10" if KERNEL_V_2_6_30_10
    1.60 +    default "2.6.29.6" if KERNEL_V_2_6_29_6
    1.61 +    default "2.6.28.10" if KERNEL_V_2_6_28_10
    1.62      default "2.6.27.46" if KERNEL_V_2_6_27_46
    1.63  
    1.64  choice