diff options
111 files changed, 2389 insertions, 1062 deletions
diff --git a/Documentation/DocBook/libata.tmpl b/Documentation/DocBook/libata.tmpl index 07a635590b36..e2e24b4778d4 100644 --- a/Documentation/DocBook/libata.tmpl +++ b/Documentation/DocBook/libata.tmpl | |||
| @@ -883,7 +883,7 @@ and other resources, etc. | |||
| 883 | </chapter> | 883 | </chapter> |
| 884 | 884 | ||
| 885 | <chapter id="ataExceptions"> | 885 | <chapter id="ataExceptions"> |
| 886 | <title>ATA errors & exceptions</title> | 886 | <title>ATA errors and exceptions</title> |
| 887 | 887 | ||
| 888 | <para> | 888 | <para> |
| 889 | This chapter tries to identify what error/exception conditions exist | 889 | This chapter tries to identify what error/exception conditions exist |
diff --git a/Documentation/filesystems/ntfs.txt b/Documentation/filesystems/ntfs.txt index 13ba649bda75..81779068b09b 100644 --- a/Documentation/filesystems/ntfs.txt +++ b/Documentation/filesystems/ntfs.txt | |||
| @@ -457,6 +457,8 @@ ChangeLog | |||
| 457 | 457 | ||
| 458 | Note, a technical ChangeLog aimed at kernel hackers is in fs/ntfs/ChangeLog. | 458 | Note, a technical ChangeLog aimed at kernel hackers is in fs/ntfs/ChangeLog. |
| 459 | 459 | ||
| 460 | 2.1.28: | ||
| 461 | - Fix a deadlock. | ||
| 460 | 2.1.27: | 462 | 2.1.27: |
| 461 | - Implement page migration support so the kernel can move memory used | 463 | - Implement page migration support so the kernel can move memory used |
| 462 | by NTFS files and directories around for management purposes. | 464 | by NTFS files and directories around for management purposes. |
diff --git a/Documentation/hwmon/w83793 b/Documentation/hwmon/w83793 index 45e5408340e0..51171a83165b 100644 --- a/Documentation/hwmon/w83793 +++ b/Documentation/hwmon/w83793 | |||
| @@ -45,18 +45,14 @@ This driver implements support for Winbond W83793G/W83793R chips. | |||
| 45 | temp5-6 have a 1 degree Celsiis resolution. | 45 | temp5-6 have a 1 degree Celsiis resolution. |
| 46 | 46 | ||
| 47 | * Temperature sensor types | 47 | * Temperature sensor types |
| 48 | Temp1-4 have 3 possible types. It can be read from (and written to) | 48 | Temp1-4 have 2 possible types. It can be read from (and written to) |
| 49 | temp[1-4]_type. | 49 | temp[1-4]_type. |
| 50 | - If the value of 0, the related temperature channel stops | ||
| 51 | monitoring. | ||
| 52 | - If the value is 3, it starts monitoring using a remote termal diode | 50 | - If the value is 3, it starts monitoring using a remote termal diode |
| 53 | (default). | 51 | (default). |
| 54 | - If the value is 5, it starts monitoring using the temperature sensor | ||
| 55 | in AMD CPU and get result by AMDSI. | ||
| 56 | - If the value is 6, it starts monitoring using the temperature sensor | 52 | - If the value is 6, it starts monitoring using the temperature sensor |
| 57 | in Intel CPU and get result by PECI. | 53 | in Intel CPU and get result by PECI. |
| 58 | Temp5-6 can be connected to external thermistors (value of | 54 | Temp5-6 can be connected to external thermistors (value of |
| 59 | temp[5-6]_type is 4). They can also be disabled (value is 0). | 55 | temp[5-6]_type is 4). |
| 60 | 56 | ||
| 61 | * Alarm mechanism | 57 | * Alarm mechanism |
| 62 | For voltage sensors, an alarm triggers if the measured value is below | 58 | For voltage sensors, an alarm triggers if the measured value is below |
diff --git a/Documentation/powerpc/mpc52xx-device-tree-bindings.txt b/Documentation/powerpc/mpc52xx-device-tree-bindings.txt index 7fb3b8a44eb6..69f016f02bb0 100644 --- a/Documentation/powerpc/mpc52xx-device-tree-bindings.txt +++ b/Documentation/powerpc/mpc52xx-device-tree-bindings.txt | |||
| @@ -4,6 +4,12 @@ MPC52xx Device Tree Bindings | |||
| 4 | (c) 2006 Secret Lab Technologies Ltd | 4 | (c) 2006 Secret Lab Technologies Ltd |
| 5 | Grant Likely <grant.likely at secretlab.ca> | 5 | Grant Likely <grant.likely at secretlab.ca> |
| 6 | 6 | ||
| 7 | ********** DRAFT *********** | ||
| 8 | * WARNING: Do not depend on the stability of these bindings just yet. | ||
| 9 | * The MPC5200 device tree conventions are still in flux | ||
| 10 | * Keep an eye on the linuxppc-dev mailing list for more details | ||
| 11 | ********** DRAFT *********** | ||
| 12 | |||
| 7 | I - Introduction | 13 | I - Introduction |
| 8 | ================ | 14 | ================ |
| 9 | Boards supported by the arch/powerpc architecture require device tree be | 15 | Boards supported by the arch/powerpc architecture require device tree be |
diff --git a/Documentation/scsi/aacraid.txt b/Documentation/scsi/aacraid.txt index 3367130e64f6..dc8e44fc650f 100644 --- a/Documentation/scsi/aacraid.txt +++ b/Documentation/scsi/aacraid.txt | |||
| @@ -11,43 +11,42 @@ the original). | |||
| 11 | Supported Cards/Chipsets | 11 | Supported Cards/Chipsets |
| 12 | ------------------------- | 12 | ------------------------- |
| 13 | PCI ID (pci.ids) OEM Product | 13 | PCI ID (pci.ids) OEM Product |
| 14 | 9005:0283:9005:0283 Adaptec Catapult (3210S with arc firmware) | ||
| 15 | 9005:0284:9005:0284 Adaptec Tomcat (3410S with arc firmware) | ||
| 16 | 9005:0285:9005:0285 Adaptec 2200S (Vulcan) | 14 | 9005:0285:9005:0285 Adaptec 2200S (Vulcan) |
| 17 | 9005:0285:9005:0286 Adaptec 2120S (Crusader) | 15 | 9005:0285:9005:0286 Adaptec 2120S (Crusader) |
| 18 | 9005:0285:9005:0287 Adaptec 2200S (Vulcan-2m) | 16 | 9005:0285:9005:0287 Adaptec 2200S (Vulcan-2m) |
| 19 | 9005:0285:9005:0288 Adaptec 3230S (Harrier) | 17 | 9005:0285:9005:0288 Adaptec 3230S (Harrier) |
| 20 | 9005:0285:9005:0289 Adaptec 3240S (Tornado) | 18 | 9005:0285:9005:0289 Adaptec 3240S (Tornado) |
| 21 | 9005:0285:9005:028a Adaptec 2020ZCR (Skyhawk) | 19 | 9005:0285:9005:028a Adaptec 2020ZCR (Skyhawk) |
| 22 | 9005:0285:9005:028b Adaptec 2025ZCR (Terminator) | 20 | 9005:0285:9005:028b Adaptec 2025ZCR (Terminator) |
| 23 | 9005:0286:9005:028c Adaptec 2230S (Lancer) | 21 | 9005:0286:9005:028c Adaptec 2230S (Lancer) |
| 24 | 9005:0286:9005:028c Adaptec 2230SLP (Lancer) | 22 | 9005:0286:9005:028c Adaptec 2230SLP (Lancer) |
| 25 | 9005:0286:9005:028d Adaptec 2130S (Lancer) | 23 | 9005:0286:9005:028d Adaptec 2130S (Lancer) |
| 26 | 9005:0285:9005:028e Adaptec 2020SA (Skyhawk) | 24 | 9005:0285:9005:028e Adaptec 2020SA (Skyhawk) |
| 27 | 9005:0285:9005:028f Adaptec 2025SA (Terminator) | 25 | 9005:0285:9005:028f Adaptec 2025SA (Terminator) |
| 28 | 9005:0285:9005:0290 Adaptec 2410SA (Jaguar) | 26 | 9005:0285:9005:0290 Adaptec 2410SA (Jaguar) |
| 29 | 9005:0285:103c:3227 Adaptec 2610SA (Bearcat HP release) | 27 | 9005:0285:103c:3227 Adaptec 2610SA (Bearcat HP release) |
| 30 | 9005:0285:9005:0293 Adaptec 21610SA (Corsair-16) | 28 | 9005:0285:9005:0293 Adaptec 21610SA (Corsair-16) |
| 31 | 9005:0285:9005:0296 Adaptec 2240S (SabreExpress) | 29 | 9005:0285:9005:0296 Adaptec 2240S (SabreExpress) |
| 32 | 9005:0285:9005:0292 Adaptec 2810SA (Corsair-8) | 30 | 9005:0285:9005:0292 Adaptec 2810SA (Corsair-8) |
| 33 | 9005:0285:9005:0294 Adaptec Prowler | 31 | 9005:0285:9005:0297 Adaptec 4005 (AvonPark) |
| 34 | 9005:0285:9005:0297 Adaptec 4005SAS (AvonPark) | 32 | 9005:0285:9005:0298 Adaptec 4000 (BlackBird) |
| 35 | 9005:0285:9005:0298 Adaptec 4000SAS (BlackBird) | ||
| 36 | 9005:0285:9005:0299 Adaptec 4800SAS (Marauder-X) | 33 | 9005:0285:9005:0299 Adaptec 4800SAS (Marauder-X) |
| 37 | 9005:0285:9005:029a Adaptec 4805SAS (Marauder-E) | 34 | 9005:0285:9005:029a Adaptec 4805SAS (Marauder-E) |
| 38 | 9005:0286:9005:029b Adaptec 2820SA (Intruder) | 35 | 9005:0286:9005:029b Adaptec 2820SA (Intruder) |
| 39 | 9005:0286:9005:029c Adaptec 2620SA (Intruder) | 36 | 9005:0286:9005:029c Adaptec 2620SA (Intruder) |
| 40 | 9005:0286:9005:029d Adaptec 2420SA (Intruder HP release) | 37 | 9005:0286:9005:029d Adaptec 2420SA (Intruder HP release) |
| 41 | 9005:0286:9005:02a2 Adaptec 3800SAS (Hurricane44) | 38 | 9005:0286:9005:02ac Adaptec 1800 (Typhoon44) |
| 42 | 9005:0286:9005:02a7 Adaptec 3805SAS (Hurricane80) | 39 | 9005:0285:9005:02b5 Adaptec 5445 (Voodoo44) |
| 43 | 9005:0286:9005:02a8 Adaptec 3400SAS (Hurricane40) | 40 | 9005:0285:9005:02b6 Adaptec 5805 (Voodoo80) |
| 44 | 9005:0286:9005:02ac Adaptec 1800SAS (Typhoon44) | 41 | 9005:0285:9005:02b7 Adaptec 5085 (Voodoo08) |
| 45 | 9005:0286:9005:02b3 Adaptec 2400SAS (Hurricane40lm) | 42 | 9005:0285:9005:02bb Adaptec 3405 (Marauder40LP) |
| 46 | 9005:0285:9005:02b5 Adaptec ASR5800 (Voodoo44) | 43 | 9005:0285:9005:02bc Adaptec 3805 (Marauder80LP) |
| 47 | 9005:0285:9005:02b6 Adaptec ASR5805 (Voodoo80) | 44 | 9005:0285:9005:02c7 Adaptec 3085 (Marauder08ELP) |
| 48 | 9005:0285:9005:02b7 Adaptec ASR5808 (Voodoo08) | 45 | 9005:0285:9005:02bd Adaptec 31205 (Marauder120) |
| 46 | 9005:0285:9005:02be Adaptec 31605 (Marauder160) | ||
| 47 | 9005:0285:9005:02c3 Adaptec 51205 (Voodoo120) | ||
| 48 | 9005:0285:9005:02c4 Adaptec 51605 (Voodoo160) | ||
| 49 | 1011:0046:9005:0364 Adaptec 5400S (Mustang) | 49 | 1011:0046:9005:0364 Adaptec 5400S (Mustang) |
| 50 | 1011:0046:9005:0365 Adaptec 5400S (Mustang) | ||
| 51 | 9005:0287:9005:0800 Adaptec Themisto (Jupiter) | 50 | 9005:0287:9005:0800 Adaptec Themisto (Jupiter) |
| 52 | 9005:0200:9005:0200 Adaptec Themisto (Jupiter) | 51 | 9005:0200:9005:0200 Adaptec Themisto (Jupiter) |
| 53 | 9005:0286:9005:0800 Adaptec Callisto (Jupiter) | 52 | 9005:0286:9005:0800 Adaptec Callisto (Jupiter) |
| @@ -68,21 +67,32 @@ Supported Cards/Chipsets | |||
| 68 | 9005:0285:17aa:0287 Legend S230 (Vulcan) | 67 | 9005:0285:17aa:0287 Legend S230 (Vulcan) |
| 69 | 9005:0285:9005:0290 IBM ServeRAID 7t (Jaguar) | 68 | 9005:0285:9005:0290 IBM ServeRAID 7t (Jaguar) |
| 70 | 9005:0285:1014:02F2 IBM ServeRAID 8i (AvonPark) | 69 | 9005:0285:1014:02F2 IBM ServeRAID 8i (AvonPark) |
| 71 | 9005:0285:1014:0312 IBM ServeRAID 8i (AvonParkLite) | ||
| 72 | 9005:0286:1014:9540 IBM ServeRAID 8k/8k-l4 (AuroraLite) | 70 | 9005:0286:1014:9540 IBM ServeRAID 8k/8k-l4 (AuroraLite) |
| 73 | 9005:0286:1014:9580 IBM ServeRAID 8k/8k-l8 (Aurora) | 71 | 9005:0286:1014:9580 IBM ServeRAID 8k/8k-l8 (Aurora) |
| 74 | 9005:0286:1014:034d IBM ServeRAID 8s (Hurricane) | 72 | 9005:0285:1014:034d IBM ServeRAID 8s (Marauder-E) |
| 75 | 9005:0286:9005:029e ICP ICP9024R0 (Lancer) | 73 | 9005:0286:9005:029e ICP ICP9024RO (Lancer) |
| 76 | 9005:0286:9005:029f ICP ICP9014R0 (Lancer) | 74 | 9005:0286:9005:029f ICP ICP9014RO (Lancer) |
| 77 | 9005:0286:9005:02a0 ICP ICP9047MA (Lancer) | 75 | 9005:0286:9005:02a0 ICP ICP9047MA (Lancer) |
| 78 | 9005:0286:9005:02a1 ICP ICP9087MA (Lancer) | 76 | 9005:0286:9005:02a1 ICP ICP9087MA (Lancer) |
| 79 | 9005:0286:9005:02a3 ICP ICP5445AU (Hurricane44) | 77 | 9005:0285:9005:02a4 ICP ICP9085LI (Marauder-X) |
| 80 | 9005:0286:9005:02a4 ICP ICP9085LI (Marauder-X) | 78 | 9005:0285:9005:02a5 ICP ICP5085BR (Marauder-E) |
| 81 | 9005:0286:9005:02a5 ICP ICP5085BR (Marauder-E) | ||
| 82 | 9005:0286:9005:02a6 ICP ICP9067MA (Intruder-6) | 79 | 9005:0286:9005:02a6 ICP ICP9067MA (Intruder-6) |
| 83 | 9005:0286:9005:02a9 ICP ICP5085AU (Hurricane80) | 80 | 9005:0285:9005:02b2 ICP (Voodoo 8 internal 8 external) |
| 84 | 9005:0286:9005:02aa ICP ICP5045AU (Hurricane40) | 81 | 9005:0285:9005:02b8 ICP ICP5445SL (Voodoo44) |
| 85 | 9005:0286:9005:02b4 ICP ICP5045AL (Hurricane40lm) | 82 | 9005:0285:9005:02b9 ICP ICP5085SL (Voodoo80) |
| 83 | 9005:0285:9005:02ba ICP ICP5805SL (Voodoo08) | ||
| 84 | 9005:0285:9005:02bf ICP ICP5045BL (Marauder40LP) | ||
| 85 | 9005:0285:9005:02c0 ICP ICP5085BL (Marauder80LP) | ||
| 86 | 9005:0285:9005:02c8 ICP ICP5805BL (Marauder08ELP) | ||
| 87 | 9005:0285:9005:02c1 ICP ICP5125BR (Marauder120) | ||
| 88 | 9005:0285:9005:02c2 ICP ICP5165BR (Marauder160) | ||
| 89 | 9005:0285:9005:02c5 ICP ICP5125SL (Voodoo120) | ||
| 90 | 9005:0285:9005:02c6 ICP ICP5165SL (Voodoo160) | ||
| 91 | 9005:0286:9005:02ab (Typhoon40) | ||
| 92 | 9005:0286:9005:02ad (Aurora ARK) | ||
| 93 | 9005:0286:9005:02ae (Aurora Lite ARK) | ||
| 94 | 9005:0285:9005:02b0 (Sunrise Lake ARK) | ||
| 95 | 9005:0285:9005:02b1 Adaptec (Voodoo 8 internal 8 external) | ||
| 86 | 96 | ||
| 87 | People | 97 | People |
| 88 | ------------------------- | 98 | ------------------------- |
diff --git a/MAINTAINERS b/MAINTAINERS index 1b1491d64ca6..b0e33617273d 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
| @@ -3334,9 +3334,8 @@ W: http://www.linux-usb.org/gadget | |||
| 3334 | S: Maintained | 3334 | S: Maintained |
| 3335 | 3335 | ||
| 3336 | USB HID/HIDBP DRIVERS | 3336 | USB HID/HIDBP DRIVERS |
| 3337 | P: Vojtech Pavlik | 3337 | P: Jiri Kosina |
| 3338 | M: vojtech@suse.cz | 3338 | M: jkosina@suse.cz |
| 3339 | L: linux-usb-users@lists.sourceforge.net | ||
| 3340 | L: linux-usb-devel@lists.sourceforge.net | 3339 | L: linux-usb-devel@lists.sourceforge.net |
| 3341 | S: Maintained | 3340 | S: Maintained |
| 3342 | 3341 | ||
diff --git a/arch/mips/kernel/smtc.c b/arch/mips/kernel/smtc.c index 802febed7df5..a8b387197d5b 100644 --- a/arch/mips/kernel/smtc.c +++ b/arch/mips/kernel/smtc.c | |||
| @@ -261,6 +261,7 @@ void smtc_configure_tlb(void) | |||
| 261 | } | 261 | } |
| 262 | } | 262 | } |
| 263 | write_c0_mvpcontrol(read_c0_mvpcontrol() | MVPCONTROL_STLB); | 263 | write_c0_mvpcontrol(read_c0_mvpcontrol() | MVPCONTROL_STLB); |
| 264 | ehb(); | ||
| 264 | 265 | ||
| 265 | /* | 266 | /* |
| 266 | * Setup kernel data structures to use software total, | 267 | * Setup kernel data structures to use software total, |
diff --git a/arch/mips/mm/tlb-r4k.c b/arch/mips/mm/tlb-r4k.c index 2e0e21ef433e..65160d4984d9 100644 --- a/arch/mips/mm/tlb-r4k.c +++ b/arch/mips/mm/tlb-r4k.c | |||
| @@ -106,7 +106,6 @@ void local_flush_tlb_range(struct vm_area_struct *vma, unsigned long start, | |||
| 106 | ENTER_CRITICAL(flags); | 106 | ENTER_CRITICAL(flags); |
| 107 | size = (end - start + (PAGE_SIZE - 1)) >> PAGE_SHIFT; | 107 | size = (end - start + (PAGE_SIZE - 1)) >> PAGE_SHIFT; |
| 108 | size = (size + 1) >> 1; | 108 | size = (size + 1) >> 1; |
| 109 | local_irq_save(flags); | ||
| 110 | if (size <= current_cpu_data.tlbsize/2) { | 109 | if (size <= current_cpu_data.tlbsize/2) { |
| 111 | int oldpid = read_c0_entryhi(); | 110 | int oldpid = read_c0_entryhi(); |
| 112 | int newpid = cpu_asid(cpu, mm); | 111 | int newpid = cpu_asid(cpu, mm); |
diff --git a/arch/powerpc/boot/dts/lite5200.dts b/arch/powerpc/boot/dts/lite5200.dts index a8efb59f5dd7..186870704ad9 100644 --- a/arch/powerpc/boot/dts/lite5200.dts +++ b/arch/powerpc/boot/dts/lite5200.dts | |||
| @@ -10,6 +10,12 @@ | |||
| 10 | * option) any later version. | 10 | * option) any later version. |
| 11 | */ | 11 | */ |
| 12 | 12 | ||
| 13 | /* | ||
| 14 | * WARNING: Do not depend on this tree layout remaining static just yet. | ||
| 15 | * The MPC5200 device tree conventions are still in flux | ||
| 16 | * Keep an eye on the linuxppc-dev mailing list for more details | ||
| 17 | */ | ||
| 18 | |||
| 13 | / { | 19 | / { |
| 14 | model = "Lite5200"; | 20 | model = "Lite5200"; |
| 15 | compatible = "lite5200\0lite52xx\0mpc5200\0mpc52xx"; | 21 | compatible = "lite5200\0lite52xx\0mpc5200\0mpc52xx"; |
diff --git a/arch/powerpc/boot/dts/lite5200b.dts b/arch/powerpc/boot/dts/lite5200b.dts index 1aabee432d86..5bb2760d7c30 100644 --- a/arch/powerpc/boot/dts/lite5200b.dts +++ b/arch/powerpc/boot/dts/lite5200b.dts | |||
| @@ -10,6 +10,12 @@ | |||
| 10 | * option) any later version. | 10 | * option) any later version. |
| 11 | */ | 11 | */ |
| 12 | 12 | ||
| 13 | /* | ||
| 14 | * WARNING: Do not depend on this tree layout remaining static just yet. | ||
| 15 | * The MPC5200 device tree conventions are still in flux | ||
| 16 | * Keep an eye on the linuxppc-dev mailing list for more details | ||
| 17 | */ | ||
| 18 | |||
| 13 | / { | 19 | / { |
| 14 | model = "Lite5200b"; | 20 | model = "Lite5200b"; |
| 15 | compatible = "lite5200b\0lite52xx\0mpc5200b\0mpc52xx"; | 21 | compatible = "lite5200b\0lite52xx\0mpc5200b\0mpc52xx"; |
diff --git a/arch/powerpc/configs/cell_defconfig b/arch/powerpc/configs/cell_defconfig index d1d25152f74f..e956548da00c 100644 --- a/arch/powerpc/configs/cell_defconfig +++ b/arch/powerpc/configs/cell_defconfig | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.20-rc1 | 3 | # Linux kernel version: 2.6.20-rc5 |
| 4 | # Tue Dec 19 14:59:53 2006 | 4 | # Mon Jan 22 22:12:56 2007 |
| 5 | # | 5 | # |
| 6 | CONFIG_PPC64=y | 6 | CONFIG_PPC64=y |
| 7 | CONFIG_64BIT=y | 7 | CONFIG_64BIT=y |
| @@ -245,7 +245,6 @@ CONFIG_GENERIC_ISA_DMA=y | |||
| 245 | CONFIG_PCI=y | 245 | CONFIG_PCI=y |
| 246 | CONFIG_PCI_DOMAINS=y | 246 | CONFIG_PCI_DOMAINS=y |
| 247 | CONFIG_PCIEPORTBUS=y | 247 | CONFIG_PCIEPORTBUS=y |
| 248 | # CONFIG_PCI_MULTITHREAD_PROBE is not set | ||
| 249 | # CONFIG_PCI_DEBUG is not set | 248 | # CONFIG_PCI_DEBUG is not set |
| 250 | 249 | ||
| 251 | # | 250 | # |
| @@ -854,7 +853,6 @@ CONFIG_SERIAL_8250_RUNTIME_UARTS=4 | |||
| 854 | CONFIG_SERIAL_CORE=y | 853 | CONFIG_SERIAL_CORE=y |
| 855 | CONFIG_SERIAL_CORE_CONSOLE=y | 854 | CONFIG_SERIAL_CORE_CONSOLE=y |
| 856 | # CONFIG_SERIAL_JSM is not set | 855 | # CONFIG_SERIAL_JSM is not set |
| 857 | CONFIG_SERIAL_OF_PLATFORM=y | ||
| 858 | CONFIG_UNIX98_PTYS=y | 856 | CONFIG_UNIX98_PTYS=y |
| 859 | # CONFIG_LEGACY_PTYS is not set | 857 | # CONFIG_LEGACY_PTYS is not set |
| 860 | CONFIG_HVC_DRIVER=y | 858 | CONFIG_HVC_DRIVER=y |
diff --git a/arch/powerpc/configs/chrp32_defconfig b/arch/powerpc/configs/chrp32_defconfig index fee72f8a2fb7..029c9a0e730c 100644 --- a/arch/powerpc/configs/chrp32_defconfig +++ b/arch/powerpc/configs/chrp32_defconfig | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.18-rc6 | 3 | # Linux kernel version: 2.6.20-rc5 |
| 4 | # Sun Sep 10 10:22:54 2006 | 4 | # Mon Jan 22 22:12:58 2007 |
| 5 | # | 5 | # |
| 6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
| 7 | CONFIG_PPC32=y | 7 | CONFIG_PPC32=y |
| @@ -10,6 +10,7 @@ CONFIG_MMU=y | |||
| 10 | CONFIG_GENERIC_HARDIRQS=y | 10 | CONFIG_GENERIC_HARDIRQS=y |
| 11 | CONFIG_IRQ_PER_CPU=y | 11 | CONFIG_IRQ_PER_CPU=y |
| 12 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 12 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
| 13 | CONFIG_ARCH_HAS_ILOG2_U32=y | ||
| 13 | CONFIG_GENERIC_HWEIGHT=y | 14 | CONFIG_GENERIC_HWEIGHT=y |
| 14 | CONFIG_GENERIC_CALIBRATE_DELAY=y | 15 | CONFIG_GENERIC_CALIBRATE_DELAY=y |
| 15 | CONFIG_GENERIC_FIND_NEXT_BIT=y | 16 | CONFIG_GENERIC_FIND_NEXT_BIT=y |
| @@ -21,13 +22,14 @@ CONFIG_ARCH_MAY_HAVE_PC_FDC=y | |||
| 21 | CONFIG_PPC_OF=y | 22 | CONFIG_PPC_OF=y |
| 22 | CONFIG_PPC_UDBG_16550=y | 23 | CONFIG_PPC_UDBG_16550=y |
| 23 | CONFIG_GENERIC_TBSYNC=y | 24 | CONFIG_GENERIC_TBSYNC=y |
| 25 | CONFIG_AUDIT_ARCH=y | ||
| 26 | CONFIG_GENERIC_BUG=y | ||
| 24 | # CONFIG_DEFAULT_UIMAGE is not set | 27 | # CONFIG_DEFAULT_UIMAGE is not set |
| 25 | 28 | ||
| 26 | # | 29 | # |
| 27 | # Processor support | 30 | # Processor support |
| 28 | # | 31 | # |
| 29 | CONFIG_CLASSIC32=y | 32 | CONFIG_CLASSIC32=y |
| 30 | # CONFIG_PPC_52xx is not set | ||
| 31 | # CONFIG_PPC_82xx is not set | 33 | # CONFIG_PPC_82xx is not set |
| 32 | # CONFIG_PPC_83xx is not set | 34 | # CONFIG_PPC_83xx is not set |
| 33 | # CONFIG_PPC_85xx is not set | 35 | # CONFIG_PPC_85xx is not set |
| @@ -38,6 +40,8 @@ CONFIG_CLASSIC32=y | |||
| 38 | # CONFIG_E200 is not set | 40 | # CONFIG_E200 is not set |
| 39 | CONFIG_6xx=y | 41 | CONFIG_6xx=y |
| 40 | CONFIG_PPC_FPU=y | 42 | CONFIG_PPC_FPU=y |
| 43 | # CONFIG_PPC_DCR_NATIVE is not set | ||
| 44 | # CONFIG_PPC_DCR_MMIO is not set | ||
| 41 | # CONFIG_ALTIVEC is not set | 45 | # CONFIG_ALTIVEC is not set |
| 42 | CONFIG_PPC_STD_MMU=y | 46 | CONFIG_PPC_STD_MMU=y |
| 43 | CONFIG_PPC_STD_MMU_32=y | 47 | CONFIG_PPC_STD_MMU_32=y |
| @@ -59,18 +63,22 @@ CONFIG_LOCALVERSION="" | |||
| 59 | # CONFIG_LOCALVERSION_AUTO is not set | 63 | # CONFIG_LOCALVERSION_AUTO is not set |
| 60 | CONFIG_SWAP=y | 64 | CONFIG_SWAP=y |
| 61 | CONFIG_SYSVIPC=y | 65 | CONFIG_SYSVIPC=y |
| 66 | # CONFIG_IPC_NS is not set | ||
| 62 | CONFIG_POSIX_MQUEUE=y | 67 | CONFIG_POSIX_MQUEUE=y |
| 63 | # CONFIG_BSD_PROCESS_ACCT is not set | 68 | # CONFIG_BSD_PROCESS_ACCT is not set |
| 64 | # CONFIG_TASKSTATS is not set | 69 | # CONFIG_TASKSTATS is not set |
| 65 | CONFIG_SYSCTL=y | 70 | # CONFIG_UTS_NS is not set |
| 66 | # CONFIG_AUDIT is not set | 71 | # CONFIG_AUDIT is not set |
| 67 | CONFIG_IKCONFIG=y | 72 | CONFIG_IKCONFIG=y |
| 68 | CONFIG_IKCONFIG_PROC=y | 73 | CONFIG_IKCONFIG_PROC=y |
| 69 | # CONFIG_CPUSETS is not set | 74 | # CONFIG_CPUSETS is not set |
| 75 | CONFIG_SYSFS_DEPRECATED=y | ||
| 70 | # CONFIG_RELAY is not set | 76 | # CONFIG_RELAY is not set |
| 71 | CONFIG_INITRAMFS_SOURCE="" | 77 | CONFIG_INITRAMFS_SOURCE="" |
| 72 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | 78 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set |
| 79 | CONFIG_SYSCTL=y | ||
| 73 | # CONFIG_EMBEDDED is not set | 80 | # CONFIG_EMBEDDED is not set |
| 81 | CONFIG_SYSCTL_SYSCALL=y | ||
| 74 | CONFIG_KALLSYMS=y | 82 | CONFIG_KALLSYMS=y |
| 75 | # CONFIG_KALLSYMS_ALL is not set | 83 | # CONFIG_KALLSYMS_ALL is not set |
| 76 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | 84 | # CONFIG_KALLSYMS_EXTRA_PASS is not set |
| @@ -79,12 +87,12 @@ CONFIG_PRINTK=y | |||
| 79 | CONFIG_BUG=y | 87 | CONFIG_BUG=y |
| 80 | CONFIG_ELF_CORE=y | 88 | CONFIG_ELF_CORE=y |
| 81 | CONFIG_BASE_FULL=y | 89 | CONFIG_BASE_FULL=y |
| 82 | CONFIG_RT_MUTEXES=y | ||
| 83 | CONFIG_FUTEX=y | 90 | CONFIG_FUTEX=y |
| 84 | CONFIG_EPOLL=y | 91 | CONFIG_EPOLL=y |
| 85 | CONFIG_SHMEM=y | 92 | CONFIG_SHMEM=y |
| 86 | CONFIG_SLAB=y | 93 | CONFIG_SLAB=y |
| 87 | CONFIG_VM_EVENT_COUNTERS=y | 94 | CONFIG_VM_EVENT_COUNTERS=y |
| 95 | CONFIG_RT_MUTEXES=y | ||
| 88 | # CONFIG_TINY_SHMEM is not set | 96 | # CONFIG_TINY_SHMEM is not set |
| 89 | CONFIG_BASE_SMALL=0 | 97 | CONFIG_BASE_SMALL=0 |
| 90 | # CONFIG_SLOB is not set | 98 | # CONFIG_SLOB is not set |
| @@ -103,6 +111,7 @@ CONFIG_STOP_MACHINE=y | |||
| 103 | # | 111 | # |
| 104 | # Block layer | 112 | # Block layer |
| 105 | # | 113 | # |
| 114 | CONFIG_BLOCK=y | ||
| 106 | CONFIG_LBD=y | 115 | CONFIG_LBD=y |
| 107 | # CONFIG_BLK_DEV_IO_TRACE is not set | 116 | # CONFIG_BLK_DEV_IO_TRACE is not set |
| 108 | # CONFIG_LSF is not set | 117 | # CONFIG_LSF is not set |
| @@ -124,13 +133,16 @@ CONFIG_DEFAULT_IOSCHED="anticipatory" | |||
| 124 | # Platform support | 133 | # Platform support |
| 125 | # | 134 | # |
| 126 | CONFIG_PPC_MULTIPLATFORM=y | 135 | CONFIG_PPC_MULTIPLATFORM=y |
| 127 | # CONFIG_PPC_ISERIES is not set | ||
| 128 | # CONFIG_EMBEDDED6xx is not set | 136 | # CONFIG_EMBEDDED6xx is not set |
| 129 | # CONFIG_APUS is not set | 137 | # CONFIG_APUS is not set |
| 130 | CONFIG_PPC_CHRP=y | 138 | CONFIG_PPC_CHRP=y |
| 139 | # CONFIG_PPC_MPC52xx is not set | ||
| 140 | # CONFIG_PPC_EFIKA is not set | ||
| 141 | # CONFIG_PPC_LITE5200 is not set | ||
| 131 | # CONFIG_PPC_PMAC is not set | 142 | # CONFIG_PPC_PMAC is not set |
| 132 | # CONFIG_PPC_CELL is not set | 143 | # CONFIG_PPC_CELL is not set |
| 133 | # CONFIG_PPC_CELL_NATIVE is not set | 144 | # CONFIG_PPC_CELL_NATIVE is not set |
| 145 | CONFIG_PPC_NATIVE=y | ||
| 134 | # CONFIG_UDBG_RTAS_CONSOLE is not set | 146 | # CONFIG_UDBG_RTAS_CONSOLE is not set |
| 135 | CONFIG_PPC_RTAS=y | 147 | CONFIG_PPC_RTAS=y |
| 136 | # CONFIG_RTAS_ERROR_LOGGING is not set | 148 | # CONFIG_RTAS_ERROR_LOGGING is not set |
| @@ -138,6 +150,8 @@ CONFIG_RTAS_PROC=y | |||
| 138 | # CONFIG_MMIO_NVRAM is not set | 150 | # CONFIG_MMIO_NVRAM is not set |
| 139 | CONFIG_PPC_MPC106=y | 151 | CONFIG_PPC_MPC106=y |
| 140 | # CONFIG_PPC_970_NAP is not set | 152 | # CONFIG_PPC_970_NAP is not set |
| 153 | # CONFIG_PPC_INDIRECT_IO is not set | ||
| 154 | # CONFIG_GENERIC_IOMAP is not set | ||
| 141 | # CONFIG_CPU_FREQ is not set | 155 | # CONFIG_CPU_FREQ is not set |
| 142 | # CONFIG_TAU is not set | 156 | # CONFIG_TAU is not set |
| 143 | # CONFIG_WANT_EARLY_SERIAL is not set | 157 | # CONFIG_WANT_EARLY_SERIAL is not set |
| @@ -149,6 +163,7 @@ CONFIG_MPIC=y | |||
| 149 | CONFIG_HIGHMEM=y | 163 | CONFIG_HIGHMEM=y |
| 150 | # CONFIG_HZ_100 is not set | 164 | # CONFIG_HZ_100 is not set |
| 151 | CONFIG_HZ_250=y | 165 | CONFIG_HZ_250=y |
| 166 | # CONFIG_HZ_300 is not set | ||
| 152 | # CONFIG_HZ_1000 is not set | 167 | # CONFIG_HZ_1000 is not set |
| 153 | CONFIG_HZ=250 | 168 | CONFIG_HZ=250 |
| 154 | CONFIG_PREEMPT_NONE=y | 169 | CONFIG_PREEMPT_NONE=y |
| @@ -161,6 +176,7 @@ CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y | |||
| 161 | # CONFIG_KEXEC is not set | 176 | # CONFIG_KEXEC is not set |
| 162 | CONFIG_IRQ_ALL_CPUS=y | 177 | CONFIG_IRQ_ALL_CPUS=y |
| 163 | CONFIG_ARCH_FLATMEM_ENABLE=y | 178 | CONFIG_ARCH_FLATMEM_ENABLE=y |
| 179 | CONFIG_ARCH_POPULATES_NODE_MAP=y | ||
| 164 | CONFIG_SELECT_MEMORY_MODEL=y | 180 | CONFIG_SELECT_MEMORY_MODEL=y |
| 165 | CONFIG_FLATMEM_MANUAL=y | 181 | CONFIG_FLATMEM_MANUAL=y |
| 166 | # CONFIG_DISCONTIGMEM_MANUAL is not set | 182 | # CONFIG_DISCONTIGMEM_MANUAL is not set |
| @@ -243,10 +259,13 @@ CONFIG_SYN_COOKIES=y | |||
| 243 | # CONFIG_INET_TUNNEL is not set | 259 | # CONFIG_INET_TUNNEL is not set |
| 244 | # CONFIG_INET_XFRM_MODE_TRANSPORT is not set | 260 | # CONFIG_INET_XFRM_MODE_TRANSPORT is not set |
| 245 | # CONFIG_INET_XFRM_MODE_TUNNEL is not set | 261 | # CONFIG_INET_XFRM_MODE_TUNNEL is not set |
| 262 | # CONFIG_INET_XFRM_MODE_BEET is not set | ||
| 246 | CONFIG_INET_DIAG=y | 263 | CONFIG_INET_DIAG=y |
| 247 | CONFIG_INET_TCP_DIAG=y | 264 | CONFIG_INET_TCP_DIAG=y |
| 248 | # CONFIG_TCP_CONG_ADVANCED is not set | 265 | # CONFIG_TCP_CONG_ADVANCED is not set |
| 249 | CONFIG_TCP_CONG_BIC=y | 266 | CONFIG_TCP_CONG_CUBIC=y |
| 267 | CONFIG_DEFAULT_TCP_CONG="cubic" | ||
| 268 | # CONFIG_TCP_MD5SIG is not set | ||
| 250 | 269 | ||
| 251 | # | 270 | # |
| 252 | # IP: Virtual Server Configuration | 271 | # IP: Virtual Server Configuration |
| @@ -263,24 +282,29 @@ CONFIG_NETFILTER=y | |||
| 263 | # Core Netfilter Configuration | 282 | # Core Netfilter Configuration |
| 264 | # | 283 | # |
| 265 | # CONFIG_NETFILTER_NETLINK is not set | 284 | # CONFIG_NETFILTER_NETLINK is not set |
| 285 | CONFIG_NF_CONNTRACK_ENABLED=m | ||
| 286 | CONFIG_NF_CONNTRACK_SUPPORT=y | ||
| 287 | # CONFIG_IP_NF_CONNTRACK_SUPPORT is not set | ||
| 288 | CONFIG_NF_CONNTRACK=m | ||
| 289 | # CONFIG_NF_CT_ACCT is not set | ||
| 290 | # CONFIG_NF_CONNTRACK_MARK is not set | ||
| 291 | # CONFIG_NF_CONNTRACK_EVENTS is not set | ||
| 292 | # CONFIG_NF_CT_PROTO_SCTP is not set | ||
| 293 | # CONFIG_NF_CONNTRACK_AMANDA is not set | ||
| 294 | CONFIG_NF_CONNTRACK_FTP=m | ||
| 295 | # CONFIG_NF_CONNTRACK_H323 is not set | ||
| 296 | CONFIG_NF_CONNTRACK_IRC=m | ||
| 297 | # CONFIG_NF_CONNTRACK_NETBIOS_NS is not set | ||
| 298 | # CONFIG_NF_CONNTRACK_PPTP is not set | ||
| 299 | CONFIG_NF_CONNTRACK_SIP=m | ||
| 300 | CONFIG_NF_CONNTRACK_TFTP=m | ||
| 266 | # CONFIG_NETFILTER_XTABLES is not set | 301 | # CONFIG_NETFILTER_XTABLES is not set |
| 267 | 302 | ||
| 268 | # | 303 | # |
| 269 | # IP: Netfilter Configuration | 304 | # IP: Netfilter Configuration |
| 270 | # | 305 | # |
| 271 | CONFIG_IP_NF_CONNTRACK=m | 306 | CONFIG_NF_CONNTRACK_IPV4=m |
| 272 | # CONFIG_IP_NF_CT_ACCT is not set | 307 | CONFIG_NF_CONNTRACK_PROC_COMPAT=y |
| 273 | # CONFIG_IP_NF_CONNTRACK_MARK is not set | ||
| 274 | # CONFIG_IP_NF_CONNTRACK_EVENTS is not set | ||
| 275 | # CONFIG_IP_NF_CT_PROTO_SCTP is not set | ||
| 276 | CONFIG_IP_NF_FTP=m | ||
| 277 | CONFIG_IP_NF_IRC=m | ||
| 278 | # CONFIG_IP_NF_NETBIOS_NS is not set | ||
| 279 | CONFIG_IP_NF_TFTP=m | ||
| 280 | CONFIG_IP_NF_AMANDA=m | ||
| 281 | # CONFIG_IP_NF_PPTP is not set | ||
| 282 | # CONFIG_IP_NF_H323 is not set | ||
| 283 | # CONFIG_IP_NF_SIP is not set | ||
| 284 | # CONFIG_IP_NF_QUEUE is not set | 308 | # CONFIG_IP_NF_QUEUE is not set |
| 285 | 309 | ||
| 286 | # | 310 | # |
| @@ -306,7 +330,6 @@ CONFIG_IP_NF_AMANDA=m | |||
| 306 | # CONFIG_ATALK is not set | 330 | # CONFIG_ATALK is not set |
| 307 | # CONFIG_X25 is not set | 331 | # CONFIG_X25 is not set |
| 308 | # CONFIG_LAPB is not set | 332 | # CONFIG_LAPB is not set |
| 309 | # CONFIG_NET_DIVERT is not set | ||
| 310 | # CONFIG_ECONET is not set | 333 | # CONFIG_ECONET is not set |
| 311 | # CONFIG_WAN_ROUTER is not set | 334 | # CONFIG_WAN_ROUTER is not set |
| 312 | 335 | ||
| @@ -381,6 +404,12 @@ CONFIG_BLK_DEV_INITRD=y | |||
| 381 | # CONFIG_ATA_OVER_ETH is not set | 404 | # CONFIG_ATA_OVER_ETH is not set |
| 382 | 405 | ||
| 383 | # | 406 | # |
| 407 | # Misc devices | ||
| 408 | # | ||
| 409 | # CONFIG_SGI_IOC4 is not set | ||
| 410 | # CONFIG_TIFM_CORE is not set | ||
| 411 | |||
| 412 | # | ||
| 384 | # ATA/ATAPI/MFM/RLL support | 413 | # ATA/ATAPI/MFM/RLL support |
| 385 | # | 414 | # |
| 386 | CONFIG_IDE=y | 415 | CONFIG_IDE=y |
| @@ -407,7 +436,6 @@ CONFIG_IDEPCI_SHARE_IRQ=y | |||
| 407 | # CONFIG_BLK_DEV_OFFBOARD is not set | 436 | # CONFIG_BLK_DEV_OFFBOARD is not set |
| 408 | CONFIG_BLK_DEV_GENERIC=y | 437 | CONFIG_BLK_DEV_GENERIC=y |
| 409 | # CONFIG_BLK_DEV_OPTI621 is not set | 438 | # CONFIG_BLK_DEV_OPTI621 is not set |
| 410 | CONFIG_BLK_DEV_SL82C105=y | ||
| 411 | CONFIG_BLK_DEV_IDEDMA_PCI=y | 439 | CONFIG_BLK_DEV_IDEDMA_PCI=y |
| 412 | # CONFIG_BLK_DEV_IDEDMA_FORCED is not set | 440 | # CONFIG_BLK_DEV_IDEDMA_FORCED is not set |
| 413 | CONFIG_IDEDMA_PCI_AUTO=y | 441 | CONFIG_IDEDMA_PCI_AUTO=y |
| @@ -422,6 +450,7 @@ CONFIG_IDEDMA_PCI_AUTO=y | |||
| 422 | # CONFIG_BLK_DEV_CS5530 is not set | 450 | # CONFIG_BLK_DEV_CS5530 is not set |
| 423 | # CONFIG_BLK_DEV_HPT34X is not set | 451 | # CONFIG_BLK_DEV_HPT34X is not set |
| 424 | # CONFIG_BLK_DEV_HPT366 is not set | 452 | # CONFIG_BLK_DEV_HPT366 is not set |
| 453 | # CONFIG_BLK_DEV_JMICRON is not set | ||
| 425 | # CONFIG_BLK_DEV_SC1200 is not set | 454 | # CONFIG_BLK_DEV_SC1200 is not set |
| 426 | # CONFIG_BLK_DEV_PIIX is not set | 455 | # CONFIG_BLK_DEV_PIIX is not set |
| 427 | # CONFIG_BLK_DEV_IT821X is not set | 456 | # CONFIG_BLK_DEV_IT821X is not set |
| @@ -430,6 +459,7 @@ CONFIG_IDEDMA_PCI_AUTO=y | |||
| 430 | # CONFIG_BLK_DEV_PDC202XX_NEW is not set | 459 | # CONFIG_BLK_DEV_PDC202XX_NEW is not set |
| 431 | # CONFIG_BLK_DEV_SVWKS is not set | 460 | # CONFIG_BLK_DEV_SVWKS is not set |
| 432 | # CONFIG_BLK_DEV_SIIMAGE is not set | 461 | # CONFIG_BLK_DEV_SIIMAGE is not set |
| 462 | CONFIG_BLK_DEV_SL82C105=y | ||
| 433 | # CONFIG_BLK_DEV_SLC90E66 is not set | 463 | # CONFIG_BLK_DEV_SLC90E66 is not set |
| 434 | # CONFIG_BLK_DEV_TRM290 is not set | 464 | # CONFIG_BLK_DEV_TRM290 is not set |
| 435 | CONFIG_BLK_DEV_VIA82CXXX=y | 465 | CONFIG_BLK_DEV_VIA82CXXX=y |
| @@ -445,6 +475,8 @@ CONFIG_IDEDMA_AUTO=y | |||
| 445 | # | 475 | # |
| 446 | # CONFIG_RAID_ATTRS is not set | 476 | # CONFIG_RAID_ATTRS is not set |
| 447 | CONFIG_SCSI=y | 477 | CONFIG_SCSI=y |
| 478 | # CONFIG_SCSI_TGT is not set | ||
| 479 | # CONFIG_SCSI_NETLINK is not set | ||
| 448 | CONFIG_SCSI_PROC_FS=y | 480 | CONFIG_SCSI_PROC_FS=y |
| 449 | 481 | ||
| 450 | # | 482 | # |
| @@ -464,14 +496,16 @@ CONFIG_CHR_DEV_SG=y | |||
| 464 | # CONFIG_SCSI_MULTI_LUN is not set | 496 | # CONFIG_SCSI_MULTI_LUN is not set |
| 465 | CONFIG_SCSI_CONSTANTS=y | 497 | CONFIG_SCSI_CONSTANTS=y |
| 466 | # CONFIG_SCSI_LOGGING is not set | 498 | # CONFIG_SCSI_LOGGING is not set |
| 499 | # CONFIG_SCSI_SCAN_ASYNC is not set | ||
| 467 | 500 | ||
| 468 | # | 501 | # |
| 469 | # SCSI Transport Attributes | 502 | # SCSI Transports |
| 470 | # | 503 | # |
| 471 | CONFIG_SCSI_SPI_ATTRS=y | 504 | CONFIG_SCSI_SPI_ATTRS=y |
| 472 | # CONFIG_SCSI_FC_ATTRS is not set | 505 | # CONFIG_SCSI_FC_ATTRS is not set |
| 473 | # CONFIG_SCSI_ISCSI_ATTRS is not set | 506 | # CONFIG_SCSI_ISCSI_ATTRS is not set |
| 474 | # CONFIG_SCSI_SAS_ATTRS is not set | 507 | # CONFIG_SCSI_SAS_ATTRS is not set |
| 508 | # CONFIG_SCSI_SAS_LIBSAS is not set | ||
| 475 | 509 | ||
| 476 | # | 510 | # |
| 477 | # SCSI low-level drivers | 511 | # SCSI low-level drivers |
| @@ -487,12 +521,13 @@ CONFIG_SCSI_SPI_ATTRS=y | |||
| 487 | # CONFIG_SCSI_AIC7XXX is not set | 521 | # CONFIG_SCSI_AIC7XXX is not set |
| 488 | # CONFIG_SCSI_AIC7XXX_OLD is not set | 522 | # CONFIG_SCSI_AIC7XXX_OLD is not set |
| 489 | # CONFIG_SCSI_AIC79XX is not set | 523 | # CONFIG_SCSI_AIC79XX is not set |
| 524 | # CONFIG_SCSI_AIC94XX is not set | ||
| 490 | # CONFIG_SCSI_DPT_I2O is not set | 525 | # CONFIG_SCSI_DPT_I2O is not set |
| 491 | # CONFIG_SCSI_IN2000 is not set | 526 | # CONFIG_SCSI_IN2000 is not set |
| 527 | # CONFIG_SCSI_ARCMSR is not set | ||
| 492 | # CONFIG_MEGARAID_NEWGEN is not set | 528 | # CONFIG_MEGARAID_NEWGEN is not set |
| 493 | # CONFIG_MEGARAID_LEGACY is not set | 529 | # CONFIG_MEGARAID_LEGACY is not set |
| 494 | # CONFIG_MEGARAID_SAS is not set | 530 | # CONFIG_MEGARAID_SAS is not set |
| 495 | # CONFIG_ATA is not set | ||
| 496 | # CONFIG_SCSI_HPTIOP is not set | 531 | # CONFIG_SCSI_HPTIOP is not set |
| 497 | # CONFIG_SCSI_BUSLOGIC is not set | 532 | # CONFIG_SCSI_BUSLOGIC is not set |
| 498 | # CONFIG_SCSI_DMX3191D is not set | 533 | # CONFIG_SCSI_DMX3191D is not set |
| @@ -506,17 +541,18 @@ CONFIG_SCSI_SPI_ATTRS=y | |||
| 506 | # CONFIG_SCSI_INITIO is not set | 541 | # CONFIG_SCSI_INITIO is not set |
| 507 | # CONFIG_SCSI_INIA100 is not set | 542 | # CONFIG_SCSI_INIA100 is not set |
| 508 | # CONFIG_SCSI_NCR53C406A is not set | 543 | # CONFIG_SCSI_NCR53C406A is not set |
| 544 | # CONFIG_SCSI_STEX is not set | ||
| 509 | CONFIG_SCSI_SYM53C8XX_2=y | 545 | CONFIG_SCSI_SYM53C8XX_2=y |
| 510 | CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=0 | 546 | CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=0 |
| 511 | CONFIG_SCSI_SYM53C8XX_DEFAULT_TAGS=16 | 547 | CONFIG_SCSI_SYM53C8XX_DEFAULT_TAGS=16 |
| 512 | CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64 | 548 | CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64 |
| 513 | CONFIG_SCSI_SYM53C8XX_MMIO=y | 549 | CONFIG_SCSI_SYM53C8XX_MMIO=y |
| 514 | # CONFIG_SCSI_IPR is not set | ||
| 515 | # CONFIG_SCSI_PAS16 is not set | 550 | # CONFIG_SCSI_PAS16 is not set |
| 516 | # CONFIG_SCSI_PSI240I is not set | 551 | # CONFIG_SCSI_PSI240I is not set |
| 517 | # CONFIG_SCSI_QLOGIC_FAS is not set | 552 | # CONFIG_SCSI_QLOGIC_FAS is not set |
| 518 | # CONFIG_SCSI_QLOGIC_1280 is not set | 553 | # CONFIG_SCSI_QLOGIC_1280 is not set |
| 519 | # CONFIG_SCSI_QLA_FC is not set | 554 | # CONFIG_SCSI_QLA_FC is not set |
| 555 | # CONFIG_SCSI_QLA_ISCSI is not set | ||
| 520 | # CONFIG_SCSI_LPFC is not set | 556 | # CONFIG_SCSI_LPFC is not set |
| 521 | # CONFIG_SCSI_SYM53C416 is not set | 557 | # CONFIG_SCSI_SYM53C416 is not set |
| 522 | # CONFIG_SCSI_DC395x is not set | 558 | # CONFIG_SCSI_DC395x is not set |
| @@ -525,6 +561,12 @@ CONFIG_SCSI_SYM53C8XX_MMIO=y | |||
| 525 | # CONFIG_SCSI_U14_34F is not set | 561 | # CONFIG_SCSI_U14_34F is not set |
| 526 | # CONFIG_SCSI_NSP32 is not set | 562 | # CONFIG_SCSI_NSP32 is not set |
| 527 | # CONFIG_SCSI_DEBUG is not set | 563 | # CONFIG_SCSI_DEBUG is not set |
| 564 | # CONFIG_SCSI_SRP is not set | ||
| 565 | |||
| 566 | # | ||
| 567 | # Serial ATA (prod) and Parallel ATA (experimental) drivers | ||
| 568 | # | ||
| 569 | # CONFIG_ATA is not set | ||
| 528 | 570 | ||
| 529 | # | 571 | # |
| 530 | # Old CD-ROM drivers (not SCSI, not IDE) | 572 | # Old CD-ROM drivers (not SCSI, not IDE) |
| @@ -557,6 +599,7 @@ CONFIG_SCSI_SYM53C8XX_MMIO=y | |||
| 557 | # | 599 | # |
| 558 | # Macintosh device drivers | 600 | # Macintosh device drivers |
| 559 | # | 601 | # |
| 602 | # CONFIG_MAC_EMUMOUSEBTN is not set | ||
| 560 | # CONFIG_WINDFARM is not set | 603 | # CONFIG_WINDFARM is not set |
| 561 | 604 | ||
| 562 | # | 605 | # |
| @@ -607,6 +650,7 @@ CONFIG_DE4X5=y | |||
| 607 | # CONFIG_NET_ISA is not set | 650 | # CONFIG_NET_ISA is not set |
| 608 | CONFIG_NET_PCI=y | 651 | CONFIG_NET_PCI=y |
| 609 | CONFIG_PCNET32=y | 652 | CONFIG_PCNET32=y |
| 653 | # CONFIG_PCNET32_NAPI is not set | ||
| 610 | # CONFIG_AMD8111_ETH is not set | 654 | # CONFIG_AMD8111_ETH is not set |
| 611 | # CONFIG_ADAPTEC_STARFIRE is not set | 655 | # CONFIG_ADAPTEC_STARFIRE is not set |
| 612 | # CONFIG_AC3200 is not set | 656 | # CONFIG_AC3200 is not set |
| @@ -655,6 +699,7 @@ CONFIG_MV643XX_ETH=y | |||
| 655 | # CONFIG_MV643XX_ETH_0 is not set | 699 | # CONFIG_MV643XX_ETH_0 is not set |
| 656 | # CONFIG_MV643XX_ETH_1 is not set | 700 | # CONFIG_MV643XX_ETH_1 is not set |
| 657 | # CONFIG_MV643XX_ETH_2 is not set | 701 | # CONFIG_MV643XX_ETH_2 is not set |
| 702 | # CONFIG_QLA3XXX is not set | ||
| 658 | 703 | ||
| 659 | # | 704 | # |
| 660 | # Ethernet (10000 Mbit) | 705 | # Ethernet (10000 Mbit) |
| @@ -663,6 +708,7 @@ CONFIG_MV643XX_ETH=y | |||
| 663 | # CONFIG_IXGB is not set | 708 | # CONFIG_IXGB is not set |
| 664 | # CONFIG_S2IO is not set | 709 | # CONFIG_S2IO is not set |
| 665 | # CONFIG_MYRI10GE is not set | 710 | # CONFIG_MYRI10GE is not set |
| 711 | # CONFIG_NETXEN_NIC is not set | ||
| 666 | 712 | ||
| 667 | # | 713 | # |
| 668 | # Token Ring devices | 714 | # Token Ring devices |
| @@ -690,6 +736,7 @@ CONFIG_PPP_BSDCOMP=m | |||
| 690 | CONFIG_PPP_MPPE=m | 736 | CONFIG_PPP_MPPE=m |
| 691 | CONFIG_PPPOE=m | 737 | CONFIG_PPPOE=m |
| 692 | # CONFIG_SLIP is not set | 738 | # CONFIG_SLIP is not set |
| 739 | CONFIG_SLHC=m | ||
| 693 | # CONFIG_NET_FC is not set | 740 | # CONFIG_NET_FC is not set |
| 694 | # CONFIG_SHAPER is not set | 741 | # CONFIG_SHAPER is not set |
| 695 | # CONFIG_NETCONSOLE is not set | 742 | # CONFIG_NETCONSOLE is not set |
| @@ -710,6 +757,7 @@ CONFIG_PPPOE=m | |||
| 710 | # Input device support | 757 | # Input device support |
| 711 | # | 758 | # |
| 712 | CONFIG_INPUT=y | 759 | CONFIG_INPUT=y |
| 760 | # CONFIG_INPUT_FF_MEMLESS is not set | ||
| 713 | 761 | ||
| 714 | # | 762 | # |
| 715 | # Userland interfaces | 763 | # Userland interfaces |
| @@ -732,6 +780,7 @@ CONFIG_KEYBOARD_ATKBD=y | |||
| 732 | # CONFIG_KEYBOARD_LKKBD is not set | 780 | # CONFIG_KEYBOARD_LKKBD is not set |
| 733 | # CONFIG_KEYBOARD_XTKBD is not set | 781 | # CONFIG_KEYBOARD_XTKBD is not set |
| 734 | # CONFIG_KEYBOARD_NEWTON is not set | 782 | # CONFIG_KEYBOARD_NEWTON is not set |
| 783 | # CONFIG_KEYBOARD_STOWAWAY is not set | ||
| 735 | CONFIG_INPUT_MOUSE=y | 784 | CONFIG_INPUT_MOUSE=y |
| 736 | CONFIG_MOUSE_PS2=y | 785 | CONFIG_MOUSE_PS2=y |
| 737 | # CONFIG_MOUSE_SERIAL is not set | 786 | # CONFIG_MOUSE_SERIAL is not set |
| @@ -778,12 +827,14 @@ CONFIG_SERIAL_8250_RUNTIME_UARTS=4 | |||
| 778 | # | 827 | # |
| 779 | # Non-8250 serial port support | 828 | # Non-8250 serial port support |
| 780 | # | 829 | # |
| 830 | # CONFIG_SERIAL_UARTLITE is not set | ||
| 781 | CONFIG_SERIAL_CORE=y | 831 | CONFIG_SERIAL_CORE=y |
| 782 | CONFIG_SERIAL_CORE_CONSOLE=y | 832 | CONFIG_SERIAL_CORE_CONSOLE=y |
| 783 | # CONFIG_SERIAL_JSM is not set | 833 | # CONFIG_SERIAL_JSM is not set |
| 784 | CONFIG_UNIX98_PTYS=y | 834 | CONFIG_UNIX98_PTYS=y |
| 785 | CONFIG_LEGACY_PTYS=y | 835 | CONFIG_LEGACY_PTYS=y |
| 786 | CONFIG_LEGACY_PTY_COUNT=256 | 836 | CONFIG_LEGACY_PTY_COUNT=256 |
| 837 | CONFIG_BRIQ_PANEL=m | ||
| 787 | # CONFIG_HVC_RTAS is not set | 838 | # CONFIG_HVC_RTAS is not set |
| 788 | 839 | ||
| 789 | # | 840 | # |
| @@ -802,10 +853,6 @@ CONFIG_GEN_RTC=y | |||
| 802 | # CONFIG_DTLK is not set | 853 | # CONFIG_DTLK is not set |
| 803 | # CONFIG_R3964 is not set | 854 | # CONFIG_R3964 is not set |
| 804 | # CONFIG_APPLICOM is not set | 855 | # CONFIG_APPLICOM is not set |
| 805 | |||
| 806 | # | ||
| 807 | # Ftape, the floppy tape device driver | ||
| 808 | # | ||
| 809 | # CONFIG_AGP is not set | 856 | # CONFIG_AGP is not set |
| 810 | # CONFIG_DRM is not set | 857 | # CONFIG_DRM is not set |
| 811 | # CONFIG_RAW_DRIVER is not set | 858 | # CONFIG_RAW_DRIVER is not set |
| @@ -814,7 +861,6 @@ CONFIG_GEN_RTC=y | |||
| 814 | # TPM devices | 861 | # TPM devices |
| 815 | # | 862 | # |
| 816 | # CONFIG_TCG_TPM is not set | 863 | # CONFIG_TCG_TPM is not set |
| 817 | # CONFIG_TELCLOCK is not set | ||
| 818 | 864 | ||
| 819 | # | 865 | # |
| 820 | # I2C support | 866 | # I2C support |
| @@ -881,6 +927,7 @@ CONFIG_I2C_ALGOBIT=y | |||
| 881 | # | 927 | # |
| 882 | # Dallas's 1-wire bus | 928 | # Dallas's 1-wire bus |
| 883 | # | 929 | # |
| 930 | # CONFIG_W1 is not set | ||
| 884 | 931 | ||
| 885 | # | 932 | # |
| 886 | # Hardware Monitoring support | 933 | # Hardware Monitoring support |
| @@ -889,14 +936,9 @@ CONFIG_I2C_ALGOBIT=y | |||
| 889 | # CONFIG_HWMON_VID is not set | 936 | # CONFIG_HWMON_VID is not set |
| 890 | 937 | ||
| 891 | # | 938 | # |
| 892 | # Misc devices | ||
| 893 | # | ||
| 894 | |||
| 895 | # | ||
| 896 | # Multimedia devices | 939 | # Multimedia devices |
| 897 | # | 940 | # |
| 898 | # CONFIG_VIDEO_DEV is not set | 941 | # CONFIG_VIDEO_DEV is not set |
| 899 | CONFIG_VIDEO_V4L2=y | ||
| 900 | 942 | ||
| 901 | # | 943 | # |
| 902 | # Digital Video Broadcasting Devices | 944 | # Digital Video Broadcasting Devices |
| @@ -909,6 +951,7 @@ CONFIG_VIDEO_V4L2=y | |||
| 909 | # | 951 | # |
| 910 | CONFIG_FIRMWARE_EDID=y | 952 | CONFIG_FIRMWARE_EDID=y |
| 911 | CONFIG_FB=y | 953 | CONFIG_FB=y |
| 954 | CONFIG_FB_DDC=y | ||
| 912 | CONFIG_FB_CFB_FILLRECT=y | 955 | CONFIG_FB_CFB_FILLRECT=y |
| 913 | CONFIG_FB_CFB_COPYAREA=y | 956 | CONFIG_FB_CFB_COPYAREA=y |
| 914 | CONFIG_FB_CFB_IMAGEBLIT=y | 957 | CONFIG_FB_CFB_IMAGEBLIT=y |
| @@ -949,6 +992,7 @@ CONFIG_FB_3DFX=y | |||
| 949 | # CONFIG_FB_3DFX_ACCEL is not set | 992 | # CONFIG_FB_3DFX_ACCEL is not set |
| 950 | # CONFIG_FB_VOODOO1 is not set | 993 | # CONFIG_FB_VOODOO1 is not set |
| 951 | # CONFIG_FB_TRIDENT is not set | 994 | # CONFIG_FB_TRIDENT is not set |
| 995 | # CONFIG_FB_IBM_GXT4500 is not set | ||
| 952 | # CONFIG_FB_VIRTUAL is not set | 996 | # CONFIG_FB_VIRTUAL is not set |
| 953 | 997 | ||
| 954 | # | 998 | # |
| @@ -979,6 +1023,11 @@ CONFIG_LOGO_LINUX_CLUT224=y | |||
| 979 | # CONFIG_SOUND is not set | 1023 | # CONFIG_SOUND is not set |
| 980 | 1024 | ||
| 981 | # | 1025 | # |
| 1026 | # HID Devices | ||
| 1027 | # | ||
| 1028 | CONFIG_HID=y | ||
| 1029 | |||
| 1030 | # | ||
| 982 | # USB support | 1031 | # USB support |
| 983 | # | 1032 | # |
| 984 | CONFIG_USB_ARCH_HAS_HCD=y | 1033 | CONFIG_USB_ARCH_HAS_HCD=y |
| @@ -993,6 +1042,7 @@ CONFIG_USB=y | |||
| 993 | CONFIG_USB_DEVICEFS=y | 1042 | CONFIG_USB_DEVICEFS=y |
| 994 | # CONFIG_USB_BANDWIDTH is not set | 1043 | # CONFIG_USB_BANDWIDTH is not set |
| 995 | # CONFIG_USB_DYNAMIC_MINORS is not set | 1044 | # CONFIG_USB_DYNAMIC_MINORS is not set |
| 1045 | # CONFIG_USB_MULTITHREAD_PROBE is not set | ||
| 996 | # CONFIG_USB_OTG is not set | 1046 | # CONFIG_USB_OTG is not set |
| 997 | 1047 | ||
| 998 | # | 1048 | # |
| @@ -1034,13 +1084,13 @@ CONFIG_USB_STORAGE=m | |||
| 1034 | # CONFIG_USB_STORAGE_JUMPSHOT is not set | 1084 | # CONFIG_USB_STORAGE_JUMPSHOT is not set |
| 1035 | # CONFIG_USB_STORAGE_ALAUDA is not set | 1085 | # CONFIG_USB_STORAGE_ALAUDA is not set |
| 1036 | # CONFIG_USB_STORAGE_ONETOUCH is not set | 1086 | # CONFIG_USB_STORAGE_ONETOUCH is not set |
| 1087 | # CONFIG_USB_STORAGE_KARMA is not set | ||
| 1037 | # CONFIG_USB_LIBUSUAL is not set | 1088 | # CONFIG_USB_LIBUSUAL is not set |
| 1038 | 1089 | ||
| 1039 | # | 1090 | # |
| 1040 | # USB Input Devices | 1091 | # USB Input Devices |
| 1041 | # | 1092 | # |
| 1042 | CONFIG_USB_HID=y | 1093 | CONFIG_USB_HID=y |
| 1043 | CONFIG_USB_HIDINPUT=y | ||
| 1044 | # CONFIG_USB_HIDINPUT_POWERBOOK is not set | 1094 | # CONFIG_USB_HIDINPUT_POWERBOOK is not set |
| 1045 | # CONFIG_HID_FF is not set | 1095 | # CONFIG_HID_FF is not set |
| 1046 | # CONFIG_USB_HIDDEV is not set | 1096 | # CONFIG_USB_HIDDEV is not set |
| @@ -1070,6 +1120,7 @@ CONFIG_USB_HIDINPUT=y | |||
| 1070 | # CONFIG_USB_KAWETH is not set | 1120 | # CONFIG_USB_KAWETH is not set |
| 1071 | # CONFIG_USB_PEGASUS is not set | 1121 | # CONFIG_USB_PEGASUS is not set |
| 1072 | # CONFIG_USB_RTL8150 is not set | 1122 | # CONFIG_USB_RTL8150 is not set |
| 1123 | # CONFIG_USB_USBNET_MII is not set | ||
| 1073 | # CONFIG_USB_USBNET is not set | 1124 | # CONFIG_USB_USBNET is not set |
| 1074 | CONFIG_USB_MON=y | 1125 | CONFIG_USB_MON=y |
| 1075 | 1126 | ||
| @@ -1087,6 +1138,7 @@ CONFIG_USB_MON=y | |||
| 1087 | # | 1138 | # |
| 1088 | # CONFIG_USB_EMI62 is not set | 1139 | # CONFIG_USB_EMI62 is not set |
| 1089 | # CONFIG_USB_EMI26 is not set | 1140 | # CONFIG_USB_EMI26 is not set |
| 1141 | # CONFIG_USB_ADUTUX is not set | ||
| 1090 | # CONFIG_USB_AUERSWALD is not set | 1142 | # CONFIG_USB_AUERSWALD is not set |
| 1091 | # CONFIG_USB_RIO500 is not set | 1143 | # CONFIG_USB_RIO500 is not set |
| 1092 | # CONFIG_USB_LEGOTOWER is not set | 1144 | # CONFIG_USB_LEGOTOWER is not set |
| @@ -1094,12 +1146,13 @@ CONFIG_USB_MON=y | |||
| 1094 | # CONFIG_USB_LED is not set | 1146 | # CONFIG_USB_LED is not set |
| 1095 | # CONFIG_USB_CYPRESS_CY7C63 is not set | 1147 | # CONFIG_USB_CYPRESS_CY7C63 is not set |
| 1096 | # CONFIG_USB_CYTHERM is not set | 1148 | # CONFIG_USB_CYTHERM is not set |
| 1097 | # CONFIG_USB_PHIDGETKIT is not set | 1149 | # CONFIG_USB_PHIDGET is not set |
| 1098 | # CONFIG_USB_PHIDGETSERVO is not set | ||
| 1099 | # CONFIG_USB_IDMOUSE is not set | 1150 | # CONFIG_USB_IDMOUSE is not set |
| 1151 | # CONFIG_USB_FTDI_ELAN is not set | ||
| 1100 | # CONFIG_USB_APPLEDISPLAY is not set | 1152 | # CONFIG_USB_APPLEDISPLAY is not set |
| 1101 | # CONFIG_USB_SISUSBVGA is not set | 1153 | # CONFIG_USB_SISUSBVGA is not set |
| 1102 | # CONFIG_USB_LD is not set | 1154 | # CONFIG_USB_LD is not set |
| 1155 | # CONFIG_USB_TRANCEVIBRATOR is not set | ||
| 1103 | # CONFIG_USB_TEST is not set | 1156 | # CONFIG_USB_TEST is not set |
| 1104 | 1157 | ||
| 1105 | # | 1158 | # |
| @@ -1157,6 +1210,10 @@ CONFIG_USB_MON=y | |||
| 1157 | # | 1210 | # |
| 1158 | 1211 | ||
| 1159 | # | 1212 | # |
| 1213 | # Virtualization | ||
| 1214 | # | ||
| 1215 | |||
| 1216 | # | ||
| 1160 | # File systems | 1217 | # File systems |
| 1161 | # | 1218 | # |
| 1162 | CONFIG_EXT2_FS=y | 1219 | CONFIG_EXT2_FS=y |
| @@ -1166,6 +1223,7 @@ CONFIG_EXT3_FS=y | |||
| 1166 | CONFIG_EXT3_FS_XATTR=y | 1223 | CONFIG_EXT3_FS_XATTR=y |
| 1167 | # CONFIG_EXT3_FS_POSIX_ACL is not set | 1224 | # CONFIG_EXT3_FS_POSIX_ACL is not set |
| 1168 | # CONFIG_EXT3_FS_SECURITY is not set | 1225 | # CONFIG_EXT3_FS_SECURITY is not set |
| 1226 | # CONFIG_EXT4DEV_FS is not set | ||
| 1169 | CONFIG_JBD=y | 1227 | CONFIG_JBD=y |
| 1170 | # CONFIG_JBD_DEBUG is not set | 1228 | # CONFIG_JBD_DEBUG is not set |
| 1171 | CONFIG_FS_MBCACHE=y | 1229 | CONFIG_FS_MBCACHE=y |
| @@ -1173,6 +1231,7 @@ CONFIG_FS_MBCACHE=y | |||
| 1173 | # CONFIG_JFS_FS is not set | 1231 | # CONFIG_JFS_FS is not set |
| 1174 | # CONFIG_FS_POSIX_ACL is not set | 1232 | # CONFIG_FS_POSIX_ACL is not set |
| 1175 | # CONFIG_XFS_FS is not set | 1233 | # CONFIG_XFS_FS is not set |
| 1234 | # CONFIG_GFS2_FS is not set | ||
| 1176 | # CONFIG_OCFS2_FS is not set | 1235 | # CONFIG_OCFS2_FS is not set |
| 1177 | # CONFIG_MINIX_FS is not set | 1236 | # CONFIG_MINIX_FS is not set |
| 1178 | # CONFIG_ROMFS_FS is not set | 1237 | # CONFIG_ROMFS_FS is not set |
| @@ -1207,8 +1266,10 @@ CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" | |||
| 1207 | # | 1266 | # |
| 1208 | CONFIG_PROC_FS=y | 1267 | CONFIG_PROC_FS=y |
| 1209 | CONFIG_PROC_KCORE=y | 1268 | CONFIG_PROC_KCORE=y |
| 1269 | CONFIG_PROC_SYSCTL=y | ||
| 1210 | CONFIG_SYSFS=y | 1270 | CONFIG_SYSFS=y |
| 1211 | CONFIG_TMPFS=y | 1271 | CONFIG_TMPFS=y |
| 1272 | # CONFIG_TMPFS_POSIX_ACL is not set | ||
| 1212 | # CONFIG_HUGETLB_PAGE is not set | 1273 | # CONFIG_HUGETLB_PAGE is not set |
| 1213 | CONFIG_RAMFS=y | 1274 | CONFIG_RAMFS=y |
| 1214 | # CONFIG_CONFIGFS_FS is not set | 1275 | # CONFIG_CONFIGFS_FS is not set |
| @@ -1308,17 +1369,22 @@ CONFIG_NLS_ISO8859_1=m | |||
| 1308 | # CONFIG_NLS_UTF8 is not set | 1369 | # CONFIG_NLS_UTF8 is not set |
| 1309 | 1370 | ||
| 1310 | # | 1371 | # |
| 1372 | # Distributed Lock Manager | ||
| 1373 | # | ||
| 1374 | # CONFIG_DLM is not set | ||
| 1375 | |||
| 1376 | # | ||
| 1311 | # Library routines | 1377 | # Library routines |
| 1312 | # | 1378 | # |
| 1379 | CONFIG_BITREVERSE=y | ||
| 1313 | CONFIG_CRC_CCITT=m | 1380 | CONFIG_CRC_CCITT=m |
| 1314 | # CONFIG_CRC16 is not set | 1381 | # CONFIG_CRC16 is not set |
| 1315 | CONFIG_CRC32=y | 1382 | CONFIG_CRC32=y |
| 1316 | # CONFIG_LIBCRC32C is not set | 1383 | # CONFIG_LIBCRC32C is not set |
| 1317 | CONFIG_ZLIB_INFLATE=m | 1384 | CONFIG_ZLIB_INFLATE=m |
| 1318 | CONFIG_ZLIB_DEFLATE=m | 1385 | CONFIG_ZLIB_DEFLATE=m |
| 1319 | CONFIG_TEXTSEARCH=y | ||
| 1320 | CONFIG_TEXTSEARCH_KMP=m | ||
| 1321 | CONFIG_PLIST=y | 1386 | CONFIG_PLIST=y |
| 1387 | CONFIG_IOMAP_COPY=y | ||
| 1322 | 1388 | ||
| 1323 | # | 1389 | # |
| 1324 | # Instrumentation Support | 1390 | # Instrumentation Support |
| @@ -1329,8 +1395,11 @@ CONFIG_PLIST=y | |||
| 1329 | # Kernel hacking | 1395 | # Kernel hacking |
| 1330 | # | 1396 | # |
| 1331 | # CONFIG_PRINTK_TIME is not set | 1397 | # CONFIG_PRINTK_TIME is not set |
| 1398 | CONFIG_ENABLE_MUST_CHECK=y | ||
| 1332 | CONFIG_MAGIC_SYSRQ=y | 1399 | CONFIG_MAGIC_SYSRQ=y |
| 1333 | # CONFIG_UNUSED_SYMBOLS is not set | 1400 | # CONFIG_UNUSED_SYMBOLS is not set |
| 1401 | # CONFIG_DEBUG_FS is not set | ||
| 1402 | # CONFIG_HEADERS_CHECK is not set | ||
| 1334 | CONFIG_DEBUG_KERNEL=y | 1403 | CONFIG_DEBUG_KERNEL=y |
| 1335 | CONFIG_LOG_BUF_SHIFT=15 | 1404 | CONFIG_LOG_BUF_SHIFT=15 |
| 1336 | CONFIG_DETECT_SOFTLOCKUP=y | 1405 | CONFIG_DETECT_SOFTLOCKUP=y |
| @@ -1345,14 +1414,16 @@ CONFIG_DEBUG_SPINLOCK_SLEEP=y | |||
| 1345 | # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set | 1414 | # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set |
| 1346 | # CONFIG_DEBUG_KOBJECT is not set | 1415 | # CONFIG_DEBUG_KOBJECT is not set |
| 1347 | # CONFIG_DEBUG_HIGHMEM is not set | 1416 | # CONFIG_DEBUG_HIGHMEM is not set |
| 1417 | CONFIG_DEBUG_BUGVERBOSE=y | ||
| 1348 | # CONFIG_DEBUG_INFO is not set | 1418 | # CONFIG_DEBUG_INFO is not set |
| 1349 | # CONFIG_DEBUG_FS is not set | ||
| 1350 | # CONFIG_DEBUG_VM is not set | 1419 | # CONFIG_DEBUG_VM is not set |
| 1420 | # CONFIG_DEBUG_LIST is not set | ||
| 1351 | CONFIG_FORCED_INLINING=y | 1421 | CONFIG_FORCED_INLINING=y |
| 1352 | # CONFIG_RCU_TORTURE_TEST is not set | 1422 | # CONFIG_RCU_TORTURE_TEST is not set |
| 1353 | CONFIG_DEBUGGER=y | 1423 | CONFIG_DEBUGGER=y |
| 1354 | CONFIG_XMON=y | 1424 | CONFIG_XMON=y |
| 1355 | CONFIG_XMON_DEFAULT=y | 1425 | CONFIG_XMON_DEFAULT=y |
| 1426 | CONFIG_XMON_DISASSEMBLY=y | ||
| 1356 | # CONFIG_BDI_SWITCH is not set | 1427 | # CONFIG_BDI_SWITCH is not set |
| 1357 | # CONFIG_BOOTX_TEXT is not set | 1428 | # CONFIG_BOOTX_TEXT is not set |
| 1358 | # CONFIG_PPC_EARLY_DEBUG is not set | 1429 | # CONFIG_PPC_EARLY_DEBUG is not set |
| @@ -1367,7 +1438,11 @@ CONFIG_XMON_DEFAULT=y | |||
| 1367 | # Cryptographic options | 1438 | # Cryptographic options |
| 1368 | # | 1439 | # |
| 1369 | CONFIG_CRYPTO=y | 1440 | CONFIG_CRYPTO=y |
| 1441 | CONFIG_CRYPTO_ALGAPI=m | ||
| 1442 | CONFIG_CRYPTO_BLKCIPHER=m | ||
| 1443 | CONFIG_CRYPTO_MANAGER=m | ||
| 1370 | # CONFIG_CRYPTO_HMAC is not set | 1444 | # CONFIG_CRYPTO_HMAC is not set |
| 1445 | # CONFIG_CRYPTO_XCBC is not set | ||
| 1371 | # CONFIG_CRYPTO_NULL is not set | 1446 | # CONFIG_CRYPTO_NULL is not set |
| 1372 | # CONFIG_CRYPTO_MD4 is not set | 1447 | # CONFIG_CRYPTO_MD4 is not set |
| 1373 | # CONFIG_CRYPTO_MD5 is not set | 1448 | # CONFIG_CRYPTO_MD5 is not set |
| @@ -1376,6 +1451,10 @@ CONFIG_CRYPTO_SHA1=m | |||
| 1376 | # CONFIG_CRYPTO_SHA512 is not set | 1451 | # CONFIG_CRYPTO_SHA512 is not set |
| 1377 | # CONFIG_CRYPTO_WP512 is not set | 1452 | # CONFIG_CRYPTO_WP512 is not set |
| 1378 | # CONFIG_CRYPTO_TGR192 is not set | 1453 | # CONFIG_CRYPTO_TGR192 is not set |
| 1454 | # CONFIG_CRYPTO_GF128MUL is not set | ||
| 1455 | CONFIG_CRYPTO_ECB=m | ||
| 1456 | CONFIG_CRYPTO_CBC=m | ||
| 1457 | # CONFIG_CRYPTO_LRW is not set | ||
| 1379 | # CONFIG_CRYPTO_DES is not set | 1458 | # CONFIG_CRYPTO_DES is not set |
| 1380 | # CONFIG_CRYPTO_BLOWFISH is not set | 1459 | # CONFIG_CRYPTO_BLOWFISH is not set |
| 1381 | # CONFIG_CRYPTO_TWOFISH is not set | 1460 | # CONFIG_CRYPTO_TWOFISH is not set |
diff --git a/arch/powerpc/configs/g5_defconfig b/arch/powerpc/configs/g5_defconfig index 92d0a9dd0b8f..7724847f702a 100644 --- a/arch/powerpc/configs/g5_defconfig +++ b/arch/powerpc/configs/g5_defconfig | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.18-rc6 | 3 | # Linux kernel version: 2.6.20-rc5 |
| 4 | # Sun Sep 10 10:22:55 2006 | 4 | # Mon Jan 22 22:15:04 2007 |
| 5 | # | 5 | # |
| 6 | CONFIG_PPC64=y | 6 | CONFIG_PPC64=y |
| 7 | CONFIG_64BIT=y | 7 | CONFIG_64BIT=y |
| @@ -10,6 +10,8 @@ CONFIG_MMU=y | |||
| 10 | CONFIG_GENERIC_HARDIRQS=y | 10 | CONFIG_GENERIC_HARDIRQS=y |
| 11 | CONFIG_IRQ_PER_CPU=y | 11 | CONFIG_IRQ_PER_CPU=y |
| 12 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 12 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
| 13 | CONFIG_ARCH_HAS_ILOG2_U32=y | ||
| 14 | CONFIG_ARCH_HAS_ILOG2_U64=y | ||
| 13 | CONFIG_GENERIC_HWEIGHT=y | 15 | CONFIG_GENERIC_HWEIGHT=y |
| 14 | CONFIG_GENERIC_CALIBRATE_DELAY=y | 16 | CONFIG_GENERIC_CALIBRATE_DELAY=y |
| 15 | CONFIG_GENERIC_FIND_NEXT_BIT=y | 17 | CONFIG_GENERIC_FIND_NEXT_BIT=y |
| @@ -22,6 +24,8 @@ CONFIG_ARCH_MAY_HAVE_PC_FDC=y | |||
| 22 | CONFIG_PPC_OF=y | 24 | CONFIG_PPC_OF=y |
| 23 | # CONFIG_PPC_UDBG_16550 is not set | 25 | # CONFIG_PPC_UDBG_16550 is not set |
| 24 | CONFIG_GENERIC_TBSYNC=y | 26 | CONFIG_GENERIC_TBSYNC=y |
| 27 | CONFIG_AUDIT_ARCH=y | ||
| 28 | CONFIG_GENERIC_BUG=y | ||
| 25 | # CONFIG_DEFAULT_UIMAGE is not set | 29 | # CONFIG_DEFAULT_UIMAGE is not set |
| 26 | 30 | ||
| 27 | # | 31 | # |
| @@ -30,6 +34,9 @@ CONFIG_GENERIC_TBSYNC=y | |||
| 30 | CONFIG_POWER4_ONLY=y | 34 | CONFIG_POWER4_ONLY=y |
| 31 | CONFIG_POWER4=y | 35 | CONFIG_POWER4=y |
| 32 | CONFIG_PPC_FPU=y | 36 | CONFIG_PPC_FPU=y |
| 37 | # CONFIG_PPC_DCR_NATIVE is not set | ||
| 38 | # CONFIG_PPC_DCR_MMIO is not set | ||
| 39 | # CONFIG_PPC_OF_PLATFORM_PCI is not set | ||
| 33 | CONFIG_ALTIVEC=y | 40 | CONFIG_ALTIVEC=y |
| 34 | CONFIG_PPC_STD_MMU=y | 41 | CONFIG_PPC_STD_MMU=y |
| 35 | CONFIG_VIRT_CPU_ACCOUNTING=y | 42 | CONFIG_VIRT_CPU_ACCOUNTING=y |
| @@ -51,18 +58,22 @@ CONFIG_LOCALVERSION="" | |||
| 51 | CONFIG_LOCALVERSION_AUTO=y | 58 | CONFIG_LOCALVERSION_AUTO=y |
| 52 | CONFIG_SWAP=y | 59 | CONFIG_SWAP=y |
| 53 | CONFIG_SYSVIPC=y | 60 | CONFIG_SYSVIPC=y |
| 61 | # CONFIG_IPC_NS is not set | ||
| 54 | CONFIG_POSIX_MQUEUE=y | 62 | CONFIG_POSIX_MQUEUE=y |
| 55 | # CONFIG_BSD_PROCESS_ACCT is not set | 63 | # CONFIG_BSD_PROCESS_ACCT is not set |
| 56 | # CONFIG_TASKSTATS is not set | 64 | # CONFIG_TASKSTATS is not set |
| 57 | CONFIG_SYSCTL=y | 65 | # CONFIG_UTS_NS is not set |
| 58 | # CONFIG_AUDIT is not set | 66 | # CONFIG_AUDIT is not set |
| 59 | CONFIG_IKCONFIG=y | 67 | CONFIG_IKCONFIG=y |
| 60 | CONFIG_IKCONFIG_PROC=y | 68 | CONFIG_IKCONFIG_PROC=y |
| 61 | # CONFIG_CPUSETS is not set | 69 | # CONFIG_CPUSETS is not set |
| 70 | CONFIG_SYSFS_DEPRECATED=y | ||
| 62 | # CONFIG_RELAY is not set | 71 | # CONFIG_RELAY is not set |
| 63 | CONFIG_INITRAMFS_SOURCE="" | 72 | CONFIG_INITRAMFS_SOURCE="" |
| 64 | CONFIG_CC_OPTIMIZE_FOR_SIZE=y | 73 | CONFIG_CC_OPTIMIZE_FOR_SIZE=y |
| 74 | CONFIG_SYSCTL=y | ||
| 65 | # CONFIG_EMBEDDED is not set | 75 | # CONFIG_EMBEDDED is not set |
| 76 | CONFIG_SYSCTL_SYSCALL=y | ||
| 66 | CONFIG_KALLSYMS=y | 77 | CONFIG_KALLSYMS=y |
| 67 | # CONFIG_KALLSYMS_ALL is not set | 78 | # CONFIG_KALLSYMS_ALL is not set |
| 68 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | 79 | # CONFIG_KALLSYMS_EXTRA_PASS is not set |
| @@ -71,12 +82,12 @@ CONFIG_PRINTK=y | |||
| 71 | CONFIG_BUG=y | 82 | CONFIG_BUG=y |
| 72 | CONFIG_ELF_CORE=y | 83 | CONFIG_ELF_CORE=y |
| 73 | CONFIG_BASE_FULL=y | 84 | CONFIG_BASE_FULL=y |
| 74 | CONFIG_RT_MUTEXES=y | ||
| 75 | CONFIG_FUTEX=y | 85 | CONFIG_FUTEX=y |
| 76 | CONFIG_EPOLL=y | 86 | CONFIG_EPOLL=y |
| 77 | CONFIG_SHMEM=y | 87 | CONFIG_SHMEM=y |
| 78 | CONFIG_SLAB=y | 88 | CONFIG_SLAB=y |
| 79 | CONFIG_VM_EVENT_COUNTERS=y | 89 | CONFIG_VM_EVENT_COUNTERS=y |
| 90 | CONFIG_RT_MUTEXES=y | ||
| 80 | # CONFIG_TINY_SHMEM is not set | 91 | # CONFIG_TINY_SHMEM is not set |
| 81 | CONFIG_BASE_SMALL=0 | 92 | CONFIG_BASE_SMALL=0 |
| 82 | # CONFIG_SLOB is not set | 93 | # CONFIG_SLOB is not set |
| @@ -95,6 +106,7 @@ CONFIG_STOP_MACHINE=y | |||
| 95 | # | 106 | # |
| 96 | # Block layer | 107 | # Block layer |
| 97 | # | 108 | # |
| 109 | CONFIG_BLOCK=y | ||
| 98 | # CONFIG_BLK_DEV_IO_TRACE is not set | 110 | # CONFIG_BLK_DEV_IO_TRACE is not set |
| 99 | 111 | ||
| 100 | # | 112 | # |
| @@ -114,23 +126,28 @@ CONFIG_DEFAULT_IOSCHED="anticipatory" | |||
| 114 | # Platform support | 126 | # Platform support |
| 115 | # | 127 | # |
| 116 | CONFIG_PPC_MULTIPLATFORM=y | 128 | CONFIG_PPC_MULTIPLATFORM=y |
| 117 | # CONFIG_PPC_ISERIES is not set | ||
| 118 | # CONFIG_EMBEDDED6xx is not set | 129 | # CONFIG_EMBEDDED6xx is not set |
| 119 | # CONFIG_APUS is not set | 130 | # CONFIG_APUS is not set |
| 120 | # CONFIG_PPC_PSERIES is not set | 131 | # CONFIG_PPC_PSERIES is not set |
| 132 | # CONFIG_PPC_ISERIES is not set | ||
| 133 | # CONFIG_PPC_MPC52xx is not set | ||
| 121 | CONFIG_PPC_PMAC=y | 134 | CONFIG_PPC_PMAC=y |
| 122 | CONFIG_PPC_PMAC64=y | 135 | CONFIG_PPC_PMAC64=y |
| 123 | # CONFIG_PPC_MAPLE is not set | 136 | # CONFIG_PPC_MAPLE is not set |
| 137 | # CONFIG_PPC_PASEMI is not set | ||
| 124 | # CONFIG_PPC_CELL is not set | 138 | # CONFIG_PPC_CELL is not set |
| 125 | # CONFIG_PPC_CELL_NATIVE is not set | 139 | # CONFIG_PPC_CELL_NATIVE is not set |
| 126 | # CONFIG_PPC_IBM_CELL_BLADE is not set | 140 | # CONFIG_PPC_IBM_CELL_BLADE is not set |
| 127 | # CONFIG_UDBG_RTAS_CONSOLE is not set | 141 | # CONFIG_PPC_PS3 is not set |
| 142 | CONFIG_PPC_NATIVE=y | ||
| 128 | CONFIG_U3_DART=y | 143 | CONFIG_U3_DART=y |
| 129 | # CONFIG_PPC_RTAS is not set | 144 | # CONFIG_PPC_RTAS is not set |
| 130 | # CONFIG_MMIO_NVRAM is not set | 145 | # CONFIG_MMIO_NVRAM is not set |
| 131 | CONFIG_MPIC_BROKEN_U3=y | 146 | CONFIG_MPIC_BROKEN_U3=y |
| 132 | # CONFIG_PPC_MPC106 is not set | 147 | # CONFIG_PPC_MPC106 is not set |
| 133 | CONFIG_PPC_970_NAP=y | 148 | CONFIG_PPC_970_NAP=y |
| 149 | # CONFIG_PPC_INDIRECT_IO is not set | ||
| 150 | # CONFIG_GENERIC_IOMAP is not set | ||
| 134 | CONFIG_CPU_FREQ=y | 151 | CONFIG_CPU_FREQ=y |
| 135 | CONFIG_CPU_FREQ_TABLE=y | 152 | CONFIG_CPU_FREQ_TABLE=y |
| 136 | # CONFIG_CPU_FREQ_DEBUG is not set | 153 | # CONFIG_CPU_FREQ_DEBUG is not set |
| @@ -152,6 +169,7 @@ CONFIG_MPIC=y | |||
| 152 | # | 169 | # |
| 153 | # CONFIG_HZ_100 is not set | 170 | # CONFIG_HZ_100 is not set |
| 154 | CONFIG_HZ_250=y | 171 | CONFIG_HZ_250=y |
| 172 | # CONFIG_HZ_300 is not set | ||
| 155 | # CONFIG_HZ_1000 is not set | 173 | # CONFIG_HZ_1000 is not set |
| 156 | CONFIG_HZ=250 | 174 | CONFIG_HZ=250 |
| 157 | CONFIG_PREEMPT_NONE=y | 175 | CONFIG_PREEMPT_NONE=y |
| @@ -171,6 +189,7 @@ CONFIG_IRQ_ALL_CPUS=y | |||
| 171 | CONFIG_ARCH_SELECT_MEMORY_MODEL=y | 189 | CONFIG_ARCH_SELECT_MEMORY_MODEL=y |
| 172 | CONFIG_ARCH_FLATMEM_ENABLE=y | 190 | CONFIG_ARCH_FLATMEM_ENABLE=y |
| 173 | CONFIG_ARCH_SPARSEMEM_ENABLE=y | 191 | CONFIG_ARCH_SPARSEMEM_ENABLE=y |
| 192 | CONFIG_ARCH_POPULATES_NODE_MAP=y | ||
| 174 | CONFIG_SELECT_MEMORY_MODEL=y | 193 | CONFIG_SELECT_MEMORY_MODEL=y |
| 175 | CONFIG_FLATMEM_MANUAL=y | 194 | CONFIG_FLATMEM_MANUAL=y |
| 176 | # CONFIG_DISCONTIGMEM_MANUAL is not set | 195 | # CONFIG_DISCONTIGMEM_MANUAL is not set |
| @@ -225,6 +244,7 @@ CONFIG_PACKET=y | |||
| 225 | CONFIG_UNIX=y | 244 | CONFIG_UNIX=y |
| 226 | CONFIG_XFRM=y | 245 | CONFIG_XFRM=y |
| 227 | CONFIG_XFRM_USER=m | 246 | CONFIG_XFRM_USER=m |
| 247 | # CONFIG_XFRM_SUB_POLICY is not set | ||
| 228 | CONFIG_NET_KEY=m | 248 | CONFIG_NET_KEY=m |
| 229 | CONFIG_INET=y | 249 | CONFIG_INET=y |
| 230 | CONFIG_IP_MULTICAST=y | 250 | CONFIG_IP_MULTICAST=y |
| @@ -243,10 +263,13 @@ CONFIG_INET_XFRM_TUNNEL=m | |||
| 243 | CONFIG_INET_TUNNEL=y | 263 | CONFIG_INET_TUNNEL=y |
| 244 | CONFIG_INET_XFRM_MODE_TRANSPORT=y | 264 | CONFIG_INET_XFRM_MODE_TRANSPORT=y |
| 245 | CONFIG_INET_XFRM_MODE_TUNNEL=y | 265 | CONFIG_INET_XFRM_MODE_TUNNEL=y |
| 266 | CONFIG_INET_XFRM_MODE_BEET=y | ||
| 246 | CONFIG_INET_DIAG=y | 267 | CONFIG_INET_DIAG=y |
| 247 | CONFIG_INET_TCP_DIAG=y | 268 | CONFIG_INET_TCP_DIAG=y |
| 248 | # CONFIG_TCP_CONG_ADVANCED is not set | 269 | # CONFIG_TCP_CONG_ADVANCED is not set |
| 249 | CONFIG_TCP_CONG_BIC=y | 270 | CONFIG_TCP_CONG_CUBIC=y |
| 271 | CONFIG_DEFAULT_TCP_CONG="cubic" | ||
| 272 | # CONFIG_TCP_MD5SIG is not set | ||
| 250 | 273 | ||
| 251 | # | 274 | # |
| 252 | # IP: Virtual Server Configuration | 275 | # IP: Virtual Server Configuration |
| @@ -263,24 +286,29 @@ CONFIG_NETFILTER=y | |||
| 263 | # Core Netfilter Configuration | 286 | # Core Netfilter Configuration |
| 264 | # | 287 | # |
| 265 | # CONFIG_NETFILTER_NETLINK is not set | 288 | # CONFIG_NETFILTER_NETLINK is not set |
| 289 | CONFIG_NF_CONNTRACK_ENABLED=m | ||
| 290 | CONFIG_NF_CONNTRACK_SUPPORT=y | ||
| 291 | # CONFIG_IP_NF_CONNTRACK_SUPPORT is not set | ||
| 292 | CONFIG_NF_CONNTRACK=m | ||
| 293 | # CONFIG_NF_CT_ACCT is not set | ||
| 294 | CONFIG_NF_CONNTRACK_MARK=y | ||
| 295 | CONFIG_NF_CONNTRACK_EVENTS=y | ||
| 296 | # CONFIG_NF_CT_PROTO_SCTP is not set | ||
| 297 | # CONFIG_NF_CONNTRACK_AMANDA is not set | ||
| 298 | CONFIG_NF_CONNTRACK_FTP=m | ||
| 299 | # CONFIG_NF_CONNTRACK_H323 is not set | ||
| 300 | CONFIG_NF_CONNTRACK_IRC=m | ||
| 301 | # CONFIG_NF_CONNTRACK_NETBIOS_NS is not set | ||
| 302 | # CONFIG_NF_CONNTRACK_PPTP is not set | ||
| 303 | # CONFIG_NF_CONNTRACK_SIP is not set | ||
| 304 | CONFIG_NF_CONNTRACK_TFTP=m | ||
| 266 | # CONFIG_NETFILTER_XTABLES is not set | 305 | # CONFIG_NETFILTER_XTABLES is not set |
| 267 | 306 | ||
| 268 | # | 307 | # |
| 269 | # IP: Netfilter Configuration | 308 | # IP: Netfilter Configuration |
| 270 | # | 309 | # |
| 271 | CONFIG_IP_NF_CONNTRACK=m | 310 | CONFIG_NF_CONNTRACK_IPV4=m |
| 272 | CONFIG_IP_NF_CT_ACCT=y | 311 | CONFIG_NF_CONNTRACK_PROC_COMPAT=y |
| 273 | CONFIG_IP_NF_CONNTRACK_MARK=y | ||
| 274 | CONFIG_IP_NF_CONNTRACK_EVENTS=y | ||
| 275 | CONFIG_IP_NF_CT_PROTO_SCTP=m | ||
| 276 | CONFIG_IP_NF_FTP=m | ||
| 277 | CONFIG_IP_NF_IRC=m | ||
| 278 | # CONFIG_IP_NF_NETBIOS_NS is not set | ||
| 279 | CONFIG_IP_NF_TFTP=m | ||
| 280 | CONFIG_IP_NF_AMANDA=m | ||
| 281 | # CONFIG_IP_NF_PPTP is not set | ||
| 282 | # CONFIG_IP_NF_H323 is not set | ||
| 283 | # CONFIG_IP_NF_SIP is not set | ||
| 284 | CONFIG_IP_NF_QUEUE=m | 312 | CONFIG_IP_NF_QUEUE=m |
| 285 | 313 | ||
| 286 | # | 314 | # |
| @@ -307,7 +335,6 @@ CONFIG_LLC=y | |||
| 307 | # CONFIG_ATALK is not set | 335 | # CONFIG_ATALK is not set |
| 308 | # CONFIG_X25 is not set | 336 | # CONFIG_X25 is not set |
| 309 | # CONFIG_LAPB is not set | 337 | # CONFIG_LAPB is not set |
| 310 | # CONFIG_NET_DIVERT is not set | ||
| 311 | # CONFIG_ECONET is not set | 338 | # CONFIG_ECONET is not set |
| 312 | # CONFIG_WAN_ROUTER is not set | 339 | # CONFIG_WAN_ROUTER is not set |
| 313 | 340 | ||
| @@ -382,6 +409,12 @@ CONFIG_CDROM_PKTCDVD_BUFFERS=8 | |||
| 382 | # CONFIG_ATA_OVER_ETH is not set | 409 | # CONFIG_ATA_OVER_ETH is not set |
| 383 | 410 | ||
| 384 | # | 411 | # |
| 412 | # Misc devices | ||
| 413 | # | ||
| 414 | # CONFIG_SGI_IOC4 is not set | ||
| 415 | # CONFIG_TIFM_CORE is not set | ||
| 416 | |||
| 417 | # | ||
| 385 | # ATA/ATAPI/MFM/RLL support | 418 | # ATA/ATAPI/MFM/RLL support |
| 386 | # | 419 | # |
| 387 | CONFIG_IDE=y | 420 | CONFIG_IDE=y |
| @@ -408,7 +441,6 @@ CONFIG_BLK_DEV_IDEPCI=y | |||
| 408 | # CONFIG_BLK_DEV_OFFBOARD is not set | 441 | # CONFIG_BLK_DEV_OFFBOARD is not set |
| 409 | # CONFIG_BLK_DEV_GENERIC is not set | 442 | # CONFIG_BLK_DEV_GENERIC is not set |
| 410 | # CONFIG_BLK_DEV_OPTI621 is not set | 443 | # CONFIG_BLK_DEV_OPTI621 is not set |
| 411 | # CONFIG_BLK_DEV_SL82C105 is not set | ||
| 412 | CONFIG_BLK_DEV_IDEDMA_PCI=y | 444 | CONFIG_BLK_DEV_IDEDMA_PCI=y |
| 413 | # CONFIG_BLK_DEV_IDEDMA_FORCED is not set | 445 | # CONFIG_BLK_DEV_IDEDMA_FORCED is not set |
| 414 | CONFIG_IDEDMA_PCI_AUTO=y | 446 | CONFIG_IDEDMA_PCI_AUTO=y |
| @@ -423,6 +455,7 @@ CONFIG_IDEDMA_PCI_AUTO=y | |||
| 423 | # CONFIG_BLK_DEV_CS5530 is not set | 455 | # CONFIG_BLK_DEV_CS5530 is not set |
| 424 | # CONFIG_BLK_DEV_HPT34X is not set | 456 | # CONFIG_BLK_DEV_HPT34X is not set |
| 425 | # CONFIG_BLK_DEV_HPT366 is not set | 457 | # CONFIG_BLK_DEV_HPT366 is not set |
| 458 | # CONFIG_BLK_DEV_JMICRON is not set | ||
| 426 | # CONFIG_BLK_DEV_SC1200 is not set | 459 | # CONFIG_BLK_DEV_SC1200 is not set |
| 427 | # CONFIG_BLK_DEV_PIIX is not set | 460 | # CONFIG_BLK_DEV_PIIX is not set |
| 428 | # CONFIG_BLK_DEV_IT821X is not set | 461 | # CONFIG_BLK_DEV_IT821X is not set |
| @@ -431,6 +464,7 @@ CONFIG_IDEDMA_PCI_AUTO=y | |||
| 431 | # CONFIG_BLK_DEV_PDC202XX_NEW is not set | 464 | # CONFIG_BLK_DEV_PDC202XX_NEW is not set |
| 432 | # CONFIG_BLK_DEV_SVWKS is not set | 465 | # CONFIG_BLK_DEV_SVWKS is not set |
| 433 | # CONFIG_BLK_DEV_SIIMAGE is not set | 466 | # CONFIG_BLK_DEV_SIIMAGE is not set |
| 467 | # CONFIG_BLK_DEV_SL82C105 is not set | ||
| 434 | # CONFIG_BLK_DEV_SLC90E66 is not set | 468 | # CONFIG_BLK_DEV_SLC90E66 is not set |
| 435 | # CONFIG_BLK_DEV_TRM290 is not set | 469 | # CONFIG_BLK_DEV_TRM290 is not set |
| 436 | # CONFIG_BLK_DEV_VIA82CXXX is not set | 470 | # CONFIG_BLK_DEV_VIA82CXXX is not set |
| @@ -448,6 +482,8 @@ CONFIG_IDEDMA_AUTO=y | |||
| 448 | # | 482 | # |
| 449 | # CONFIG_RAID_ATTRS is not set | 483 | # CONFIG_RAID_ATTRS is not set |
| 450 | CONFIG_SCSI=y | 484 | CONFIG_SCSI=y |
| 485 | # CONFIG_SCSI_TGT is not set | ||
| 486 | # CONFIG_SCSI_NETLINK is not set | ||
| 451 | CONFIG_SCSI_PROC_FS=y | 487 | CONFIG_SCSI_PROC_FS=y |
| 452 | 488 | ||
| 453 | # | 489 | # |
| @@ -467,14 +503,16 @@ CONFIG_CHR_DEV_SG=y | |||
| 467 | CONFIG_SCSI_MULTI_LUN=y | 503 | CONFIG_SCSI_MULTI_LUN=y |
| 468 | CONFIG_SCSI_CONSTANTS=y | 504 | CONFIG_SCSI_CONSTANTS=y |
| 469 | # CONFIG_SCSI_LOGGING is not set | 505 | # CONFIG_SCSI_LOGGING is not set |
| 506 | # CONFIG_SCSI_SCAN_ASYNC is not set | ||
| 470 | 507 | ||
| 471 | # | 508 | # |
| 472 | # SCSI Transport Attributes | 509 | # SCSI Transports |
| 473 | # | 510 | # |
| 474 | CONFIG_SCSI_SPI_ATTRS=y | 511 | CONFIG_SCSI_SPI_ATTRS=y |
| 475 | # CONFIG_SCSI_FC_ATTRS is not set | 512 | # CONFIG_SCSI_FC_ATTRS is not set |
| 476 | # CONFIG_SCSI_ISCSI_ATTRS is not set | 513 | # CONFIG_SCSI_ISCSI_ATTRS is not set |
| 477 | # CONFIG_SCSI_SAS_ATTRS is not set | 514 | # CONFIG_SCSI_SAS_ATTRS is not set |
| 515 | # CONFIG_SCSI_SAS_LIBSAS is not set | ||
| 478 | 516 | ||
| 479 | # | 517 | # |
| 480 | # SCSI low-level drivers | 518 | # SCSI low-level drivers |
| @@ -487,26 +525,12 @@ CONFIG_SCSI_SPI_ATTRS=y | |||
| 487 | # CONFIG_SCSI_AIC7XXX is not set | 525 | # CONFIG_SCSI_AIC7XXX is not set |
| 488 | # CONFIG_SCSI_AIC7XXX_OLD is not set | 526 | # CONFIG_SCSI_AIC7XXX_OLD is not set |
| 489 | # CONFIG_SCSI_AIC79XX is not set | 527 | # CONFIG_SCSI_AIC79XX is not set |
| 528 | # CONFIG_SCSI_AIC94XX is not set | ||
| 529 | # CONFIG_SCSI_ARCMSR is not set | ||
| 490 | # CONFIG_MEGARAID_NEWGEN is not set | 530 | # CONFIG_MEGARAID_NEWGEN is not set |
| 491 | # CONFIG_MEGARAID_LEGACY is not set | 531 | # CONFIG_MEGARAID_LEGACY is not set |
| 492 | # CONFIG_MEGARAID_SAS is not set | 532 | # CONFIG_MEGARAID_SAS is not set |
| 493 | CONFIG_ATA=y | ||
| 494 | # CONFIG_SATA_AHCI is not set | ||
| 495 | CONFIG_SATA_SVW=y | ||
| 496 | # CONFIG_SCSI_ATA_PIIX is not set | ||
| 497 | # CONFIG_SATA_MV is not set | ||
| 498 | # CONFIG_SATA_NV is not set | ||
| 499 | # CONFIG_SCSI_PDC_ADMA is not set | ||
| 500 | # CONFIG_SCSI_HPTIOP is not set | 533 | # CONFIG_SCSI_HPTIOP is not set |
| 501 | # CONFIG_SATA_QSTOR is not set | ||
| 502 | # CONFIG_SATA_PROMISE is not set | ||
| 503 | # CONFIG_SATA_SX4 is not set | ||
| 504 | # CONFIG_SATA_SIL is not set | ||
| 505 | # CONFIG_SATA_SIL24 is not set | ||
| 506 | # CONFIG_SATA_SIS is not set | ||
| 507 | # CONFIG_SATA_ULI is not set | ||
| 508 | # CONFIG_SATA_VIA is not set | ||
| 509 | # CONFIG_SATA_VITESSE is not set | ||
| 510 | # CONFIG_SCSI_BUSLOGIC is not set | 534 | # CONFIG_SCSI_BUSLOGIC is not set |
| 511 | # CONFIG_SCSI_DMX3191D is not set | 535 | # CONFIG_SCSI_DMX3191D is not set |
| 512 | # CONFIG_SCSI_EATA is not set | 536 | # CONFIG_SCSI_EATA is not set |
| @@ -515,14 +539,71 @@ CONFIG_SATA_SVW=y | |||
| 515 | # CONFIG_SCSI_IPS is not set | 539 | # CONFIG_SCSI_IPS is not set |
| 516 | # CONFIG_SCSI_INITIO is not set | 540 | # CONFIG_SCSI_INITIO is not set |
| 517 | # CONFIG_SCSI_INIA100 is not set | 541 | # CONFIG_SCSI_INIA100 is not set |
| 542 | # CONFIG_SCSI_STEX is not set | ||
| 518 | # CONFIG_SCSI_SYM53C8XX_2 is not set | 543 | # CONFIG_SCSI_SYM53C8XX_2 is not set |
| 519 | # CONFIG_SCSI_IPR is not set | 544 | # CONFIG_SCSI_IPR is not set |
| 520 | # CONFIG_SCSI_QLOGIC_1280 is not set | 545 | # CONFIG_SCSI_QLOGIC_1280 is not set |
| 521 | # CONFIG_SCSI_QLA_FC is not set | 546 | # CONFIG_SCSI_QLA_FC is not set |
| 547 | # CONFIG_SCSI_QLA_ISCSI is not set | ||
| 522 | # CONFIG_SCSI_LPFC is not set | 548 | # CONFIG_SCSI_LPFC is not set |
| 523 | # CONFIG_SCSI_DC395x is not set | 549 | # CONFIG_SCSI_DC395x is not set |
| 524 | # CONFIG_SCSI_DC390T is not set | 550 | # CONFIG_SCSI_DC390T is not set |
| 525 | # CONFIG_SCSI_DEBUG is not set | 551 | # CONFIG_SCSI_DEBUG is not set |
| 552 | # CONFIG_SCSI_SRP is not set | ||
| 553 | |||
| 554 | # | ||
| 555 | # Serial ATA (prod) and Parallel ATA (experimental) drivers | ||
| 556 | # | ||
| 557 | CONFIG_ATA=y | ||
| 558 | # CONFIG_SATA_AHCI is not set | ||
| 559 | CONFIG_SATA_SVW=y | ||
| 560 | # CONFIG_ATA_PIIX is not set | ||
| 561 | # CONFIG_SATA_MV is not set | ||
| 562 | # CONFIG_SATA_NV is not set | ||
| 563 | # CONFIG_PDC_ADMA is not set | ||
| 564 | # CONFIG_SATA_QSTOR is not set | ||
| 565 | # CONFIG_SATA_PROMISE is not set | ||
| 566 | # CONFIG_SATA_SX4 is not set | ||
| 567 | # CONFIG_SATA_SIL is not set | ||
| 568 | # CONFIG_SATA_SIL24 is not set | ||
| 569 | # CONFIG_SATA_SIS is not set | ||
| 570 | # CONFIG_SATA_ULI is not set | ||
| 571 | # CONFIG_SATA_VIA is not set | ||
| 572 | # CONFIG_SATA_VITESSE is not set | ||
| 573 | # CONFIG_PATA_ALI is not set | ||
| 574 | # CONFIG_PATA_AMD is not set | ||
| 575 | # CONFIG_PATA_ARTOP is not set | ||
| 576 | # CONFIG_PATA_ATIIXP is not set | ||
| 577 | # CONFIG_PATA_CMD64X is not set | ||
| 578 | # CONFIG_PATA_CS5520 is not set | ||
| 579 | # CONFIG_PATA_CS5530 is not set | ||
| 580 | # CONFIG_PATA_CYPRESS is not set | ||
| 581 | # CONFIG_PATA_EFAR is not set | ||
| 582 | # CONFIG_ATA_GENERIC is not set | ||
| 583 | # CONFIG_PATA_HPT366 is not set | ||
| 584 | # CONFIG_PATA_HPT37X is not set | ||
| 585 | # CONFIG_PATA_HPT3X2N is not set | ||
| 586 | # CONFIG_PATA_HPT3X3 is not set | ||
| 587 | # CONFIG_PATA_IT821X is not set | ||
| 588 | # CONFIG_PATA_JMICRON is not set | ||
| 589 | # CONFIG_PATA_TRIFLEX is not set | ||
| 590 | # CONFIG_PATA_MARVELL is not set | ||
| 591 | # CONFIG_PATA_MPIIX is not set | ||
| 592 | # CONFIG_PATA_OLDPIIX is not set | ||
| 593 | # CONFIG_PATA_NETCELL is not set | ||
| 594 | # CONFIG_PATA_NS87410 is not set | ||
| 595 | # CONFIG_PATA_OPTI is not set | ||
| 596 | # CONFIG_PATA_OPTIDMA is not set | ||
| 597 | # CONFIG_PATA_PDC_OLD is not set | ||
| 598 | # CONFIG_PATA_RADISYS is not set | ||
| 599 | # CONFIG_PATA_RZ1000 is not set | ||
| 600 | # CONFIG_PATA_SC1200 is not set | ||
| 601 | # CONFIG_PATA_SERVERWORKS is not set | ||
| 602 | # CONFIG_PATA_PDC2027X is not set | ||
| 603 | # CONFIG_PATA_SIL680 is not set | ||
| 604 | # CONFIG_PATA_SIS is not set | ||
| 605 | # CONFIG_PATA_VIA is not set | ||
| 606 | # CONFIG_PATA_WINBOND is not set | ||
| 526 | 607 | ||
| 527 | # | 608 | # |
| 528 | # Multi-device support (RAID and LVM) | 609 | # Multi-device support (RAID and LVM) |
| @@ -537,6 +618,7 @@ CONFIG_MD_RAID10=m | |||
| 537 | CONFIG_MD_MULTIPATH=m | 618 | CONFIG_MD_MULTIPATH=m |
| 538 | CONFIG_MD_FAULTY=m | 619 | CONFIG_MD_FAULTY=m |
| 539 | CONFIG_BLK_DEV_DM=y | 620 | CONFIG_BLK_DEV_DM=y |
| 621 | # CONFIG_DM_DEBUG is not set | ||
| 540 | CONFIG_DM_CRYPT=m | 622 | CONFIG_DM_CRYPT=m |
| 541 | CONFIG_DM_SNAPSHOT=m | 623 | CONFIG_DM_SNAPSHOT=m |
| 542 | CONFIG_DM_MIRROR=m | 624 | CONFIG_DM_MIRROR=m |
| @@ -591,11 +673,13 @@ CONFIG_IEEE1394_RAWIO=y | |||
| 591 | CONFIG_ADB_PMU=y | 673 | CONFIG_ADB_PMU=y |
| 592 | # CONFIG_ADB_PMU_LED is not set | 674 | # CONFIG_ADB_PMU_LED is not set |
| 593 | CONFIG_PMAC_SMU=y | 675 | CONFIG_PMAC_SMU=y |
| 676 | CONFIG_MAC_EMUMOUSEBTN=y | ||
| 594 | CONFIG_THERM_PM72=y | 677 | CONFIG_THERM_PM72=y |
| 595 | CONFIG_WINDFARM=y | 678 | CONFIG_WINDFARM=y |
| 596 | CONFIG_WINDFARM_PM81=y | 679 | CONFIG_WINDFARM_PM81=y |
| 597 | CONFIG_WINDFARM_PM91=y | 680 | CONFIG_WINDFARM_PM91=y |
| 598 | CONFIG_WINDFARM_PM112=y | 681 | CONFIG_WINDFARM_PM112=y |
| 682 | # CONFIG_PMAC_RACKMETER is not set | ||
| 599 | 683 | ||
| 600 | # | 684 | # |
| 601 | # Network device support | 685 | # Network device support |
| @@ -652,7 +736,7 @@ CONFIG_E1000=y | |||
| 652 | # CONFIG_SK98LIN is not set | 736 | # CONFIG_SK98LIN is not set |
| 653 | CONFIG_TIGON3=y | 737 | CONFIG_TIGON3=y |
| 654 | # CONFIG_BNX2 is not set | 738 | # CONFIG_BNX2 is not set |
| 655 | # CONFIG_MV643XX_ETH is not set | 739 | # CONFIG_QLA3XXX is not set |
| 656 | 740 | ||
| 657 | # | 741 | # |
| 658 | # Ethernet (10000 Mbit) | 742 | # Ethernet (10000 Mbit) |
| @@ -661,6 +745,7 @@ CONFIG_TIGON3=y | |||
| 661 | # CONFIG_IXGB is not set | 745 | # CONFIG_IXGB is not set |
| 662 | # CONFIG_S2IO is not set | 746 | # CONFIG_S2IO is not set |
| 663 | # CONFIG_MYRI10GE is not set | 747 | # CONFIG_MYRI10GE is not set |
| 748 | # CONFIG_NETXEN_NIC is not set | ||
| 664 | 749 | ||
| 665 | # | 750 | # |
| 666 | # Token Ring devices | 751 | # Token Ring devices |
| @@ -691,6 +776,7 @@ CONFIG_PPP_BSDCOMP=m | |||
| 691 | # CONFIG_PPP_MPPE is not set | 776 | # CONFIG_PPP_MPPE is not set |
| 692 | CONFIG_PPPOE=m | 777 | CONFIG_PPPOE=m |
| 693 | # CONFIG_SLIP is not set | 778 | # CONFIG_SLIP is not set |
| 779 | CONFIG_SLHC=m | ||
| 694 | # CONFIG_NET_FC is not set | 780 | # CONFIG_NET_FC is not set |
| 695 | # CONFIG_SHAPER is not set | 781 | # CONFIG_SHAPER is not set |
| 696 | # CONFIG_NETCONSOLE is not set | 782 | # CONFIG_NETCONSOLE is not set |
| @@ -711,6 +797,7 @@ CONFIG_PPPOE=m | |||
| 711 | # Input device support | 797 | # Input device support |
| 712 | # | 798 | # |
| 713 | CONFIG_INPUT=y | 799 | CONFIG_INPUT=y |
| 800 | CONFIG_INPUT_FF_MEMLESS=y | ||
| 714 | 801 | ||
| 715 | # | 802 | # |
| 716 | # Userland interfaces | 803 | # Userland interfaces |
| @@ -733,6 +820,7 @@ CONFIG_INPUT_KEYBOARD=y | |||
| 733 | # CONFIG_KEYBOARD_LKKBD is not set | 820 | # CONFIG_KEYBOARD_LKKBD is not set |
| 734 | # CONFIG_KEYBOARD_XTKBD is not set | 821 | # CONFIG_KEYBOARD_XTKBD is not set |
| 735 | # CONFIG_KEYBOARD_NEWTON is not set | 822 | # CONFIG_KEYBOARD_NEWTON is not set |
| 823 | # CONFIG_KEYBOARD_STOWAWAY is not set | ||
| 736 | CONFIG_INPUT_MOUSE=y | 824 | CONFIG_INPUT_MOUSE=y |
| 737 | # CONFIG_MOUSE_PS2 is not set | 825 | # CONFIG_MOUSE_PS2 is not set |
| 738 | # CONFIG_MOUSE_SERIAL is not set | 826 | # CONFIG_MOUSE_SERIAL is not set |
| @@ -789,13 +877,7 @@ CONFIG_GEN_RTC=y | |||
| 789 | # CONFIG_DTLK is not set | 877 | # CONFIG_DTLK is not set |
| 790 | # CONFIG_R3964 is not set | 878 | # CONFIG_R3964 is not set |
| 791 | # CONFIG_APPLICOM is not set | 879 | # CONFIG_APPLICOM is not set |
| 792 | |||
| 793 | # | ||
| 794 | # Ftape, the floppy tape device driver | ||
| 795 | # | ||
| 796 | CONFIG_AGP=m | 880 | CONFIG_AGP=m |
| 797 | # CONFIG_AGP_SIS is not set | ||
| 798 | # CONFIG_AGP_VIA is not set | ||
| 799 | CONFIG_AGP_UNINORTH=m | 881 | CONFIG_AGP_UNINORTH=m |
| 800 | # CONFIG_DRM is not set | 882 | # CONFIG_DRM is not set |
| 801 | CONFIG_RAW_DRIVER=y | 883 | CONFIG_RAW_DRIVER=y |
| @@ -806,7 +888,6 @@ CONFIG_MAX_RAW_DEVS=256 | |||
| 806 | # TPM devices | 888 | # TPM devices |
| 807 | # | 889 | # |
| 808 | # CONFIG_TCG_TPM is not set | 890 | # CONFIG_TCG_TPM is not set |
| 809 | # CONFIG_TELCLOCK is not set | ||
| 810 | 891 | ||
| 811 | # | 892 | # |
| 812 | # I2C support | 893 | # I2C support |
| @@ -871,6 +952,7 @@ CONFIG_I2C_POWERMAC=y | |||
| 871 | # | 952 | # |
| 872 | # Dallas's 1-wire bus | 953 | # Dallas's 1-wire bus |
| 873 | # | 954 | # |
| 955 | # CONFIG_W1 is not set | ||
| 874 | 956 | ||
| 875 | # | 957 | # |
| 876 | # Hardware Monitoring support | 958 | # Hardware Monitoring support |
| @@ -879,14 +961,9 @@ CONFIG_I2C_POWERMAC=y | |||
| 879 | # CONFIG_HWMON_VID is not set | 961 | # CONFIG_HWMON_VID is not set |
| 880 | 962 | ||
| 881 | # | 963 | # |
| 882 | # Misc devices | ||
| 883 | # | ||
| 884 | |||
| 885 | # | ||
| 886 | # Multimedia devices | 964 | # Multimedia devices |
| 887 | # | 965 | # |
| 888 | # CONFIG_VIDEO_DEV is not set | 966 | # CONFIG_VIDEO_DEV is not set |
| 889 | CONFIG_VIDEO_V4L2=y | ||
| 890 | 967 | ||
| 891 | # | 968 | # |
| 892 | # Digital Video Broadcasting Devices | 969 | # Digital Video Broadcasting Devices |
| @@ -899,6 +976,7 @@ CONFIG_VIDEO_V4L2=y | |||
| 899 | # | 976 | # |
| 900 | CONFIG_FIRMWARE_EDID=y | 977 | CONFIG_FIRMWARE_EDID=y |
| 901 | CONFIG_FB=y | 978 | CONFIG_FB=y |
| 979 | CONFIG_FB_DDC=y | ||
| 902 | CONFIG_FB_CFB_FILLRECT=y | 980 | CONFIG_FB_CFB_FILLRECT=y |
| 903 | CONFIG_FB_CFB_COPYAREA=y | 981 | CONFIG_FB_CFB_COPYAREA=y |
| 904 | CONFIG_FB_CFB_IMAGEBLIT=y | 982 | CONFIG_FB_CFB_IMAGEBLIT=y |
| @@ -930,6 +1008,7 @@ CONFIG_FB_RADEON_I2C=y | |||
| 930 | # CONFIG_FB_3DFX is not set | 1008 | # CONFIG_FB_3DFX is not set |
| 931 | # CONFIG_FB_VOODOO1 is not set | 1009 | # CONFIG_FB_VOODOO1 is not set |
| 932 | # CONFIG_FB_TRIDENT is not set | 1010 | # CONFIG_FB_TRIDENT is not set |
| 1011 | # CONFIG_FB_IBM_GXT4500 is not set | ||
| 933 | # CONFIG_FB_VIRTUAL is not set | 1012 | # CONFIG_FB_VIRTUAL is not set |
| 934 | 1013 | ||
| 935 | # | 1014 | # |
| @@ -1080,6 +1159,11 @@ CONFIG_SND_USB_AUDIO=m | |||
| 1080 | # CONFIG_SOUND_PRIME is not set | 1159 | # CONFIG_SOUND_PRIME is not set |
| 1081 | 1160 | ||
| 1082 | # | 1161 | # |
| 1162 | # HID Devices | ||
| 1163 | # | ||
| 1164 | CONFIG_HID=y | ||
| 1165 | |||
| 1166 | # | ||
| 1083 | # USB support | 1167 | # USB support |
| 1084 | # | 1168 | # |
| 1085 | CONFIG_USB_ARCH_HAS_HCD=y | 1169 | CONFIG_USB_ARCH_HAS_HCD=y |
| @@ -1094,6 +1178,7 @@ CONFIG_USB=y | |||
| 1094 | CONFIG_USB_DEVICEFS=y | 1178 | CONFIG_USB_DEVICEFS=y |
| 1095 | # CONFIG_USB_BANDWIDTH is not set | 1179 | # CONFIG_USB_BANDWIDTH is not set |
| 1096 | # CONFIG_USB_DYNAMIC_MINORS is not set | 1180 | # CONFIG_USB_DYNAMIC_MINORS is not set |
| 1181 | # CONFIG_USB_MULTITHREAD_PROBE is not set | ||
| 1097 | # CONFIG_USB_OTG is not set | 1182 | # CONFIG_USB_OTG is not set |
| 1098 | 1183 | ||
| 1099 | # | 1184 | # |
| @@ -1135,18 +1220,19 @@ CONFIG_USB_STORAGE_SDDR55=y | |||
| 1135 | CONFIG_USB_STORAGE_JUMPSHOT=y | 1220 | CONFIG_USB_STORAGE_JUMPSHOT=y |
| 1136 | # CONFIG_USB_STORAGE_ALAUDA is not set | 1221 | # CONFIG_USB_STORAGE_ALAUDA is not set |
| 1137 | # CONFIG_USB_STORAGE_ONETOUCH is not set | 1222 | # CONFIG_USB_STORAGE_ONETOUCH is not set |
| 1223 | # CONFIG_USB_STORAGE_KARMA is not set | ||
| 1138 | # CONFIG_USB_LIBUSUAL is not set | 1224 | # CONFIG_USB_LIBUSUAL is not set |
| 1139 | 1225 | ||
| 1140 | # | 1226 | # |
| 1141 | # USB Input Devices | 1227 | # USB Input Devices |
| 1142 | # | 1228 | # |
| 1143 | CONFIG_USB_HID=y | 1229 | CONFIG_USB_HID=y |
| 1144 | CONFIG_USB_HIDINPUT=y | ||
| 1145 | # CONFIG_USB_HIDINPUT_POWERBOOK is not set | 1230 | # CONFIG_USB_HIDINPUT_POWERBOOK is not set |
| 1146 | CONFIG_HID_FF=y | 1231 | CONFIG_HID_FF=y |
| 1147 | CONFIG_HID_PID=y | 1232 | CONFIG_HID_PID=y |
| 1148 | CONFIG_LOGITECH_FF=y | 1233 | CONFIG_LOGITECH_FF=y |
| 1149 | CONFIG_THRUSTMASTER_FF=y | 1234 | CONFIG_THRUSTMASTER_FF=y |
| 1235 | # CONFIG_ZEROPLUS_FF is not set | ||
| 1150 | CONFIG_USB_HIDDEV=y | 1236 | CONFIG_USB_HIDDEV=y |
| 1151 | # CONFIG_USB_AIPTEK is not set | 1237 | # CONFIG_USB_AIPTEK is not set |
| 1152 | # CONFIG_USB_WACOM is not set | 1238 | # CONFIG_USB_WACOM is not set |
| @@ -1174,12 +1260,14 @@ CONFIG_USB_CATC=m | |||
| 1174 | CONFIG_USB_KAWETH=m | 1260 | CONFIG_USB_KAWETH=m |
| 1175 | CONFIG_USB_PEGASUS=m | 1261 | CONFIG_USB_PEGASUS=m |
| 1176 | CONFIG_USB_RTL8150=m | 1262 | CONFIG_USB_RTL8150=m |
| 1263 | # CONFIG_USB_USBNET_MII is not set | ||
| 1177 | CONFIG_USB_USBNET=m | 1264 | CONFIG_USB_USBNET=m |
| 1178 | # CONFIG_USB_NET_AX8817X is not set | 1265 | # CONFIG_USB_NET_AX8817X is not set |
| 1179 | CONFIG_USB_NET_CDCETHER=m | 1266 | CONFIG_USB_NET_CDCETHER=m |
| 1180 | # CONFIG_USB_NET_GL620A is not set | 1267 | # CONFIG_USB_NET_GL620A is not set |
| 1181 | # CONFIG_USB_NET_NET1080 is not set | 1268 | # CONFIG_USB_NET_NET1080 is not set |
| 1182 | # CONFIG_USB_NET_PLUSB is not set | 1269 | # CONFIG_USB_NET_PLUSB is not set |
| 1270 | # CONFIG_USB_NET_MCS7830 is not set | ||
| 1183 | # CONFIG_USB_NET_RNDIS_HOST is not set | 1271 | # CONFIG_USB_NET_RNDIS_HOST is not set |
| 1184 | # CONFIG_USB_NET_CDC_SUBSET is not set | 1272 | # CONFIG_USB_NET_CDC_SUBSET is not set |
| 1185 | # CONFIG_USB_NET_ZAURUS is not set | 1273 | # CONFIG_USB_NET_ZAURUS is not set |
| @@ -1194,6 +1282,7 @@ CONFIG_USB_MON=y | |||
| 1194 | # | 1282 | # |
| 1195 | CONFIG_USB_SERIAL=m | 1283 | CONFIG_USB_SERIAL=m |
| 1196 | CONFIG_USB_SERIAL_GENERIC=y | 1284 | CONFIG_USB_SERIAL_GENERIC=y |
| 1285 | # CONFIG_USB_SERIAL_AIRCABLE is not set | ||
| 1197 | # CONFIG_USB_SERIAL_AIRPRIME is not set | 1286 | # CONFIG_USB_SERIAL_AIRPRIME is not set |
| 1198 | # CONFIG_USB_SERIAL_ARK3116 is not set | 1287 | # CONFIG_USB_SERIAL_ARK3116 is not set |
| 1199 | CONFIG_USB_SERIAL_BELKIN=m | 1288 | CONFIG_USB_SERIAL_BELKIN=m |
| @@ -1228,6 +1317,8 @@ CONFIG_USB_SERIAL_KEYSPAN_USA49WLC=y | |||
| 1228 | CONFIG_USB_SERIAL_KLSI=m | 1317 | CONFIG_USB_SERIAL_KLSI=m |
| 1229 | CONFIG_USB_SERIAL_KOBIL_SCT=m | 1318 | CONFIG_USB_SERIAL_KOBIL_SCT=m |
| 1230 | CONFIG_USB_SERIAL_MCT_U232=m | 1319 | CONFIG_USB_SERIAL_MCT_U232=m |
| 1320 | # CONFIG_USB_SERIAL_MOS7720 is not set | ||
| 1321 | # CONFIG_USB_SERIAL_MOS7840 is not set | ||
| 1231 | # CONFIG_USB_SERIAL_NAVMAN is not set | 1322 | # CONFIG_USB_SERIAL_NAVMAN is not set |
| 1232 | CONFIG_USB_SERIAL_PL2303=m | 1323 | CONFIG_USB_SERIAL_PL2303=m |
| 1233 | # CONFIG_USB_SERIAL_HP4X is not set | 1324 | # CONFIG_USB_SERIAL_HP4X is not set |
| @@ -1239,6 +1330,7 @@ CONFIG_USB_SERIAL_CYBERJACK=m | |||
| 1239 | CONFIG_USB_SERIAL_XIRCOM=m | 1330 | CONFIG_USB_SERIAL_XIRCOM=m |
| 1240 | # CONFIG_USB_SERIAL_OPTION is not set | 1331 | # CONFIG_USB_SERIAL_OPTION is not set |
| 1241 | CONFIG_USB_SERIAL_OMNINET=m | 1332 | CONFIG_USB_SERIAL_OMNINET=m |
| 1333 | # CONFIG_USB_SERIAL_DEBUG is not set | ||
| 1242 | CONFIG_USB_EZUSB=y | 1334 | CONFIG_USB_EZUSB=y |
| 1243 | 1335 | ||
| 1244 | # | 1336 | # |
| @@ -1246,6 +1338,7 @@ CONFIG_USB_EZUSB=y | |||
| 1246 | # | 1338 | # |
| 1247 | # CONFIG_USB_EMI62 is not set | 1339 | # CONFIG_USB_EMI62 is not set |
| 1248 | # CONFIG_USB_EMI26 is not set | 1340 | # CONFIG_USB_EMI26 is not set |
| 1341 | # CONFIG_USB_ADUTUX is not set | ||
| 1249 | # CONFIG_USB_AUERSWALD is not set | 1342 | # CONFIG_USB_AUERSWALD is not set |
| 1250 | # CONFIG_USB_RIO500 is not set | 1343 | # CONFIG_USB_RIO500 is not set |
| 1251 | # CONFIG_USB_LEGOTOWER is not set | 1344 | # CONFIG_USB_LEGOTOWER is not set |
| @@ -1253,12 +1346,13 @@ CONFIG_USB_EZUSB=y | |||
| 1253 | # CONFIG_USB_LED is not set | 1346 | # CONFIG_USB_LED is not set |
| 1254 | # CONFIG_USB_CYPRESS_CY7C63 is not set | 1347 | # CONFIG_USB_CYPRESS_CY7C63 is not set |
| 1255 | # CONFIG_USB_CYTHERM is not set | 1348 | # CONFIG_USB_CYTHERM is not set |
| 1256 | # CONFIG_USB_PHIDGETKIT is not set | 1349 | # CONFIG_USB_PHIDGET is not set |
| 1257 | # CONFIG_USB_PHIDGETSERVO is not set | ||
| 1258 | # CONFIG_USB_IDMOUSE is not set | 1350 | # CONFIG_USB_IDMOUSE is not set |
| 1351 | # CONFIG_USB_FTDI_ELAN is not set | ||
| 1259 | CONFIG_USB_APPLEDISPLAY=m | 1352 | CONFIG_USB_APPLEDISPLAY=m |
| 1260 | # CONFIG_USB_SISUSBVGA is not set | 1353 | # CONFIG_USB_SISUSBVGA is not set |
| 1261 | # CONFIG_USB_LD is not set | 1354 | # CONFIG_USB_LD is not set |
| 1355 | # CONFIG_USB_TRANCEVIBRATOR is not set | ||
| 1262 | # CONFIG_USB_TEST is not set | 1356 | # CONFIG_USB_TEST is not set |
| 1263 | 1357 | ||
| 1264 | # | 1358 | # |
| @@ -1316,6 +1410,10 @@ CONFIG_USB_APPLEDISPLAY=m | |||
| 1316 | # | 1410 | # |
| 1317 | 1411 | ||
| 1318 | # | 1412 | # |
| 1413 | # Virtualization | ||
| 1414 | # | ||
| 1415 | |||
| 1416 | # | ||
| 1319 | # File systems | 1417 | # File systems |
| 1320 | # | 1418 | # |
| 1321 | CONFIG_EXT2_FS=y | 1419 | CONFIG_EXT2_FS=y |
| @@ -1328,6 +1426,7 @@ CONFIG_EXT3_FS=y | |||
| 1328 | CONFIG_EXT3_FS_XATTR=y | 1426 | CONFIG_EXT3_FS_XATTR=y |
| 1329 | CONFIG_EXT3_FS_POSIX_ACL=y | 1427 | CONFIG_EXT3_FS_POSIX_ACL=y |
| 1330 | CONFIG_EXT3_FS_SECURITY=y | 1428 | CONFIG_EXT3_FS_SECURITY=y |
| 1429 | # CONFIG_EXT4DEV_FS is not set | ||
| 1331 | CONFIG_JBD=y | 1430 | CONFIG_JBD=y |
| 1332 | # CONFIG_JBD_DEBUG is not set | 1431 | # CONFIG_JBD_DEBUG is not set |
| 1333 | CONFIG_FS_MBCACHE=y | 1432 | CONFIG_FS_MBCACHE=y |
| @@ -1344,6 +1443,7 @@ CONFIG_XFS_FS=m | |||
| 1344 | CONFIG_XFS_SECURITY=y | 1443 | CONFIG_XFS_SECURITY=y |
| 1345 | CONFIG_XFS_POSIX_ACL=y | 1444 | CONFIG_XFS_POSIX_ACL=y |
| 1346 | # CONFIG_XFS_RT is not set | 1445 | # CONFIG_XFS_RT is not set |
| 1446 | # CONFIG_GFS2_FS is not set | ||
| 1347 | # CONFIG_OCFS2_FS is not set | 1447 | # CONFIG_OCFS2_FS is not set |
| 1348 | # CONFIG_MINIX_FS is not set | 1448 | # CONFIG_MINIX_FS is not set |
| 1349 | # CONFIG_ROMFS_FS is not set | 1449 | # CONFIG_ROMFS_FS is not set |
| @@ -1380,8 +1480,10 @@ CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" | |||
| 1380 | # | 1480 | # |
| 1381 | CONFIG_PROC_FS=y | 1481 | CONFIG_PROC_FS=y |
| 1382 | CONFIG_PROC_KCORE=y | 1482 | CONFIG_PROC_KCORE=y |
| 1483 | CONFIG_PROC_SYSCTL=y | ||
| 1383 | CONFIG_SYSFS=y | 1484 | CONFIG_SYSFS=y |
| 1384 | CONFIG_TMPFS=y | 1485 | CONFIG_TMPFS=y |
| 1486 | # CONFIG_TMPFS_POSIX_ACL is not set | ||
| 1385 | CONFIG_HUGETLBFS=y | 1487 | CONFIG_HUGETLBFS=y |
| 1386 | CONFIG_HUGETLB_PAGE=y | 1488 | CONFIG_HUGETLB_PAGE=y |
| 1387 | CONFIG_RAMFS=y | 1489 | CONFIG_RAMFS=y |
| @@ -1505,17 +1607,22 @@ CONFIG_NLS_ISO8859_15=y | |||
| 1505 | CONFIG_NLS_UTF8=y | 1607 | CONFIG_NLS_UTF8=y |
| 1506 | 1608 | ||
| 1507 | # | 1609 | # |
| 1610 | # Distributed Lock Manager | ||
| 1611 | # | ||
| 1612 | # CONFIG_DLM is not set | ||
| 1613 | |||
| 1614 | # | ||
| 1508 | # Library routines | 1615 | # Library routines |
| 1509 | # | 1616 | # |
| 1617 | CONFIG_BITREVERSE=y | ||
| 1510 | CONFIG_CRC_CCITT=m | 1618 | CONFIG_CRC_CCITT=m |
| 1511 | # CONFIG_CRC16 is not set | 1619 | # CONFIG_CRC16 is not set |
| 1512 | CONFIG_CRC32=y | 1620 | CONFIG_CRC32=y |
| 1513 | CONFIG_LIBCRC32C=m | 1621 | CONFIG_LIBCRC32C=m |
| 1514 | CONFIG_ZLIB_INFLATE=y | 1622 | CONFIG_ZLIB_INFLATE=y |
| 1515 | CONFIG_ZLIB_DEFLATE=m | 1623 | CONFIG_ZLIB_DEFLATE=m |
| 1516 | CONFIG_TEXTSEARCH=y | ||
| 1517 | CONFIG_TEXTSEARCH_KMP=m | ||
| 1518 | CONFIG_PLIST=y | 1624 | CONFIG_PLIST=y |
| 1625 | CONFIG_IOMAP_COPY=y | ||
| 1519 | 1626 | ||
| 1520 | # | 1627 | # |
| 1521 | # Instrumentation Support | 1628 | # Instrumentation Support |
| @@ -1528,8 +1635,11 @@ CONFIG_OPROFILE=y | |||
| 1528 | # Kernel hacking | 1635 | # Kernel hacking |
| 1529 | # | 1636 | # |
| 1530 | # CONFIG_PRINTK_TIME is not set | 1637 | # CONFIG_PRINTK_TIME is not set |
| 1638 | CONFIG_ENABLE_MUST_CHECK=y | ||
| 1531 | CONFIG_MAGIC_SYSRQ=y | 1639 | CONFIG_MAGIC_SYSRQ=y |
| 1532 | # CONFIG_UNUSED_SYMBOLS is not set | 1640 | # CONFIG_UNUSED_SYMBOLS is not set |
| 1641 | CONFIG_DEBUG_FS=y | ||
| 1642 | # CONFIG_HEADERS_CHECK is not set | ||
| 1533 | CONFIG_DEBUG_KERNEL=y | 1643 | CONFIG_DEBUG_KERNEL=y |
| 1534 | CONFIG_LOG_BUF_SHIFT=17 | 1644 | CONFIG_LOG_BUF_SHIFT=17 |
| 1535 | CONFIG_DETECT_SOFTLOCKUP=y | 1645 | CONFIG_DETECT_SOFTLOCKUP=y |
| @@ -1543,9 +1653,10 @@ CONFIG_DEBUG_MUTEXES=y | |||
| 1543 | # CONFIG_DEBUG_SPINLOCK_SLEEP is not set | 1653 | # CONFIG_DEBUG_SPINLOCK_SLEEP is not set |
| 1544 | # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set | 1654 | # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set |
| 1545 | # CONFIG_DEBUG_KOBJECT is not set | 1655 | # CONFIG_DEBUG_KOBJECT is not set |
| 1656 | CONFIG_DEBUG_BUGVERBOSE=y | ||
| 1546 | # CONFIG_DEBUG_INFO is not set | 1657 | # CONFIG_DEBUG_INFO is not set |
| 1547 | CONFIG_DEBUG_FS=y | ||
| 1548 | # CONFIG_DEBUG_VM is not set | 1658 | # CONFIG_DEBUG_VM is not set |
| 1659 | # CONFIG_DEBUG_LIST is not set | ||
| 1549 | CONFIG_FORCED_INLINING=y | 1660 | CONFIG_FORCED_INLINING=y |
| 1550 | # CONFIG_RCU_TORTURE_TEST is not set | 1661 | # CONFIG_RCU_TORTURE_TEST is not set |
| 1551 | # CONFIG_DEBUG_STACKOVERFLOW is not set | 1662 | # CONFIG_DEBUG_STACKOVERFLOW is not set |
| @@ -1565,7 +1676,12 @@ CONFIG_BOOTX_TEXT=y | |||
| 1565 | # Cryptographic options | 1676 | # Cryptographic options |
| 1566 | # | 1677 | # |
| 1567 | CONFIG_CRYPTO=y | 1678 | CONFIG_CRYPTO=y |
| 1679 | CONFIG_CRYPTO_ALGAPI=y | ||
| 1680 | CONFIG_CRYPTO_BLKCIPHER=y | ||
| 1681 | CONFIG_CRYPTO_HASH=y | ||
| 1682 | CONFIG_CRYPTO_MANAGER=y | ||
| 1568 | CONFIG_CRYPTO_HMAC=y | 1683 | CONFIG_CRYPTO_HMAC=y |
| 1684 | # CONFIG_CRYPTO_XCBC is not set | ||
| 1569 | CONFIG_CRYPTO_NULL=m | 1685 | CONFIG_CRYPTO_NULL=m |
| 1570 | CONFIG_CRYPTO_MD4=m | 1686 | CONFIG_CRYPTO_MD4=m |
| 1571 | CONFIG_CRYPTO_MD5=y | 1687 | CONFIG_CRYPTO_MD5=y |
| @@ -1574,9 +1690,14 @@ CONFIG_CRYPTO_SHA256=m | |||
| 1574 | CONFIG_CRYPTO_SHA512=m | 1690 | CONFIG_CRYPTO_SHA512=m |
| 1575 | CONFIG_CRYPTO_WP512=m | 1691 | CONFIG_CRYPTO_WP512=m |
| 1576 | # CONFIG_CRYPTO_TGR192 is not set | 1692 | # CONFIG_CRYPTO_TGR192 is not set |
| 1693 | # CONFIG_CRYPTO_GF128MUL is not set | ||
| 1694 | CONFIG_CRYPTO_ECB=m | ||
| 1695 | CONFIG_CRYPTO_CBC=y | ||
| 1696 | # CONFIG_CRYPTO_LRW is not set | ||
| 1577 | CONFIG_CRYPTO_DES=y | 1697 | CONFIG_CRYPTO_DES=y |
| 1578 | CONFIG_CRYPTO_BLOWFISH=m | 1698 | CONFIG_CRYPTO_BLOWFISH=m |
| 1579 | CONFIG_CRYPTO_TWOFISH=m | 1699 | CONFIG_CRYPTO_TWOFISH=m |
| 1700 | CONFIG_CRYPTO_TWOFISH_COMMON=m | ||
| 1580 | CONFIG_CRYPTO_SERPENT=m | 1701 | CONFIG_CRYPTO_SERPENT=m |
| 1581 | CONFIG_CRYPTO_AES=m | 1702 | CONFIG_CRYPTO_AES=m |
| 1582 | CONFIG_CRYPTO_CAST5=m | 1703 | CONFIG_CRYPTO_CAST5=m |
diff --git a/arch/powerpc/configs/iseries_defconfig b/arch/powerpc/configs/iseries_defconfig index b5005506c2f8..5fc87448704c 100644 --- a/arch/powerpc/configs/iseries_defconfig +++ b/arch/powerpc/configs/iseries_defconfig | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.19-rc1 | 3 | # Linux kernel version: 2.6.20-rc5 |
| 4 | # Fri Oct 6 13:25:04 2006 | 4 | # Mon Jan 22 22:16:44 2007 |
| 5 | # | 5 | # |
| 6 | CONFIG_PPC64=y | 6 | CONFIG_PPC64=y |
| 7 | CONFIG_64BIT=y | 7 | CONFIG_64BIT=y |
| @@ -10,6 +10,8 @@ CONFIG_MMU=y | |||
| 10 | CONFIG_GENERIC_HARDIRQS=y | 10 | CONFIG_GENERIC_HARDIRQS=y |
| 11 | CONFIG_IRQ_PER_CPU=y | 11 | CONFIG_IRQ_PER_CPU=y |
| 12 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 12 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
| 13 | CONFIG_ARCH_HAS_ILOG2_U32=y | ||
| 14 | CONFIG_ARCH_HAS_ILOG2_U64=y | ||
| 13 | CONFIG_GENERIC_HWEIGHT=y | 15 | CONFIG_GENERIC_HWEIGHT=y |
| 14 | CONFIG_GENERIC_CALIBRATE_DELAY=y | 16 | CONFIG_GENERIC_CALIBRATE_DELAY=y |
| 15 | CONFIG_GENERIC_FIND_NEXT_BIT=y | 17 | CONFIG_GENERIC_FIND_NEXT_BIT=y |
| @@ -23,6 +25,7 @@ CONFIG_PPC_OF=y | |||
| 23 | # CONFIG_PPC_UDBG_16550 is not set | 25 | # CONFIG_PPC_UDBG_16550 is not set |
| 24 | # CONFIG_GENERIC_TBSYNC is not set | 26 | # CONFIG_GENERIC_TBSYNC is not set |
| 25 | CONFIG_AUDIT_ARCH=y | 27 | CONFIG_AUDIT_ARCH=y |
| 28 | CONFIG_GENERIC_BUG=y | ||
| 26 | # CONFIG_DEFAULT_UIMAGE is not set | 29 | # CONFIG_DEFAULT_UIMAGE is not set |
| 27 | 30 | ||
| 28 | # | 31 | # |
| @@ -32,6 +35,9 @@ CONFIG_AUDIT_ARCH=y | |||
| 32 | CONFIG_POWER3=y | 35 | CONFIG_POWER3=y |
| 33 | CONFIG_POWER4=y | 36 | CONFIG_POWER4=y |
| 34 | CONFIG_PPC_FPU=y | 37 | CONFIG_PPC_FPU=y |
| 38 | # CONFIG_PPC_DCR_NATIVE is not set | ||
| 39 | # CONFIG_PPC_DCR_MMIO is not set | ||
| 40 | # CONFIG_PPC_OF_PLATFORM_PCI is not set | ||
| 35 | # CONFIG_ALTIVEC is not set | 41 | # CONFIG_ALTIVEC is not set |
| 36 | CONFIG_PPC_STD_MMU=y | 42 | CONFIG_PPC_STD_MMU=y |
| 37 | CONFIG_VIRT_CPU_ACCOUNTING=y | 43 | CONFIG_VIRT_CPU_ACCOUNTING=y |
| @@ -63,12 +69,13 @@ CONFIG_AUDITSYSCALL=y | |||
| 63 | CONFIG_IKCONFIG=y | 69 | CONFIG_IKCONFIG=y |
| 64 | CONFIG_IKCONFIG_PROC=y | 70 | CONFIG_IKCONFIG_PROC=y |
| 65 | # CONFIG_CPUSETS is not set | 71 | # CONFIG_CPUSETS is not set |
| 72 | CONFIG_SYSFS_DEPRECATED=y | ||
| 66 | # CONFIG_RELAY is not set | 73 | # CONFIG_RELAY is not set |
| 67 | CONFIG_INITRAMFS_SOURCE="" | 74 | CONFIG_INITRAMFS_SOURCE="" |
| 68 | CONFIG_CC_OPTIMIZE_FOR_SIZE=y | 75 | CONFIG_CC_OPTIMIZE_FOR_SIZE=y |
| 69 | CONFIG_SYSCTL=y | 76 | CONFIG_SYSCTL=y |
| 70 | # CONFIG_EMBEDDED is not set | 77 | # CONFIG_EMBEDDED is not set |
| 71 | # CONFIG_SYSCTL_SYSCALL is not set | 78 | CONFIG_SYSCTL_SYSCALL=y |
| 72 | CONFIG_KALLSYMS=y | 79 | CONFIG_KALLSYMS=y |
| 73 | # CONFIG_KALLSYMS_ALL is not set | 80 | # CONFIG_KALLSYMS_ALL is not set |
| 74 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | 81 | # CONFIG_KALLSYMS_EXTRA_PASS is not set |
| @@ -125,18 +132,22 @@ CONFIG_PPC_MULTIPLATFORM=y | |||
| 125 | # CONFIG_APUS is not set | 132 | # CONFIG_APUS is not set |
| 126 | # CONFIG_PPC_PSERIES is not set | 133 | # CONFIG_PPC_PSERIES is not set |
| 127 | CONFIG_PPC_ISERIES=y | 134 | CONFIG_PPC_ISERIES=y |
| 135 | # CONFIG_PPC_MPC52xx is not set | ||
| 128 | # CONFIG_PPC_PMAC is not set | 136 | # CONFIG_PPC_PMAC is not set |
| 129 | # CONFIG_PPC_MAPLE is not set | 137 | # CONFIG_PPC_MAPLE is not set |
| 130 | # CONFIG_PPC_PASEMI is not set | 138 | # CONFIG_PPC_PASEMI is not set |
| 131 | # CONFIG_PPC_CELL is not set | 139 | # CONFIG_PPC_CELL is not set |
| 132 | # CONFIG_PPC_CELL_NATIVE is not set | 140 | # CONFIG_PPC_CELL_NATIVE is not set |
| 133 | # CONFIG_PPC_IBM_CELL_BLADE is not set | 141 | # CONFIG_PPC_IBM_CELL_BLADE is not set |
| 142 | # CONFIG_PPC_PS3 is not set | ||
| 134 | # CONFIG_U3_DART is not set | 143 | # CONFIG_U3_DART is not set |
| 135 | # CONFIG_PPC_RTAS is not set | 144 | # CONFIG_PPC_RTAS is not set |
| 136 | # CONFIG_MMIO_NVRAM is not set | 145 | # CONFIG_MMIO_NVRAM is not set |
| 137 | CONFIG_IBMVIO=y | 146 | CONFIG_IBMVIO=y |
| 138 | # CONFIG_PPC_MPC106 is not set | 147 | # CONFIG_PPC_MPC106 is not set |
| 139 | # CONFIG_PPC_970_NAP is not set | 148 | # CONFIG_PPC_970_NAP is not set |
| 149 | CONFIG_PPC_INDIRECT_IO=y | ||
| 150 | CONFIG_GENERIC_IOMAP=y | ||
| 140 | # CONFIG_CPU_FREQ is not set | 151 | # CONFIG_CPU_FREQ is not set |
| 141 | # CONFIG_WANT_EARLY_SERIAL is not set | 152 | # CONFIG_WANT_EARLY_SERIAL is not set |
| 142 | # CONFIG_MPIC is not set | 153 | # CONFIG_MPIC is not set |
| @@ -146,6 +157,7 @@ CONFIG_IBMVIO=y | |||
| 146 | # | 157 | # |
| 147 | # CONFIG_HZ_100 is not set | 158 | # CONFIG_HZ_100 is not set |
| 148 | CONFIG_HZ_250=y | 159 | CONFIG_HZ_250=y |
| 160 | # CONFIG_HZ_300 is not set | ||
| 149 | # CONFIG_HZ_1000 is not set | 161 | # CONFIG_HZ_1000 is not set |
| 150 | CONFIG_HZ=250 | 162 | CONFIG_HZ=250 |
| 151 | CONFIG_PREEMPT_NONE=y | 163 | CONFIG_PREEMPT_NONE=y |
| @@ -178,6 +190,7 @@ CONFIG_RESOURCES_64BIT=y | |||
| 178 | # CONFIG_PPC_64K_PAGES is not set | 190 | # CONFIG_PPC_64K_PAGES is not set |
| 179 | # CONFIG_SCHED_SMT is not set | 191 | # CONFIG_SCHED_SMT is not set |
| 180 | CONFIG_PROC_DEVICETREE=y | 192 | CONFIG_PROC_DEVICETREE=y |
| 193 | # CONFIG_CMDLINE_BOOL is not set | ||
| 181 | # CONFIG_PM is not set | 194 | # CONFIG_PM is not set |
| 182 | CONFIG_SECCOMP=y | 195 | CONFIG_SECCOMP=y |
| 183 | CONFIG_ISA_DMA_API=y | 196 | CONFIG_ISA_DMA_API=y |
| @@ -192,7 +205,6 @@ CONFIG_GENERIC_ISA_DMA=y | |||
| 192 | CONFIG_PCI=y | 205 | CONFIG_PCI=y |
| 193 | CONFIG_PCI_DOMAINS=y | 206 | CONFIG_PCI_DOMAINS=y |
| 194 | # CONFIG_PCIEPORTBUS is not set | 207 | # CONFIG_PCIEPORTBUS is not set |
| 195 | # CONFIG_PCI_MULTITHREAD_PROBE is not set | ||
| 196 | # CONFIG_PCI_DEBUG is not set | 208 | # CONFIG_PCI_DEBUG is not set |
| 197 | 209 | ||
| 198 | # | 210 | # |
| @@ -245,6 +257,7 @@ CONFIG_INET_TCP_DIAG=y | |||
| 245 | # CONFIG_TCP_CONG_ADVANCED is not set | 257 | # CONFIG_TCP_CONG_ADVANCED is not set |
| 246 | CONFIG_TCP_CONG_CUBIC=y | 258 | CONFIG_TCP_CONG_CUBIC=y |
| 247 | CONFIG_DEFAULT_TCP_CONG="cubic" | 259 | CONFIG_DEFAULT_TCP_CONG="cubic" |
| 260 | # CONFIG_TCP_MD5SIG is not set | ||
| 248 | 261 | ||
| 249 | # | 262 | # |
| 250 | # IP: Virtual Server Configuration | 263 | # IP: Virtual Server Configuration |
| @@ -261,21 +274,37 @@ CONFIG_NETFILTER=y | |||
| 261 | # Core Netfilter Configuration | 274 | # Core Netfilter Configuration |
| 262 | # | 275 | # |
| 263 | # CONFIG_NETFILTER_NETLINK is not set | 276 | # CONFIG_NETFILTER_NETLINK is not set |
| 277 | CONFIG_NF_CONNTRACK_ENABLED=m | ||
| 278 | CONFIG_NF_CONNTRACK_SUPPORT=y | ||
| 279 | # CONFIG_IP_NF_CONNTRACK_SUPPORT is not set | ||
| 280 | CONFIG_NF_CONNTRACK=m | ||
| 281 | # CONFIG_NF_CT_ACCT is not set | ||
| 282 | CONFIG_NF_CONNTRACK_MARK=y | ||
| 283 | CONFIG_NF_CONNTRACK_EVENTS=y | ||
| 284 | # CONFIG_NF_CT_PROTO_SCTP is not set | ||
| 285 | # CONFIG_NF_CONNTRACK_AMANDA is not set | ||
| 286 | CONFIG_NF_CONNTRACK_FTP=m | ||
| 287 | # CONFIG_NF_CONNTRACK_H323 is not set | ||
| 288 | CONFIG_NF_CONNTRACK_IRC=m | ||
| 289 | # CONFIG_NF_CONNTRACK_NETBIOS_NS is not set | ||
| 290 | # CONFIG_NF_CONNTRACK_PPTP is not set | ||
| 291 | # CONFIG_NF_CONNTRACK_SIP is not set | ||
| 292 | CONFIG_NF_CONNTRACK_TFTP=m | ||
| 264 | CONFIG_NETFILTER_XTABLES=m | 293 | CONFIG_NETFILTER_XTABLES=m |
| 265 | CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m | 294 | CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m |
| 266 | CONFIG_NETFILTER_XT_TARGET_CONNMARK=m | 295 | CONFIG_NETFILTER_XT_TARGET_CONNMARK=m |
| 267 | CONFIG_NETFILTER_XT_TARGET_DSCP=m | 296 | CONFIG_NETFILTER_XT_TARGET_DSCP=m |
| 268 | CONFIG_NETFILTER_XT_TARGET_MARK=m | 297 | CONFIG_NETFILTER_XT_TARGET_MARK=m |
| 269 | CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m | 298 | CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m |
| 270 | CONFIG_NETFILTER_XT_TARGET_NOTRACK=m | 299 | # CONFIG_NETFILTER_XT_TARGET_NFLOG is not set |
| 300 | # CONFIG_NETFILTER_XT_TARGET_NOTRACK is not set | ||
| 271 | CONFIG_NETFILTER_XT_MATCH_COMMENT=m | 301 | CONFIG_NETFILTER_XT_MATCH_COMMENT=m |
| 272 | CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m | ||
| 273 | CONFIG_NETFILTER_XT_MATCH_CONNMARK=m | 302 | CONFIG_NETFILTER_XT_MATCH_CONNMARK=m |
| 274 | CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m | 303 | CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m |
| 275 | # CONFIG_NETFILTER_XT_MATCH_DCCP is not set | 304 | # CONFIG_NETFILTER_XT_MATCH_DCCP is not set |
| 276 | CONFIG_NETFILTER_XT_MATCH_DSCP=m | 305 | CONFIG_NETFILTER_XT_MATCH_DSCP=m |
| 277 | # CONFIG_NETFILTER_XT_MATCH_ESP is not set | 306 | # CONFIG_NETFILTER_XT_MATCH_ESP is not set |
| 278 | CONFIG_NETFILTER_XT_MATCH_HELPER=m | 307 | # CONFIG_NETFILTER_XT_MATCH_HELPER is not set |
| 279 | CONFIG_NETFILTER_XT_MATCH_LENGTH=m | 308 | CONFIG_NETFILTER_XT_MATCH_LENGTH=m |
| 280 | CONFIG_NETFILTER_XT_MATCH_LIMIT=m | 309 | CONFIG_NETFILTER_XT_MATCH_LIMIT=m |
| 281 | CONFIG_NETFILTER_XT_MATCH_MAC=m | 310 | CONFIG_NETFILTER_XT_MATCH_MAC=m |
| @@ -286,27 +315,17 @@ CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m | |||
| 286 | # CONFIG_NETFILTER_XT_MATCH_QUOTA is not set | 315 | # CONFIG_NETFILTER_XT_MATCH_QUOTA is not set |
| 287 | CONFIG_NETFILTER_XT_MATCH_REALM=m | 316 | CONFIG_NETFILTER_XT_MATCH_REALM=m |
| 288 | CONFIG_NETFILTER_XT_MATCH_SCTP=m | 317 | CONFIG_NETFILTER_XT_MATCH_SCTP=m |
| 289 | CONFIG_NETFILTER_XT_MATCH_STATE=m | 318 | # CONFIG_NETFILTER_XT_MATCH_STATE is not set |
| 290 | # CONFIG_NETFILTER_XT_MATCH_STATISTIC is not set | 319 | # CONFIG_NETFILTER_XT_MATCH_STATISTIC is not set |
| 291 | CONFIG_NETFILTER_XT_MATCH_STRING=m | 320 | CONFIG_NETFILTER_XT_MATCH_STRING=m |
| 292 | CONFIG_NETFILTER_XT_MATCH_TCPMSS=m | 321 | CONFIG_NETFILTER_XT_MATCH_TCPMSS=m |
| 322 | # CONFIG_NETFILTER_XT_MATCH_HASHLIMIT is not set | ||
| 293 | 323 | ||
| 294 | # | 324 | # |
| 295 | # IP: Netfilter Configuration | 325 | # IP: Netfilter Configuration |
| 296 | # | 326 | # |
| 297 | CONFIG_IP_NF_CONNTRACK=m | 327 | CONFIG_NF_CONNTRACK_IPV4=m |
| 298 | CONFIG_IP_NF_CT_ACCT=y | 328 | CONFIG_NF_CONNTRACK_PROC_COMPAT=y |
| 299 | CONFIG_IP_NF_CONNTRACK_MARK=y | ||
| 300 | CONFIG_IP_NF_CONNTRACK_EVENTS=y | ||
| 301 | CONFIG_IP_NF_CT_PROTO_SCTP=m | ||
| 302 | CONFIG_IP_NF_FTP=m | ||
| 303 | CONFIG_IP_NF_IRC=m | ||
| 304 | # CONFIG_IP_NF_NETBIOS_NS is not set | ||
| 305 | CONFIG_IP_NF_TFTP=m | ||
| 306 | CONFIG_IP_NF_AMANDA=m | ||
| 307 | # CONFIG_IP_NF_PPTP is not set | ||
| 308 | # CONFIG_IP_NF_H323 is not set | ||
| 309 | # CONFIG_IP_NF_SIP is not set | ||
| 310 | CONFIG_IP_NF_QUEUE=m | 329 | CONFIG_IP_NF_QUEUE=m |
| 311 | CONFIG_IP_NF_IPTABLES=m | 330 | CONFIG_IP_NF_IPTABLES=m |
| 312 | CONFIG_IP_NF_MATCH_IPRANGE=m | 331 | CONFIG_IP_NF_MATCH_IPRANGE=m |
| @@ -317,23 +336,25 @@ CONFIG_IP_NF_MATCH_ECN=m | |||
| 317 | CONFIG_IP_NF_MATCH_TTL=m | 336 | CONFIG_IP_NF_MATCH_TTL=m |
| 318 | CONFIG_IP_NF_MATCH_OWNER=m | 337 | CONFIG_IP_NF_MATCH_OWNER=m |
| 319 | CONFIG_IP_NF_MATCH_ADDRTYPE=m | 338 | CONFIG_IP_NF_MATCH_ADDRTYPE=m |
| 320 | CONFIG_IP_NF_MATCH_HASHLIMIT=m | ||
| 321 | CONFIG_IP_NF_FILTER=m | 339 | CONFIG_IP_NF_FILTER=m |
| 322 | CONFIG_IP_NF_TARGET_REJECT=m | 340 | CONFIG_IP_NF_TARGET_REJECT=m |
| 323 | CONFIG_IP_NF_TARGET_LOG=m | 341 | CONFIG_IP_NF_TARGET_LOG=m |
| 324 | CONFIG_IP_NF_TARGET_ULOG=m | 342 | CONFIG_IP_NF_TARGET_ULOG=m |
| 325 | CONFIG_IP_NF_TARGET_TCPMSS=m | 343 | CONFIG_IP_NF_TARGET_TCPMSS=m |
| 326 | CONFIG_IP_NF_NAT=m | 344 | CONFIG_NF_NAT=m |
| 327 | CONFIG_IP_NF_NAT_NEEDED=y | 345 | CONFIG_NF_NAT_NEEDED=y |
| 328 | CONFIG_IP_NF_TARGET_MASQUERADE=m | 346 | CONFIG_IP_NF_TARGET_MASQUERADE=m |
| 329 | CONFIG_IP_NF_TARGET_REDIRECT=m | 347 | CONFIG_IP_NF_TARGET_REDIRECT=m |
| 330 | CONFIG_IP_NF_TARGET_NETMAP=m | 348 | CONFIG_IP_NF_TARGET_NETMAP=m |
| 331 | CONFIG_IP_NF_TARGET_SAME=m | 349 | CONFIG_IP_NF_TARGET_SAME=m |
| 332 | CONFIG_IP_NF_NAT_SNMP_BASIC=m | 350 | # CONFIG_NF_NAT_SNMP_BASIC is not set |
| 333 | CONFIG_IP_NF_NAT_IRC=m | 351 | CONFIG_NF_NAT_FTP=m |
| 334 | CONFIG_IP_NF_NAT_FTP=m | 352 | CONFIG_NF_NAT_IRC=m |
| 335 | CONFIG_IP_NF_NAT_TFTP=m | 353 | CONFIG_NF_NAT_TFTP=m |
| 336 | CONFIG_IP_NF_NAT_AMANDA=m | 354 | # CONFIG_NF_NAT_AMANDA is not set |
| 355 | # CONFIG_NF_NAT_PPTP is not set | ||
| 356 | # CONFIG_NF_NAT_H323 is not set | ||
| 357 | # CONFIG_NF_NAT_SIP is not set | ||
| 337 | CONFIG_IP_NF_MANGLE=m | 358 | CONFIG_IP_NF_MANGLE=m |
| 338 | CONFIG_IP_NF_TARGET_TOS=m | 359 | CONFIG_IP_NF_TARGET_TOS=m |
| 339 | CONFIG_IP_NF_TARGET_ECN=m | 360 | CONFIG_IP_NF_TARGET_ECN=m |
| @@ -440,6 +461,12 @@ CONFIG_BLK_DEV_INITRD=y | |||
| 440 | # CONFIG_ATA_OVER_ETH is not set | 461 | # CONFIG_ATA_OVER_ETH is not set |
| 441 | 462 | ||
| 442 | # | 463 | # |
| 464 | # Misc devices | ||
| 465 | # | ||
| 466 | # CONFIG_SGI_IOC4 is not set | ||
| 467 | # CONFIG_TIFM_CORE is not set | ||
| 468 | |||
| 469 | # | ||
| 443 | # ATA/ATAPI/MFM/RLL support | 470 | # ATA/ATAPI/MFM/RLL support |
| 444 | # | 471 | # |
| 445 | # CONFIG_IDE is not set | 472 | # CONFIG_IDE is not set |
| @@ -449,6 +476,7 @@ CONFIG_BLK_DEV_INITRD=y | |||
| 449 | # | 476 | # |
| 450 | # CONFIG_RAID_ATTRS is not set | 477 | # CONFIG_RAID_ATTRS is not set |
| 451 | CONFIG_SCSI=y | 478 | CONFIG_SCSI=y |
| 479 | # CONFIG_SCSI_TGT is not set | ||
| 452 | CONFIG_SCSI_NETLINK=y | 480 | CONFIG_SCSI_NETLINK=y |
| 453 | CONFIG_SCSI_PROC_FS=y | 481 | CONFIG_SCSI_PROC_FS=y |
| 454 | 482 | ||
| @@ -469,6 +497,7 @@ CONFIG_CHR_DEV_SG=y | |||
| 469 | CONFIG_SCSI_MULTI_LUN=y | 497 | CONFIG_SCSI_MULTI_LUN=y |
| 470 | CONFIG_SCSI_CONSTANTS=y | 498 | CONFIG_SCSI_CONSTANTS=y |
| 471 | # CONFIG_SCSI_LOGGING is not set | 499 | # CONFIG_SCSI_LOGGING is not set |
| 500 | # CONFIG_SCSI_SCAN_ASYNC is not set | ||
| 472 | 501 | ||
| 473 | # | 502 | # |
| 474 | # SCSI Transports | 503 | # SCSI Transports |
| @@ -515,6 +544,7 @@ CONFIG_SCSI_IBMVSCSI=m | |||
| 515 | # CONFIG_SCSI_DC395x is not set | 544 | # CONFIG_SCSI_DC395x is not set |
| 516 | # CONFIG_SCSI_DC390T is not set | 545 | # CONFIG_SCSI_DC390T is not set |
| 517 | # CONFIG_SCSI_DEBUG is not set | 546 | # CONFIG_SCSI_DEBUG is not set |
| 547 | # CONFIG_SCSI_SRP is not set | ||
| 518 | 548 | ||
| 519 | # | 549 | # |
| 520 | # Serial ATA (prod) and Parallel ATA (experimental) drivers | 550 | # Serial ATA (prod) and Parallel ATA (experimental) drivers |
| @@ -562,6 +592,7 @@ CONFIG_DM_ZERO=m | |||
| 562 | # | 592 | # |
| 563 | # Macintosh device drivers | 593 | # Macintosh device drivers |
| 564 | # | 594 | # |
| 595 | # CONFIG_MAC_EMUMOUSEBTN is not set | ||
| 565 | # CONFIG_WINDFARM is not set | 596 | # CONFIG_WINDFARM is not set |
| 566 | 597 | ||
| 567 | # | 598 | # |
| @@ -647,6 +678,7 @@ CONFIG_E1000=m | |||
| 647 | # CONFIG_IXGB is not set | 678 | # CONFIG_IXGB is not set |
| 648 | # CONFIG_S2IO is not set | 679 | # CONFIG_S2IO is not set |
| 649 | # CONFIG_MYRI10GE is not set | 680 | # CONFIG_MYRI10GE is not set |
| 681 | # CONFIG_NETXEN_NIC is not set | ||
| 650 | 682 | ||
| 651 | # | 683 | # |
| 652 | # Token Ring devices | 684 | # Token Ring devices |
| @@ -765,10 +797,6 @@ CONFIG_GEN_RTC=y | |||
| 765 | # CONFIG_DTLK is not set | 797 | # CONFIG_DTLK is not set |
| 766 | # CONFIG_R3964 is not set | 798 | # CONFIG_R3964 is not set |
| 767 | # CONFIG_APPLICOM is not set | 799 | # CONFIG_APPLICOM is not set |
| 768 | |||
| 769 | # | ||
| 770 | # Ftape, the floppy tape device driver | ||
| 771 | # | ||
| 772 | # CONFIG_AGP is not set | 800 | # CONFIG_AGP is not set |
| 773 | # CONFIG_DRM is not set | 801 | # CONFIG_DRM is not set |
| 774 | CONFIG_RAW_DRIVER=y | 802 | CONFIG_RAW_DRIVER=y |
| @@ -779,7 +807,6 @@ CONFIG_MAX_RAW_DEVS=256 | |||
| 779 | # TPM devices | 807 | # TPM devices |
| 780 | # | 808 | # |
| 781 | # CONFIG_TCG_TPM is not set | 809 | # CONFIG_TCG_TPM is not set |
| 782 | # CONFIG_TELCLOCK is not set | ||
| 783 | 810 | ||
| 784 | # | 811 | # |
| 785 | # I2C support | 812 | # I2C support |
| @@ -795,6 +822,7 @@ CONFIG_MAX_RAW_DEVS=256 | |||
| 795 | # | 822 | # |
| 796 | # Dallas's 1-wire bus | 823 | # Dallas's 1-wire bus |
| 797 | # | 824 | # |
| 825 | # CONFIG_W1 is not set | ||
| 798 | 826 | ||
| 799 | # | 827 | # |
| 800 | # Hardware Monitoring support | 828 | # Hardware Monitoring support |
| @@ -803,11 +831,6 @@ CONFIG_MAX_RAW_DEVS=256 | |||
| 803 | # CONFIG_HWMON_VID is not set | 831 | # CONFIG_HWMON_VID is not set |
| 804 | 832 | ||
| 805 | # | 833 | # |
| 806 | # Misc devices | ||
| 807 | # | ||
| 808 | # CONFIG_TIFM_CORE is not set | ||
| 809 | |||
| 810 | # | ||
| 811 | # Multimedia devices | 834 | # Multimedia devices |
| 812 | # | 835 | # |
| 813 | # CONFIG_VIDEO_DEV is not set | 836 | # CONFIG_VIDEO_DEV is not set |
| @@ -822,6 +845,7 @@ CONFIG_MAX_RAW_DEVS=256 | |||
| 822 | # | 845 | # |
| 823 | CONFIG_FIRMWARE_EDID=y | 846 | CONFIG_FIRMWARE_EDID=y |
| 824 | # CONFIG_FB is not set | 847 | # CONFIG_FB is not set |
| 848 | # CONFIG_FB_IBM_GXT4500 is not set | ||
| 825 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set | 849 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set |
| 826 | 850 | ||
| 827 | # | 851 | # |
| @@ -830,6 +854,11 @@ CONFIG_FIRMWARE_EDID=y | |||
| 830 | # CONFIG_SOUND is not set | 854 | # CONFIG_SOUND is not set |
| 831 | 855 | ||
| 832 | # | 856 | # |
| 857 | # HID Devices | ||
| 858 | # | ||
| 859 | # CONFIG_HID is not set | ||
| 860 | |||
| 861 | # | ||
| 833 | # USB support | 862 | # USB support |
| 834 | # | 863 | # |
| 835 | CONFIG_USB_ARCH_HAS_HCD=y | 864 | CONFIG_USB_ARCH_HAS_HCD=y |
| @@ -892,6 +921,10 @@ CONFIG_USB_ARCH_HAS_EHCI=y | |||
| 892 | # | 921 | # |
| 893 | 922 | ||
| 894 | # | 923 | # |
| 924 | # Virtualization | ||
| 925 | # | ||
| 926 | |||
| 927 | # | ||
| 895 | # File systems | 928 | # File systems |
| 896 | # | 929 | # |
| 897 | CONFIG_EXT2_FS=y | 930 | CONFIG_EXT2_FS=y |
| @@ -904,6 +937,7 @@ CONFIG_EXT3_FS=y | |||
| 904 | CONFIG_EXT3_FS_XATTR=y | 937 | CONFIG_EXT3_FS_XATTR=y |
| 905 | CONFIG_EXT3_FS_POSIX_ACL=y | 938 | CONFIG_EXT3_FS_POSIX_ACL=y |
| 906 | CONFIG_EXT3_FS_SECURITY=y | 939 | CONFIG_EXT3_FS_SECURITY=y |
| 940 | # CONFIG_EXT4DEV_FS is not set | ||
| 907 | CONFIG_JBD=y | 941 | CONFIG_JBD=y |
| 908 | # CONFIG_JBD_DEBUG is not set | 942 | # CONFIG_JBD_DEBUG is not set |
| 909 | CONFIG_FS_MBCACHE=y | 943 | CONFIG_FS_MBCACHE=y |
| @@ -937,6 +971,7 @@ CONFIG_DNOTIFY=y | |||
| 937 | CONFIG_AUTOFS_FS=m | 971 | CONFIG_AUTOFS_FS=m |
| 938 | # CONFIG_AUTOFS4_FS is not set | 972 | # CONFIG_AUTOFS4_FS is not set |
| 939 | # CONFIG_FUSE_FS is not set | 973 | # CONFIG_FUSE_FS is not set |
| 974 | CONFIG_GENERIC_ACL=y | ||
| 940 | 975 | ||
| 941 | # | 976 | # |
| 942 | # CD-ROM/DVD Filesystems | 977 | # CD-ROM/DVD Filesystems |
| @@ -1024,7 +1059,6 @@ CONFIG_CIFS_POSIX=y | |||
| 1024 | # CONFIG_CODA_FS is not set | 1059 | # CONFIG_CODA_FS is not set |
| 1025 | # CONFIG_AFS_FS is not set | 1060 | # CONFIG_AFS_FS is not set |
| 1026 | # CONFIG_9P_FS is not set | 1061 | # CONFIG_9P_FS is not set |
| 1027 | CONFIG_GENERIC_ACL=y | ||
| 1028 | 1062 | ||
| 1029 | # | 1063 | # |
| 1030 | # Partition Types | 1064 | # Partition Types |
| @@ -1080,6 +1114,8 @@ CONFIG_NLS_ISO8859_1=y | |||
| 1080 | # Distributed Lock Manager | 1114 | # Distributed Lock Manager |
| 1081 | # | 1115 | # |
| 1082 | CONFIG_DLM=m | 1116 | CONFIG_DLM=m |
| 1117 | CONFIG_DLM_TCP=y | ||
| 1118 | # CONFIG_DLM_SCTP is not set | ||
| 1083 | # CONFIG_DLM_DEBUG is not set | 1119 | # CONFIG_DLM_DEBUG is not set |
| 1084 | 1120 | ||
| 1085 | # | 1121 | # |
| @@ -1094,6 +1130,7 @@ CONFIG_VIOPATH=y | |||
| 1094 | # | 1130 | # |
| 1095 | # Library routines | 1131 | # Library routines |
| 1096 | # | 1132 | # |
| 1133 | CONFIG_BITREVERSE=y | ||
| 1097 | CONFIG_CRC_CCITT=m | 1134 | CONFIG_CRC_CCITT=m |
| 1098 | # CONFIG_CRC16 is not set | 1135 | # CONFIG_CRC16 is not set |
| 1099 | CONFIG_CRC32=y | 1136 | CONFIG_CRC32=y |
| @@ -1105,6 +1142,7 @@ CONFIG_TEXTSEARCH_KMP=m | |||
| 1105 | CONFIG_TEXTSEARCH_BM=m | 1142 | CONFIG_TEXTSEARCH_BM=m |
| 1106 | CONFIG_TEXTSEARCH_FSM=m | 1143 | CONFIG_TEXTSEARCH_FSM=m |
| 1107 | CONFIG_PLIST=y | 1144 | CONFIG_PLIST=y |
| 1145 | CONFIG_IOMAP_COPY=y | ||
| 1108 | 1146 | ||
| 1109 | # | 1147 | # |
| 1110 | # Instrumentation Support | 1148 | # Instrumentation Support |
| @@ -1119,6 +1157,8 @@ CONFIG_PLIST=y | |||
| 1119 | CONFIG_ENABLE_MUST_CHECK=y | 1157 | CONFIG_ENABLE_MUST_CHECK=y |
| 1120 | CONFIG_MAGIC_SYSRQ=y | 1158 | CONFIG_MAGIC_SYSRQ=y |
| 1121 | # CONFIG_UNUSED_SYMBOLS is not set | 1159 | # CONFIG_UNUSED_SYMBOLS is not set |
| 1160 | CONFIG_DEBUG_FS=y | ||
| 1161 | # CONFIG_HEADERS_CHECK is not set | ||
| 1122 | CONFIG_DEBUG_KERNEL=y | 1162 | CONFIG_DEBUG_KERNEL=y |
| 1123 | CONFIG_LOG_BUF_SHIFT=17 | 1163 | CONFIG_LOG_BUF_SHIFT=17 |
| 1124 | CONFIG_DETECT_SOFTLOCKUP=y | 1164 | CONFIG_DETECT_SOFTLOCKUP=y |
| @@ -1132,8 +1172,8 @@ CONFIG_DETECT_SOFTLOCKUP=y | |||
| 1132 | # CONFIG_DEBUG_SPINLOCK_SLEEP is not set | 1172 | # CONFIG_DEBUG_SPINLOCK_SLEEP is not set |
| 1133 | # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set | 1173 | # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set |
| 1134 | # CONFIG_DEBUG_KOBJECT is not set | 1174 | # CONFIG_DEBUG_KOBJECT is not set |
| 1175 | CONFIG_DEBUG_BUGVERBOSE=y | ||
| 1135 | # CONFIG_DEBUG_INFO is not set | 1176 | # CONFIG_DEBUG_INFO is not set |
| 1136 | CONFIG_DEBUG_FS=y | ||
| 1137 | # CONFIG_DEBUG_VM is not set | 1177 | # CONFIG_DEBUG_VM is not set |
| 1138 | # CONFIG_DEBUG_LIST is not set | 1178 | # CONFIG_DEBUG_LIST is not set |
| 1139 | # CONFIG_FORCED_INLINING is not set | 1179 | # CONFIG_FORCED_INLINING is not set |
| @@ -1142,6 +1182,7 @@ CONFIG_DEBUG_STACKOVERFLOW=y | |||
| 1142 | CONFIG_DEBUG_STACK_USAGE=y | 1182 | CONFIG_DEBUG_STACK_USAGE=y |
| 1143 | # CONFIG_DEBUGGER is not set | 1183 | # CONFIG_DEBUGGER is not set |
| 1144 | CONFIG_IRQSTACKS=y | 1184 | CONFIG_IRQSTACKS=y |
| 1185 | # CONFIG_BOOTX_TEXT is not set | ||
| 1145 | # CONFIG_PPC_EARLY_DEBUG is not set | 1186 | # CONFIG_PPC_EARLY_DEBUG is not set |
| 1146 | 1187 | ||
| 1147 | # | 1188 | # |
| @@ -1155,10 +1196,11 @@ CONFIG_IRQSTACKS=y | |||
| 1155 | # | 1196 | # |
| 1156 | CONFIG_CRYPTO=y | 1197 | CONFIG_CRYPTO=y |
| 1157 | CONFIG_CRYPTO_ALGAPI=y | 1198 | CONFIG_CRYPTO_ALGAPI=y |
| 1158 | CONFIG_CRYPTO_BLKCIPHER=m | 1199 | CONFIG_CRYPTO_BLKCIPHER=y |
| 1159 | CONFIG_CRYPTO_HASH=y | 1200 | CONFIG_CRYPTO_HASH=y |
| 1160 | CONFIG_CRYPTO_MANAGER=m | 1201 | CONFIG_CRYPTO_MANAGER=y |
| 1161 | CONFIG_CRYPTO_HMAC=y | 1202 | CONFIG_CRYPTO_HMAC=y |
| 1203 | # CONFIG_CRYPTO_XCBC is not set | ||
| 1162 | CONFIG_CRYPTO_NULL=m | 1204 | CONFIG_CRYPTO_NULL=m |
| 1163 | CONFIG_CRYPTO_MD4=m | 1205 | CONFIG_CRYPTO_MD4=m |
| 1164 | CONFIG_CRYPTO_MD5=y | 1206 | CONFIG_CRYPTO_MD5=y |
| @@ -1167,8 +1209,10 @@ CONFIG_CRYPTO_SHA256=m | |||
| 1167 | CONFIG_CRYPTO_SHA512=m | 1209 | CONFIG_CRYPTO_SHA512=m |
| 1168 | CONFIG_CRYPTO_WP512=m | 1210 | CONFIG_CRYPTO_WP512=m |
| 1169 | CONFIG_CRYPTO_TGR192=m | 1211 | CONFIG_CRYPTO_TGR192=m |
| 1212 | # CONFIG_CRYPTO_GF128MUL is not set | ||
| 1170 | CONFIG_CRYPTO_ECB=m | 1213 | CONFIG_CRYPTO_ECB=m |
| 1171 | CONFIG_CRYPTO_CBC=m | 1214 | CONFIG_CRYPTO_CBC=y |
| 1215 | # CONFIG_CRYPTO_LRW is not set | ||
| 1172 | CONFIG_CRYPTO_DES=y | 1216 | CONFIG_CRYPTO_DES=y |
| 1173 | CONFIG_CRYPTO_BLOWFISH=m | 1217 | CONFIG_CRYPTO_BLOWFISH=m |
| 1174 | CONFIG_CRYPTO_TWOFISH=m | 1218 | CONFIG_CRYPTO_TWOFISH=m |
diff --git a/arch/powerpc/configs/linkstation_defconfig b/arch/powerpc/configs/linkstation_defconfig index 23fd210eb56a..405c1c908213 100644 --- a/arch/powerpc/configs/linkstation_defconfig +++ b/arch/powerpc/configs/linkstation_defconfig | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.19-rc4 | 3 | # Linux kernel version: 2.6.20-rc5 |
| 4 | # Wed Nov 15 20:36:30 2006 | 4 | # Mon Jan 22 22:17:58 2007 |
| 5 | # | 5 | # |
| 6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
| 7 | CONFIG_PPC32=y | 7 | CONFIG_PPC32=y |
| @@ -10,6 +10,7 @@ CONFIG_MMU=y | |||
| 10 | CONFIG_GENERIC_HARDIRQS=y | 10 | CONFIG_GENERIC_HARDIRQS=y |
| 11 | CONFIG_IRQ_PER_CPU=y | 11 | CONFIG_IRQ_PER_CPU=y |
| 12 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 12 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
| 13 | CONFIG_ARCH_HAS_ILOG2_U32=y | ||
| 13 | CONFIG_GENERIC_HWEIGHT=y | 14 | CONFIG_GENERIC_HWEIGHT=y |
| 14 | CONFIG_GENERIC_CALIBRATE_DELAY=y | 15 | CONFIG_GENERIC_CALIBRATE_DELAY=y |
| 15 | CONFIG_GENERIC_FIND_NEXT_BIT=y | 16 | CONFIG_GENERIC_FIND_NEXT_BIT=y |
| @@ -22,13 +23,13 @@ CONFIG_PPC_OF=y | |||
| 22 | CONFIG_PPC_UDBG_16550=y | 23 | CONFIG_PPC_UDBG_16550=y |
| 23 | # CONFIG_GENERIC_TBSYNC is not set | 24 | # CONFIG_GENERIC_TBSYNC is not set |
| 24 | CONFIG_AUDIT_ARCH=y | 25 | CONFIG_AUDIT_ARCH=y |
| 26 | CONFIG_GENERIC_BUG=y | ||
| 25 | # CONFIG_DEFAULT_UIMAGE is not set | 27 | # CONFIG_DEFAULT_UIMAGE is not set |
| 26 | 28 | ||
| 27 | # | 29 | # |
| 28 | # Processor support | 30 | # Processor support |
| 29 | # | 31 | # |
| 30 | CONFIG_CLASSIC32=y | 32 | CONFIG_CLASSIC32=y |
| 31 | # CONFIG_PPC_52xx is not set | ||
| 32 | # CONFIG_PPC_82xx is not set | 33 | # CONFIG_PPC_82xx is not set |
| 33 | # CONFIG_PPC_83xx is not set | 34 | # CONFIG_PPC_83xx is not set |
| 34 | # CONFIG_PPC_85xx is not set | 35 | # CONFIG_PPC_85xx is not set |
| @@ -69,12 +70,13 @@ CONFIG_POSIX_MQUEUE=y | |||
| 69 | # CONFIG_AUDIT is not set | 70 | # CONFIG_AUDIT is not set |
| 70 | CONFIG_IKCONFIG=y | 71 | CONFIG_IKCONFIG=y |
| 71 | CONFIG_IKCONFIG_PROC=y | 72 | CONFIG_IKCONFIG_PROC=y |
| 73 | CONFIG_SYSFS_DEPRECATED=y | ||
| 72 | # CONFIG_RELAY is not set | 74 | # CONFIG_RELAY is not set |
| 73 | CONFIG_INITRAMFS_SOURCE="" | 75 | CONFIG_INITRAMFS_SOURCE="" |
| 74 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | 76 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set |
| 75 | CONFIG_SYSCTL=y | 77 | CONFIG_SYSCTL=y |
| 76 | # CONFIG_EMBEDDED is not set | 78 | # CONFIG_EMBEDDED is not set |
| 77 | # CONFIG_SYSCTL_SYSCALL is not set | 79 | CONFIG_SYSCTL_SYSCALL=y |
| 78 | CONFIG_KALLSYMS=y | 80 | CONFIG_KALLSYMS=y |
| 79 | # CONFIG_KALLSYMS_ALL is not set | 81 | # CONFIG_KALLSYMS_ALL is not set |
| 80 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | 82 | # CONFIG_KALLSYMS_EXTRA_PASS is not set |
| @@ -130,6 +132,7 @@ CONFIG_DEFAULT_IOSCHED="anticipatory" | |||
| 130 | # CONFIG_PPC_MULTIPLATFORM is not set | 132 | # CONFIG_PPC_MULTIPLATFORM is not set |
| 131 | CONFIG_EMBEDDED6xx=y | 133 | CONFIG_EMBEDDED6xx=y |
| 132 | # CONFIG_APUS is not set | 134 | # CONFIG_APUS is not set |
| 135 | # CONFIG_PPC_MPC52xx is not set | ||
| 133 | # CONFIG_PPC_CELL is not set | 136 | # CONFIG_PPC_CELL is not set |
| 134 | # CONFIG_PPC_CELL_NATIVE is not set | 137 | # CONFIG_PPC_CELL_NATIVE is not set |
| 135 | # CONFIG_PPC_RTAS is not set | 138 | # CONFIG_PPC_RTAS is not set |
| @@ -166,7 +169,6 @@ CONFIG_LINKSTATION=y | |||
| 166 | # CONFIG_TQM8260 is not set | 169 | # CONFIG_TQM8260 is not set |
| 167 | # CONFIG_ADS8272 is not set | 170 | # CONFIG_ADS8272 is not set |
| 168 | # CONFIG_PQ2FADS is not set | 171 | # CONFIG_PQ2FADS is not set |
| 169 | # CONFIG_LITE5200 is not set | ||
| 170 | # CONFIG_EV64360 is not set | 172 | # CONFIG_EV64360 is not set |
| 171 | CONFIG_PPC_GEN550=y | 173 | CONFIG_PPC_GEN550=y |
| 172 | CONFIG_MPC10X_BRIDGE=y | 174 | CONFIG_MPC10X_BRIDGE=y |
| @@ -181,6 +183,7 @@ CONFIG_MPIC=y | |||
| 181 | # CONFIG_HIGHMEM is not set | 183 | # CONFIG_HIGHMEM is not set |
| 182 | CONFIG_HZ_100=y | 184 | CONFIG_HZ_100=y |
| 183 | # CONFIG_HZ_250 is not set | 185 | # CONFIG_HZ_250 is not set |
| 186 | # CONFIG_HZ_300 is not set | ||
| 184 | # CONFIG_HZ_1000 is not set | 187 | # CONFIG_HZ_1000 is not set |
| 185 | CONFIG_HZ=100 | 188 | CONFIG_HZ=100 |
| 186 | CONFIG_PREEMPT_NONE=y | 189 | CONFIG_PREEMPT_NONE=y |
| @@ -217,7 +220,6 @@ CONFIG_FSL_SOC=y | |||
| 217 | CONFIG_PCI=y | 220 | CONFIG_PCI=y |
| 218 | CONFIG_PCI_DOMAINS=y | 221 | CONFIG_PCI_DOMAINS=y |
| 219 | # CONFIG_PCIEPORTBUS is not set | 222 | # CONFIG_PCIEPORTBUS is not set |
| 220 | # CONFIG_PCI_MULTITHREAD_PROBE is not set | ||
| 221 | # CONFIG_PCI_DEBUG is not set | 223 | # CONFIG_PCI_DEBUG is not set |
| 222 | 224 | ||
| 223 | # | 225 | # |
| @@ -286,6 +288,7 @@ CONFIG_INET_TCP_DIAG=y | |||
| 286 | # CONFIG_TCP_CONG_ADVANCED is not set | 288 | # CONFIG_TCP_CONG_ADVANCED is not set |
| 287 | CONFIG_TCP_CONG_CUBIC=y | 289 | CONFIG_TCP_CONG_CUBIC=y |
| 288 | CONFIG_DEFAULT_TCP_CONG="cubic" | 290 | CONFIG_DEFAULT_TCP_CONG="cubic" |
| 291 | # CONFIG_TCP_MD5SIG is not set | ||
| 289 | 292 | ||
| 290 | # | 293 | # |
| 291 | # IP: Virtual Server Configuration | 294 | # IP: Virtual Server Configuration |
| @@ -302,18 +305,35 @@ CONFIG_NETFILTER=y | |||
| 302 | # Core Netfilter Configuration | 305 | # Core Netfilter Configuration |
| 303 | # | 306 | # |
| 304 | # CONFIG_NETFILTER_NETLINK is not set | 307 | # CONFIG_NETFILTER_NETLINK is not set |
| 308 | CONFIG_NF_CONNTRACK_ENABLED=m | ||
| 309 | CONFIG_NF_CONNTRACK_SUPPORT=y | ||
| 310 | # CONFIG_IP_NF_CONNTRACK_SUPPORT is not set | ||
| 311 | CONFIG_NF_CONNTRACK=m | ||
| 312 | # CONFIG_NF_CT_ACCT is not set | ||
| 313 | # CONFIG_NF_CONNTRACK_MARK is not set | ||
| 314 | # CONFIG_NF_CONNTRACK_EVENTS is not set | ||
| 315 | # CONFIG_NF_CT_PROTO_SCTP is not set | ||
| 316 | # CONFIG_NF_CONNTRACK_AMANDA is not set | ||
| 317 | CONFIG_NF_CONNTRACK_FTP=m | ||
| 318 | # CONFIG_NF_CONNTRACK_H323 is not set | ||
| 319 | CONFIG_NF_CONNTRACK_IRC=m | ||
| 320 | # CONFIG_NF_CONNTRACK_NETBIOS_NS is not set | ||
| 321 | # CONFIG_NF_CONNTRACK_PPTP is not set | ||
| 322 | # CONFIG_NF_CONNTRACK_SIP is not set | ||
| 323 | CONFIG_NF_CONNTRACK_TFTP=m | ||
| 305 | CONFIG_NETFILTER_XTABLES=m | 324 | CONFIG_NETFILTER_XTABLES=m |
| 306 | CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m | 325 | CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m |
| 307 | # CONFIG_NETFILTER_XT_TARGET_DSCP is not set | 326 | # CONFIG_NETFILTER_XT_TARGET_DSCP is not set |
| 308 | CONFIG_NETFILTER_XT_TARGET_MARK=m | 327 | CONFIG_NETFILTER_XT_TARGET_MARK=m |
| 309 | # CONFIG_NETFILTER_XT_TARGET_NFQUEUE is not set | 328 | # CONFIG_NETFILTER_XT_TARGET_NFQUEUE is not set |
| 329 | CONFIG_NETFILTER_XT_TARGET_NFLOG=m | ||
| 310 | # CONFIG_NETFILTER_XT_TARGET_NOTRACK is not set | 330 | # CONFIG_NETFILTER_XT_TARGET_NOTRACK is not set |
| 311 | # CONFIG_NETFILTER_XT_MATCH_COMMENT is not set | 331 | # CONFIG_NETFILTER_XT_MATCH_COMMENT is not set |
| 312 | CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m | 332 | CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m |
| 313 | # CONFIG_NETFILTER_XT_MATCH_DCCP is not set | 333 | # CONFIG_NETFILTER_XT_MATCH_DCCP is not set |
| 314 | # CONFIG_NETFILTER_XT_MATCH_DSCP is not set | 334 | # CONFIG_NETFILTER_XT_MATCH_DSCP is not set |
| 315 | CONFIG_NETFILTER_XT_MATCH_ESP=m | 335 | CONFIG_NETFILTER_XT_MATCH_ESP=m |
| 316 | # CONFIG_NETFILTER_XT_MATCH_HELPER is not set | 336 | CONFIG_NETFILTER_XT_MATCH_HELPER=m |
| 317 | CONFIG_NETFILTER_XT_MATCH_LENGTH=m | 337 | CONFIG_NETFILTER_XT_MATCH_LENGTH=m |
| 318 | CONFIG_NETFILTER_XT_MATCH_LIMIT=m | 338 | CONFIG_NETFILTER_XT_MATCH_LIMIT=m |
| 319 | CONFIG_NETFILTER_XT_MATCH_MAC=m | 339 | CONFIG_NETFILTER_XT_MATCH_MAC=m |
| @@ -324,27 +344,17 @@ CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m | |||
| 324 | # CONFIG_NETFILTER_XT_MATCH_QUOTA is not set | 344 | # CONFIG_NETFILTER_XT_MATCH_QUOTA is not set |
| 325 | # CONFIG_NETFILTER_XT_MATCH_REALM is not set | 345 | # CONFIG_NETFILTER_XT_MATCH_REALM is not set |
| 326 | # CONFIG_NETFILTER_XT_MATCH_SCTP is not set | 346 | # CONFIG_NETFILTER_XT_MATCH_SCTP is not set |
| 327 | CONFIG_NETFILTER_XT_MATCH_STATE=m | 347 | # CONFIG_NETFILTER_XT_MATCH_STATE is not set |
| 328 | # CONFIG_NETFILTER_XT_MATCH_STATISTIC is not set | 348 | # CONFIG_NETFILTER_XT_MATCH_STATISTIC is not set |
| 329 | # CONFIG_NETFILTER_XT_MATCH_STRING is not set | 349 | # CONFIG_NETFILTER_XT_MATCH_STRING is not set |
| 330 | # CONFIG_NETFILTER_XT_MATCH_TCPMSS is not set | 350 | # CONFIG_NETFILTER_XT_MATCH_TCPMSS is not set |
| 351 | # CONFIG_NETFILTER_XT_MATCH_HASHLIMIT is not set | ||
| 331 | 352 | ||
| 332 | # | 353 | # |
| 333 | # IP: Netfilter Configuration | 354 | # IP: Netfilter Configuration |
| 334 | # | 355 | # |
| 335 | CONFIG_IP_NF_CONNTRACK=m | 356 | CONFIG_NF_CONNTRACK_IPV4=m |
| 336 | # CONFIG_IP_NF_CT_ACCT is not set | 357 | CONFIG_NF_CONNTRACK_PROC_COMPAT=y |
| 337 | # CONFIG_IP_NF_CONNTRACK_MARK is not set | ||
| 338 | # CONFIG_IP_NF_CONNTRACK_EVENTS is not set | ||
| 339 | # CONFIG_IP_NF_CT_PROTO_SCTP is not set | ||
| 340 | CONFIG_IP_NF_FTP=m | ||
| 341 | CONFIG_IP_NF_IRC=m | ||
| 342 | # CONFIG_IP_NF_NETBIOS_NS is not set | ||
| 343 | CONFIG_IP_NF_TFTP=m | ||
| 344 | # CONFIG_IP_NF_AMANDA is not set | ||
| 345 | # CONFIG_IP_NF_PPTP is not set | ||
| 346 | # CONFIG_IP_NF_H323 is not set | ||
| 347 | # CONFIG_IP_NF_SIP is not set | ||
| 348 | # CONFIG_IP_NF_QUEUE is not set | 358 | # CONFIG_IP_NF_QUEUE is not set |
| 349 | CONFIG_IP_NF_IPTABLES=m | 359 | CONFIG_IP_NF_IPTABLES=m |
| 350 | CONFIG_IP_NF_MATCH_IPRANGE=m | 360 | CONFIG_IP_NF_MATCH_IPRANGE=m |
| @@ -355,22 +365,25 @@ CONFIG_IP_NF_MATCH_IPRANGE=m | |||
| 355 | # CONFIG_IP_NF_MATCH_TTL is not set | 365 | # CONFIG_IP_NF_MATCH_TTL is not set |
| 356 | # CONFIG_IP_NF_MATCH_OWNER is not set | 366 | # CONFIG_IP_NF_MATCH_OWNER is not set |
| 357 | # CONFIG_IP_NF_MATCH_ADDRTYPE is not set | 367 | # CONFIG_IP_NF_MATCH_ADDRTYPE is not set |
| 358 | # CONFIG_IP_NF_MATCH_HASHLIMIT is not set | ||
| 359 | CONFIG_IP_NF_FILTER=m | 368 | CONFIG_IP_NF_FILTER=m |
| 360 | CONFIG_IP_NF_TARGET_REJECT=m | 369 | CONFIG_IP_NF_TARGET_REJECT=m |
| 361 | # CONFIG_IP_NF_TARGET_LOG is not set | 370 | # CONFIG_IP_NF_TARGET_LOG is not set |
| 362 | # CONFIG_IP_NF_TARGET_ULOG is not set | 371 | # CONFIG_IP_NF_TARGET_ULOG is not set |
| 363 | # CONFIG_IP_NF_TARGET_TCPMSS is not set | 372 | # CONFIG_IP_NF_TARGET_TCPMSS is not set |
| 364 | CONFIG_IP_NF_NAT=m | 373 | CONFIG_NF_NAT=m |
| 365 | CONFIG_IP_NF_NAT_NEEDED=y | 374 | CONFIG_NF_NAT_NEEDED=y |
| 366 | CONFIG_IP_NF_TARGET_MASQUERADE=m | 375 | CONFIG_IP_NF_TARGET_MASQUERADE=m |
| 367 | CONFIG_IP_NF_TARGET_REDIRECT=m | 376 | CONFIG_IP_NF_TARGET_REDIRECT=m |
| 368 | CONFIG_IP_NF_TARGET_NETMAP=m | 377 | CONFIG_IP_NF_TARGET_NETMAP=m |
| 369 | CONFIG_IP_NF_TARGET_SAME=m | 378 | CONFIG_IP_NF_TARGET_SAME=m |
| 370 | # CONFIG_IP_NF_NAT_SNMP_BASIC is not set | 379 | # CONFIG_NF_NAT_SNMP_BASIC is not set |
| 371 | CONFIG_IP_NF_NAT_IRC=m | 380 | CONFIG_NF_NAT_FTP=m |
| 372 | CONFIG_IP_NF_NAT_FTP=m | 381 | CONFIG_NF_NAT_IRC=m |
| 373 | CONFIG_IP_NF_NAT_TFTP=m | 382 | CONFIG_NF_NAT_TFTP=m |
| 383 | # CONFIG_NF_NAT_AMANDA is not set | ||
| 384 | # CONFIG_NF_NAT_PPTP is not set | ||
| 385 | # CONFIG_NF_NAT_H323 is not set | ||
| 386 | # CONFIG_NF_NAT_SIP is not set | ||
| 374 | CONFIG_IP_NF_MANGLE=m | 387 | CONFIG_IP_NF_MANGLE=m |
| 375 | CONFIG_IP_NF_TARGET_TOS=m | 388 | CONFIG_IP_NF_TARGET_TOS=m |
| 376 | CONFIG_IP_NF_TARGET_ECN=m | 389 | CONFIG_IP_NF_TARGET_ECN=m |
| @@ -580,6 +593,7 @@ CONFIG_BLK_DEV_INITRD=y | |||
| 580 | # | 593 | # |
| 581 | # CONFIG_RAID_ATTRS is not set | 594 | # CONFIG_RAID_ATTRS is not set |
| 582 | CONFIG_SCSI=y | 595 | CONFIG_SCSI=y |
| 596 | # CONFIG_SCSI_TGT is not set | ||
| 583 | # CONFIG_SCSI_NETLINK is not set | 597 | # CONFIG_SCSI_NETLINK is not set |
| 584 | CONFIG_SCSI_PROC_FS=y | 598 | CONFIG_SCSI_PROC_FS=y |
| 585 | 599 | ||
| @@ -599,6 +613,7 @@ CONFIG_CHR_DEV_SG=y | |||
| 599 | CONFIG_SCSI_MULTI_LUN=y | 613 | CONFIG_SCSI_MULTI_LUN=y |
| 600 | # CONFIG_SCSI_CONSTANTS is not set | 614 | # CONFIG_SCSI_CONSTANTS is not set |
| 601 | # CONFIG_SCSI_LOGGING is not set | 615 | # CONFIG_SCSI_LOGGING is not set |
| 616 | # CONFIG_SCSI_SCAN_ASYNC is not set | ||
| 602 | 617 | ||
| 603 | # | 618 | # |
| 604 | # SCSI Transports | 619 | # SCSI Transports |
| @@ -646,6 +661,7 @@ CONFIG_SCSI_MULTI_LUN=y | |||
| 646 | # CONFIG_SCSI_DC390T is not set | 661 | # CONFIG_SCSI_DC390T is not set |
| 647 | # CONFIG_SCSI_NSP32 is not set | 662 | # CONFIG_SCSI_NSP32 is not set |
| 648 | # CONFIG_SCSI_DEBUG is not set | 663 | # CONFIG_SCSI_DEBUG is not set |
| 664 | # CONFIG_SCSI_SRP is not set | ||
| 649 | 665 | ||
| 650 | # | 666 | # |
| 651 | # Serial ATA (prod) and Parallel ATA (experimental) drivers | 667 | # Serial ATA (prod) and Parallel ATA (experimental) drivers |
| @@ -683,6 +699,7 @@ CONFIG_ATA=y | |||
| 683 | # CONFIG_PATA_IT821X is not set | 699 | # CONFIG_PATA_IT821X is not set |
| 684 | # CONFIG_PATA_JMICRON is not set | 700 | # CONFIG_PATA_JMICRON is not set |
| 685 | # CONFIG_PATA_TRIFLEX is not set | 701 | # CONFIG_PATA_TRIFLEX is not set |
| 702 | # CONFIG_PATA_MARVELL is not set | ||
| 686 | # CONFIG_PATA_MPIIX is not set | 703 | # CONFIG_PATA_MPIIX is not set |
| 687 | # CONFIG_PATA_OLDPIIX is not set | 704 | # CONFIG_PATA_OLDPIIX is not set |
| 688 | # CONFIG_PATA_NETCELL is not set | 705 | # CONFIG_PATA_NETCELL is not set |
| @@ -726,6 +743,7 @@ CONFIG_PATA_SIL680=y | |||
| 726 | # | 743 | # |
| 727 | # Macintosh device drivers | 744 | # Macintosh device drivers |
| 728 | # | 745 | # |
| 746 | # CONFIG_MAC_EMUMOUSEBTN is not set | ||
| 729 | # CONFIG_WINDFARM is not set | 747 | # CONFIG_WINDFARM is not set |
| 730 | 748 | ||
| 731 | # | 749 | # |
| @@ -777,6 +795,7 @@ CONFIG_R8169=y | |||
| 777 | # CONFIG_IXGB is not set | 795 | # CONFIG_IXGB is not set |
| 778 | # CONFIG_S2IO is not set | 796 | # CONFIG_S2IO is not set |
| 779 | # CONFIG_MYRI10GE is not set | 797 | # CONFIG_MYRI10GE is not set |
| 798 | # CONFIG_NETXEN_NIC is not set | ||
| 780 | 799 | ||
| 781 | # | 800 | # |
| 782 | # Token Ring devices | 801 | # Token Ring devices |
| @@ -899,6 +918,7 @@ CONFIG_SERIAL_8250_RUNTIME_UARTS=4 | |||
| 899 | # | 918 | # |
| 900 | # Non-8250 serial port support | 919 | # Non-8250 serial port support |
| 901 | # | 920 | # |
| 921 | # CONFIG_SERIAL_UARTLITE is not set | ||
| 902 | CONFIG_SERIAL_CORE=y | 922 | CONFIG_SERIAL_CORE=y |
| 903 | CONFIG_SERIAL_CORE_CONSOLE=y | 923 | CONFIG_SERIAL_CORE_CONSOLE=y |
| 904 | # CONFIG_SERIAL_JSM is not set | 924 | # CONFIG_SERIAL_JSM is not set |
| @@ -921,10 +941,6 @@ CONFIG_HW_RANDOM=y | |||
| 921 | # CONFIG_DTLK is not set | 941 | # CONFIG_DTLK is not set |
| 922 | # CONFIG_R3964 is not set | 942 | # CONFIG_R3964 is not set |
| 923 | # CONFIG_APPLICOM is not set | 943 | # CONFIG_APPLICOM is not set |
| 924 | |||
| 925 | # | ||
| 926 | # Ftape, the floppy tape device driver | ||
| 927 | # | ||
| 928 | # CONFIG_AGP is not set | 944 | # CONFIG_AGP is not set |
| 929 | # CONFIG_DRM is not set | 945 | # CONFIG_DRM is not set |
| 930 | # CONFIG_RAW_DRIVER is not set | 946 | # CONFIG_RAW_DRIVER is not set |
| @@ -1032,6 +1048,7 @@ CONFIG_HWMON=y | |||
| 1032 | # CONFIG_SENSORS_LM92 is not set | 1048 | # CONFIG_SENSORS_LM92 is not set |
| 1033 | # CONFIG_SENSORS_MAX1619 is not set | 1049 | # CONFIG_SENSORS_MAX1619 is not set |
| 1034 | # CONFIG_SENSORS_PC87360 is not set | 1050 | # CONFIG_SENSORS_PC87360 is not set |
| 1051 | # CONFIG_SENSORS_PC87427 is not set | ||
| 1035 | # CONFIG_SENSORS_SIS5595 is not set | 1052 | # CONFIG_SENSORS_SIS5595 is not set |
| 1036 | # CONFIG_SENSORS_SMSC47M1 is not set | 1053 | # CONFIG_SENSORS_SMSC47M1 is not set |
| 1037 | # CONFIG_SENSORS_SMSC47M192 is not set | 1054 | # CONFIG_SENSORS_SMSC47M192 is not set |
| @@ -1042,6 +1059,7 @@ CONFIG_HWMON=y | |||
| 1042 | # CONFIG_SENSORS_W83781D is not set | 1059 | # CONFIG_SENSORS_W83781D is not set |
| 1043 | # CONFIG_SENSORS_W83791D is not set | 1060 | # CONFIG_SENSORS_W83791D is not set |
| 1044 | # CONFIG_SENSORS_W83792D is not set | 1061 | # CONFIG_SENSORS_W83792D is not set |
| 1062 | # CONFIG_SENSORS_W83793 is not set | ||
| 1045 | # CONFIG_SENSORS_W83L785TS is not set | 1063 | # CONFIG_SENSORS_W83L785TS is not set |
| 1046 | # CONFIG_SENSORS_W83627HF is not set | 1064 | # CONFIG_SENSORS_W83627HF is not set |
| 1047 | # CONFIG_SENSORS_W83627EHF is not set | 1065 | # CONFIG_SENSORS_W83627EHF is not set |
| @@ -1063,6 +1081,7 @@ CONFIG_HWMON=y | |||
| 1063 | # | 1081 | # |
| 1064 | CONFIG_FIRMWARE_EDID=y | 1082 | CONFIG_FIRMWARE_EDID=y |
| 1065 | # CONFIG_FB is not set | 1083 | # CONFIG_FB is not set |
| 1084 | # CONFIG_FB_IBM_GXT4500 is not set | ||
| 1066 | 1085 | ||
| 1067 | # | 1086 | # |
| 1068 | # Console display driver support | 1087 | # Console display driver support |
| @@ -1077,6 +1096,11 @@ CONFIG_DUMMY_CONSOLE=y | |||
| 1077 | # CONFIG_SOUND is not set | 1096 | # CONFIG_SOUND is not set |
| 1078 | 1097 | ||
| 1079 | # | 1098 | # |
| 1099 | # HID Devices | ||
| 1100 | # | ||
| 1101 | CONFIG_HID=y | ||
| 1102 | |||
| 1103 | # | ||
| 1080 | # USB support | 1104 | # USB support |
| 1081 | # | 1105 | # |
| 1082 | CONFIG_USB_ARCH_HAS_HCD=y | 1106 | CONFIG_USB_ARCH_HAS_HCD=y |
| @@ -1091,6 +1115,7 @@ CONFIG_USB=y | |||
| 1091 | CONFIG_USB_DEVICEFS=y | 1115 | CONFIG_USB_DEVICEFS=y |
| 1092 | # CONFIG_USB_BANDWIDTH is not set | 1116 | # CONFIG_USB_BANDWIDTH is not set |
| 1093 | # CONFIG_USB_DYNAMIC_MINORS is not set | 1117 | # CONFIG_USB_DYNAMIC_MINORS is not set |
| 1118 | # CONFIG_USB_MULTITHREAD_PROBE is not set | ||
| 1094 | # CONFIG_USB_OTG is not set | 1119 | # CONFIG_USB_OTG is not set |
| 1095 | 1120 | ||
| 1096 | # | 1121 | # |
| @@ -1170,6 +1195,7 @@ CONFIG_USB_STORAGE=m | |||
| 1170 | # CONFIG_USB_KAWETH is not set | 1195 | # CONFIG_USB_KAWETH is not set |
| 1171 | # CONFIG_USB_PEGASUS is not set | 1196 | # CONFIG_USB_PEGASUS is not set |
| 1172 | # CONFIG_USB_RTL8150 is not set | 1197 | # CONFIG_USB_RTL8150 is not set |
| 1198 | # CONFIG_USB_USBNET_MII is not set | ||
| 1173 | # CONFIG_USB_USBNET is not set | 1199 | # CONFIG_USB_USBNET is not set |
| 1174 | CONFIG_USB_MON=y | 1200 | CONFIG_USB_MON=y |
| 1175 | 1201 | ||
| @@ -1218,6 +1244,7 @@ CONFIG_USB_SERIAL_FTDI_SIO=y | |||
| 1218 | # CONFIG_USB_SERIAL_XIRCOM is not set | 1244 | # CONFIG_USB_SERIAL_XIRCOM is not set |
| 1219 | # CONFIG_USB_SERIAL_OPTION is not set | 1245 | # CONFIG_USB_SERIAL_OPTION is not set |
| 1220 | # CONFIG_USB_SERIAL_OMNINET is not set | 1246 | # CONFIG_USB_SERIAL_OMNINET is not set |
| 1247 | # CONFIG_USB_SERIAL_DEBUG is not set | ||
| 1221 | 1248 | ||
| 1222 | # | 1249 | # |
| 1223 | # USB Miscellaneous drivers | 1250 | # USB Miscellaneous drivers |
| @@ -1324,6 +1351,10 @@ CONFIG_RTC_DRV_RS5C372=y | |||
| 1324 | # | 1351 | # |
| 1325 | 1352 | ||
| 1326 | # | 1353 | # |
| 1354 | # Virtualization | ||
| 1355 | # | ||
| 1356 | |||
| 1357 | # | ||
| 1327 | # File systems | 1358 | # File systems |
| 1328 | # | 1359 | # |
| 1329 | CONFIG_EXT2_FS=y | 1360 | CONFIG_EXT2_FS=y |
| @@ -1398,7 +1429,6 @@ CONFIG_RAMFS=y | |||
| 1398 | # CONFIG_BEFS_FS is not set | 1429 | # CONFIG_BEFS_FS is not set |
| 1399 | # CONFIG_BFS_FS is not set | 1430 | # CONFIG_BFS_FS is not set |
| 1400 | # CONFIG_EFS_FS is not set | 1431 | # CONFIG_EFS_FS is not set |
| 1401 | # CONFIG_JFFS_FS is not set | ||
| 1402 | # CONFIG_JFFS2_FS is not set | 1432 | # CONFIG_JFFS2_FS is not set |
| 1403 | # CONFIG_CRAMFS is not set | 1433 | # CONFIG_CRAMFS is not set |
| 1404 | # CONFIG_VXFS_FS is not set | 1434 | # CONFIG_VXFS_FS is not set |
| @@ -1488,8 +1518,14 @@ CONFIG_NLS_ISO8859_1=m | |||
| 1488 | CONFIG_NLS_UTF8=m | 1518 | CONFIG_NLS_UTF8=m |
| 1489 | 1519 | ||
| 1490 | # | 1520 | # |
| 1521 | # Distributed Lock Manager | ||
| 1522 | # | ||
| 1523 | # CONFIG_DLM is not set | ||
| 1524 | |||
| 1525 | # | ||
| 1491 | # Library routines | 1526 | # Library routines |
| 1492 | # | 1527 | # |
| 1528 | CONFIG_BITREVERSE=y | ||
| 1493 | # CONFIG_CRC_CCITT is not set | 1529 | # CONFIG_CRC_CCITT is not set |
| 1494 | # CONFIG_CRC16 is not set | 1530 | # CONFIG_CRC16 is not set |
| 1495 | CONFIG_CRC32=y | 1531 | CONFIG_CRC32=y |
| @@ -1497,6 +1533,7 @@ CONFIG_LIBCRC32C=m | |||
| 1497 | CONFIG_ZLIB_INFLATE=m | 1533 | CONFIG_ZLIB_INFLATE=m |
| 1498 | CONFIG_ZLIB_DEFLATE=m | 1534 | CONFIG_ZLIB_DEFLATE=m |
| 1499 | CONFIG_PLIST=y | 1535 | CONFIG_PLIST=y |
| 1536 | CONFIG_IOMAP_COPY=y | ||
| 1500 | 1537 | ||
| 1501 | # | 1538 | # |
| 1502 | # Instrumentation Support | 1539 | # Instrumentation Support |
| @@ -1511,6 +1548,8 @@ CONFIG_OPROFILE=m | |||
| 1511 | CONFIG_ENABLE_MUST_CHECK=y | 1548 | CONFIG_ENABLE_MUST_CHECK=y |
| 1512 | CONFIG_MAGIC_SYSRQ=y | 1549 | CONFIG_MAGIC_SYSRQ=y |
| 1513 | # CONFIG_UNUSED_SYMBOLS is not set | 1550 | # CONFIG_UNUSED_SYMBOLS is not set |
| 1551 | # CONFIG_DEBUG_FS is not set | ||
| 1552 | # CONFIG_HEADERS_CHECK is not set | ||
| 1514 | CONFIG_DEBUG_KERNEL=y | 1553 | CONFIG_DEBUG_KERNEL=y |
| 1515 | CONFIG_LOG_BUF_SHIFT=14 | 1554 | CONFIG_LOG_BUF_SHIFT=14 |
| 1516 | CONFIG_DETECT_SOFTLOCKUP=y | 1555 | CONFIG_DETECT_SOFTLOCKUP=y |
| @@ -1524,12 +1563,11 @@ CONFIG_DETECT_SOFTLOCKUP=y | |||
| 1524 | # CONFIG_DEBUG_SPINLOCK_SLEEP is not set | 1563 | # CONFIG_DEBUG_SPINLOCK_SLEEP is not set |
| 1525 | # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set | 1564 | # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set |
| 1526 | # CONFIG_DEBUG_KOBJECT is not set | 1565 | # CONFIG_DEBUG_KOBJECT is not set |
| 1566 | CONFIG_DEBUG_BUGVERBOSE=y | ||
| 1527 | # CONFIG_DEBUG_INFO is not set | 1567 | # CONFIG_DEBUG_INFO is not set |
| 1528 | # CONFIG_DEBUG_FS is not set | ||
| 1529 | # CONFIG_DEBUG_VM is not set | 1568 | # CONFIG_DEBUG_VM is not set |
| 1530 | # CONFIG_DEBUG_LIST is not set | 1569 | # CONFIG_DEBUG_LIST is not set |
| 1531 | CONFIG_FORCED_INLINING=y | 1570 | CONFIG_FORCED_INLINING=y |
| 1532 | # CONFIG_HEADERS_CHECK is not set | ||
| 1533 | # CONFIG_RCU_TORTURE_TEST is not set | 1571 | # CONFIG_RCU_TORTURE_TEST is not set |
| 1534 | # CONFIG_DEBUGGER is not set | 1572 | # CONFIG_DEBUGGER is not set |
| 1535 | # CONFIG_BDI_SWITCH is not set | 1573 | # CONFIG_BDI_SWITCH is not set |
| @@ -1551,6 +1589,7 @@ CONFIG_CRYPTO_ALGAPI=y | |||
| 1551 | CONFIG_CRYPTO_BLKCIPHER=y | 1589 | CONFIG_CRYPTO_BLKCIPHER=y |
| 1552 | CONFIG_CRYPTO_MANAGER=y | 1590 | CONFIG_CRYPTO_MANAGER=y |
| 1553 | # CONFIG_CRYPTO_HMAC is not set | 1591 | # CONFIG_CRYPTO_HMAC is not set |
| 1592 | # CONFIG_CRYPTO_XCBC is not set | ||
| 1554 | # CONFIG_CRYPTO_NULL is not set | 1593 | # CONFIG_CRYPTO_NULL is not set |
| 1555 | CONFIG_CRYPTO_MD4=m | 1594 | CONFIG_CRYPTO_MD4=m |
| 1556 | CONFIG_CRYPTO_MD5=y | 1595 | CONFIG_CRYPTO_MD5=y |
| @@ -1559,8 +1598,10 @@ CONFIG_CRYPTO_SHA1=m | |||
| 1559 | # CONFIG_CRYPTO_SHA512 is not set | 1598 | # CONFIG_CRYPTO_SHA512 is not set |
| 1560 | # CONFIG_CRYPTO_WP512 is not set | 1599 | # CONFIG_CRYPTO_WP512 is not set |
| 1561 | # CONFIG_CRYPTO_TGR192 is not set | 1600 | # CONFIG_CRYPTO_TGR192 is not set |
| 1601 | # CONFIG_CRYPTO_GF128MUL is not set | ||
| 1562 | CONFIG_CRYPTO_ECB=m | 1602 | CONFIG_CRYPTO_ECB=m |
| 1563 | CONFIG_CRYPTO_CBC=y | 1603 | CONFIG_CRYPTO_CBC=y |
| 1604 | # CONFIG_CRYPTO_LRW is not set | ||
| 1564 | CONFIG_CRYPTO_DES=y | 1605 | CONFIG_CRYPTO_DES=y |
| 1565 | CONFIG_CRYPTO_BLOWFISH=m | 1606 | CONFIG_CRYPTO_BLOWFISH=m |
| 1566 | CONFIG_CRYPTO_TWOFISH=m | 1607 | CONFIG_CRYPTO_TWOFISH=m |
diff --git a/arch/powerpc/configs/lite5200_defconfig b/arch/powerpc/configs/lite5200_defconfig index ee7655776d45..8cbd87ded6b4 100644 --- a/arch/powerpc/configs/lite5200_defconfig +++ b/arch/powerpc/configs/lite5200_defconfig | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.19-rc6 | 3 | # Linux kernel version: 2.6.20-rc5 |
| 4 | # Mon Nov 27 11:08:20 2006 | 4 | # Mon Jan 22 22:18:18 2007 |
| 5 | # | 5 | # |
| 6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
| 7 | CONFIG_PPC32=y | 7 | CONFIG_PPC32=y |
| @@ -10,6 +10,7 @@ CONFIG_MMU=y | |||
| 10 | CONFIG_GENERIC_HARDIRQS=y | 10 | CONFIG_GENERIC_HARDIRQS=y |
| 11 | CONFIG_IRQ_PER_CPU=y | 11 | CONFIG_IRQ_PER_CPU=y |
| 12 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 12 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
| 13 | CONFIG_ARCH_HAS_ILOG2_U32=y | ||
| 13 | CONFIG_GENERIC_HWEIGHT=y | 14 | CONFIG_GENERIC_HWEIGHT=y |
| 14 | CONFIG_GENERIC_CALIBRATE_DELAY=y | 15 | CONFIG_GENERIC_CALIBRATE_DELAY=y |
| 15 | CONFIG_GENERIC_FIND_NEXT_BIT=y | 16 | CONFIG_GENERIC_FIND_NEXT_BIT=y |
| @@ -22,13 +23,13 @@ CONFIG_PPC_OF=y | |||
| 22 | # CONFIG_PPC_UDBG_16550 is not set | 23 | # CONFIG_PPC_UDBG_16550 is not set |
| 23 | # CONFIG_GENERIC_TBSYNC is not set | 24 | # CONFIG_GENERIC_TBSYNC is not set |
| 24 | CONFIG_AUDIT_ARCH=y | 25 | CONFIG_AUDIT_ARCH=y |
| 26 | CONFIG_GENERIC_BUG=y | ||
| 25 | # CONFIG_DEFAULT_UIMAGE is not set | 27 | # CONFIG_DEFAULT_UIMAGE is not set |
| 26 | 28 | ||
| 27 | # | 29 | # |
| 28 | # Processor support | 30 | # Processor support |
| 29 | # | 31 | # |
| 30 | CONFIG_CLASSIC32=y | 32 | CONFIG_CLASSIC32=y |
| 31 | # CONFIG_PPC_52xx is not set | ||
| 32 | # CONFIG_PPC_82xx is not set | 33 | # CONFIG_PPC_82xx is not set |
| 33 | # CONFIG_PPC_83xx is not set | 34 | # CONFIG_PPC_83xx is not set |
| 34 | # CONFIG_PPC_85xx is not set | 35 | # CONFIG_PPC_85xx is not set |
| @@ -68,6 +69,7 @@ CONFIG_SYSVIPC=y | |||
| 68 | # CONFIG_UTS_NS is not set | 69 | # CONFIG_UTS_NS is not set |
| 69 | # CONFIG_AUDIT is not set | 70 | # CONFIG_AUDIT is not set |
| 70 | # CONFIG_IKCONFIG is not set | 71 | # CONFIG_IKCONFIG is not set |
| 72 | CONFIG_SYSFS_DEPRECATED=y | ||
| 71 | # CONFIG_RELAY is not set | 73 | # CONFIG_RELAY is not set |
| 72 | CONFIG_INITRAMFS_SOURCE="" | 74 | CONFIG_INITRAMFS_SOURCE="" |
| 73 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | 75 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set |
| @@ -151,6 +153,7 @@ CONFIG_PPC_LITE5200=y | |||
| 151 | # CONFIG_HIGHMEM is not set | 153 | # CONFIG_HIGHMEM is not set |
| 152 | # CONFIG_HZ_100 is not set | 154 | # CONFIG_HZ_100 is not set |
| 153 | CONFIG_HZ_250=y | 155 | CONFIG_HZ_250=y |
| 156 | # CONFIG_HZ_300 is not set | ||
| 154 | # CONFIG_HZ_1000 is not set | 157 | # CONFIG_HZ_1000 is not set |
| 155 | CONFIG_HZ=250 | 158 | CONFIG_HZ=250 |
| 156 | CONFIG_PREEMPT_NONE=y | 159 | CONFIG_PREEMPT_NONE=y |
| @@ -259,6 +262,7 @@ CONFIG_INET_TCP_DIAG=y | |||
| 259 | # CONFIG_TCP_CONG_ADVANCED is not set | 262 | # CONFIG_TCP_CONG_ADVANCED is not set |
| 260 | CONFIG_TCP_CONG_CUBIC=y | 263 | CONFIG_TCP_CONG_CUBIC=y |
| 261 | CONFIG_DEFAULT_TCP_CONG="cubic" | 264 | CONFIG_DEFAULT_TCP_CONG="cubic" |
| 265 | # CONFIG_TCP_MD5SIG is not set | ||
| 262 | # CONFIG_IPV6 is not set | 266 | # CONFIG_IPV6 is not set |
| 263 | # CONFIG_INET6_XFRM_TUNNEL is not set | 267 | # CONFIG_INET6_XFRM_TUNNEL is not set |
| 264 | # CONFIG_INET6_TUNNEL is not set | 268 | # CONFIG_INET6_TUNNEL is not set |
| @@ -374,6 +378,7 @@ CONFIG_BLK_DEV_INITRD=y | |||
| 374 | # | 378 | # |
| 375 | # CONFIG_RAID_ATTRS is not set | 379 | # CONFIG_RAID_ATTRS is not set |
| 376 | CONFIG_SCSI=y | 380 | CONFIG_SCSI=y |
| 381 | # CONFIG_SCSI_TGT is not set | ||
| 377 | # CONFIG_SCSI_NETLINK is not set | 382 | # CONFIG_SCSI_NETLINK is not set |
| 378 | # CONFIG_SCSI_PROC_FS is not set | 383 | # CONFIG_SCSI_PROC_FS is not set |
| 379 | 384 | ||
| @@ -393,6 +398,7 @@ CONFIG_SCSI=y | |||
| 393 | # CONFIG_SCSI_MULTI_LUN is not set | 398 | # CONFIG_SCSI_MULTI_LUN is not set |
| 394 | # CONFIG_SCSI_CONSTANTS is not set | 399 | # CONFIG_SCSI_CONSTANTS is not set |
| 395 | # CONFIG_SCSI_LOGGING is not set | 400 | # CONFIG_SCSI_LOGGING is not set |
| 401 | # CONFIG_SCSI_SCAN_ASYNC is not set | ||
| 396 | 402 | ||
| 397 | # | 403 | # |
| 398 | # SCSI Transports | 404 | # SCSI Transports |
| @@ -440,6 +446,7 @@ CONFIG_SCSI=y | |||
| 440 | # CONFIG_SCSI_DC390T is not set | 446 | # CONFIG_SCSI_DC390T is not set |
| 441 | # CONFIG_SCSI_NSP32 is not set | 447 | # CONFIG_SCSI_NSP32 is not set |
| 442 | # CONFIG_SCSI_DEBUG is not set | 448 | # CONFIG_SCSI_DEBUG is not set |
| 449 | # CONFIG_SCSI_SRP is not set | ||
| 443 | 450 | ||
| 444 | # | 451 | # |
| 445 | # Serial ATA (prod) and Parallel ATA (experimental) drivers | 452 | # Serial ATA (prod) and Parallel ATA (experimental) drivers |
| @@ -477,7 +484,7 @@ CONFIG_ATA=y | |||
| 477 | # CONFIG_PATA_IT821X is not set | 484 | # CONFIG_PATA_IT821X is not set |
| 478 | # CONFIG_PATA_JMICRON is not set | 485 | # CONFIG_PATA_JMICRON is not set |
| 479 | # CONFIG_PATA_TRIFLEX is not set | 486 | # CONFIG_PATA_TRIFLEX is not set |
| 480 | CONFIG_PATA_MPC52xx=y | 487 | # CONFIG_PATA_MARVELL is not set |
| 481 | # CONFIG_PATA_MPIIX is not set | 488 | # CONFIG_PATA_MPIIX is not set |
| 482 | # CONFIG_PATA_OLDPIIX is not set | 489 | # CONFIG_PATA_OLDPIIX is not set |
| 483 | # CONFIG_PATA_NETCELL is not set | 490 | # CONFIG_PATA_NETCELL is not set |
| @@ -494,6 +501,7 @@ CONFIG_PATA_MPC52xx=y | |||
| 494 | # CONFIG_PATA_SIS is not set | 501 | # CONFIG_PATA_SIS is not set |
| 495 | # CONFIG_PATA_VIA is not set | 502 | # CONFIG_PATA_VIA is not set |
| 496 | # CONFIG_PATA_WINBOND is not set | 503 | # CONFIG_PATA_WINBOND is not set |
| 504 | # CONFIG_PATA_PLATFORM is not set | ||
| 497 | 505 | ||
| 498 | # | 506 | # |
| 499 | # Multi-device support (RAID and LVM) | 507 | # Multi-device support (RAID and LVM) |
| @@ -521,6 +529,7 @@ CONFIG_PATA_MPC52xx=y | |||
| 521 | # | 529 | # |
| 522 | # Macintosh device drivers | 530 | # Macintosh device drivers |
| 523 | # | 531 | # |
| 532 | # CONFIG_MAC_EMUMOUSEBTN is not set | ||
| 524 | # CONFIG_WINDFARM is not set | 533 | # CONFIG_WINDFARM is not set |
| 525 | 534 | ||
| 526 | # | 535 | # |
| @@ -572,6 +581,7 @@ CONFIG_NETDEVICES=y | |||
| 572 | # CONFIG_IXGB is not set | 581 | # CONFIG_IXGB is not set |
| 573 | # CONFIG_S2IO is not set | 582 | # CONFIG_S2IO is not set |
| 574 | # CONFIG_MYRI10GE is not set | 583 | # CONFIG_MYRI10GE is not set |
| 584 | # CONFIG_NETXEN_NIC is not set | ||
| 575 | 585 | ||
| 576 | # | 586 | # |
| 577 | # Token Ring devices | 587 | # Token Ring devices |
| @@ -632,6 +642,7 @@ CONFIG_NETDEVICES=y | |||
| 632 | # | 642 | # |
| 633 | # Non-8250 serial port support | 643 | # Non-8250 serial port support |
| 634 | # | 644 | # |
| 645 | # CONFIG_SERIAL_UARTLITE is not set | ||
| 635 | CONFIG_SERIAL_CORE=y | 646 | CONFIG_SERIAL_CORE=y |
| 636 | CONFIG_SERIAL_CORE_CONSOLE=y | 647 | CONFIG_SERIAL_CORE_CONSOLE=y |
| 637 | CONFIG_SERIAL_MPC52xx=y | 648 | CONFIG_SERIAL_MPC52xx=y |
| @@ -657,10 +668,6 @@ CONFIG_LEGACY_PTY_COUNT=256 | |||
| 657 | # CONFIG_DTLK is not set | 668 | # CONFIG_DTLK is not set |
| 658 | # CONFIG_R3964 is not set | 669 | # CONFIG_R3964 is not set |
| 659 | # CONFIG_APPLICOM is not set | 670 | # CONFIG_APPLICOM is not set |
| 660 | |||
| 661 | # | ||
| 662 | # Ftape, the floppy tape device driver | ||
| 663 | # | ||
| 664 | # CONFIG_AGP is not set | 671 | # CONFIG_AGP is not set |
| 665 | # CONFIG_DRM is not set | 672 | # CONFIG_DRM is not set |
| 666 | # CONFIG_RAW_DRIVER is not set | 673 | # CONFIG_RAW_DRIVER is not set |
| @@ -707,6 +714,7 @@ CONFIG_LEGACY_PTY_COUNT=256 | |||
| 707 | # | 714 | # |
| 708 | # CONFIG_FIRMWARE_EDID is not set | 715 | # CONFIG_FIRMWARE_EDID is not set |
| 709 | # CONFIG_FB is not set | 716 | # CONFIG_FB is not set |
| 717 | # CONFIG_FB_IBM_GXT4500 is not set | ||
| 710 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set | 718 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set |
| 711 | 719 | ||
| 712 | # | 720 | # |
| @@ -777,6 +785,10 @@ CONFIG_USB_ARCH_HAS_EHCI=y | |||
| 777 | # | 785 | # |
| 778 | 786 | ||
| 779 | # | 787 | # |
| 788 | # Virtualization | ||
| 789 | # | ||
| 790 | |||
| 791 | # | ||
| 780 | # File systems | 792 | # File systems |
| 781 | # | 793 | # |
| 782 | CONFIG_EXT2_FS=y | 794 | CONFIG_EXT2_FS=y |
| @@ -873,6 +885,11 @@ CONFIG_MSDOS_PARTITION=y | |||
| 873 | # CONFIG_NLS is not set | 885 | # CONFIG_NLS is not set |
| 874 | 886 | ||
| 875 | # | 887 | # |
| 888 | # Distributed Lock Manager | ||
| 889 | # | ||
| 890 | # CONFIG_DLM is not set | ||
| 891 | |||
| 892 | # | ||
| 876 | # Library routines | 893 | # Library routines |
| 877 | # | 894 | # |
| 878 | # CONFIG_CRC_CCITT is not set | 895 | # CONFIG_CRC_CCITT is not set |
| @@ -880,6 +897,7 @@ CONFIG_MSDOS_PARTITION=y | |||
| 880 | # CONFIG_CRC32 is not set | 897 | # CONFIG_CRC32 is not set |
| 881 | # CONFIG_LIBCRC32C is not set | 898 | # CONFIG_LIBCRC32C is not set |
| 882 | CONFIG_PLIST=y | 899 | CONFIG_PLIST=y |
| 900 | CONFIG_IOMAP_COPY=y | ||
| 883 | 901 | ||
| 884 | # | 902 | # |
| 885 | # Instrumentation Support | 903 | # Instrumentation Support |
| @@ -893,6 +911,8 @@ CONFIG_PRINTK_TIME=y | |||
| 893 | CONFIG_ENABLE_MUST_CHECK=y | 911 | CONFIG_ENABLE_MUST_CHECK=y |
| 894 | # CONFIG_MAGIC_SYSRQ is not set | 912 | # CONFIG_MAGIC_SYSRQ is not set |
| 895 | # CONFIG_UNUSED_SYMBOLS is not set | 913 | # CONFIG_UNUSED_SYMBOLS is not set |
| 914 | # CONFIG_DEBUG_FS is not set | ||
| 915 | # CONFIG_HEADERS_CHECK is not set | ||
| 896 | CONFIG_DEBUG_KERNEL=y | 916 | CONFIG_DEBUG_KERNEL=y |
| 897 | CONFIG_LOG_BUF_SHIFT=14 | 917 | CONFIG_LOG_BUF_SHIFT=14 |
| 898 | CONFIG_DETECT_SOFTLOCKUP=y | 918 | CONFIG_DETECT_SOFTLOCKUP=y |
| @@ -906,12 +926,11 @@ CONFIG_DETECT_SOFTLOCKUP=y | |||
| 906 | # CONFIG_DEBUG_SPINLOCK_SLEEP is not set | 926 | # CONFIG_DEBUG_SPINLOCK_SLEEP is not set |
| 907 | # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set | 927 | # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set |
| 908 | # CONFIG_DEBUG_KOBJECT is not set | 928 | # CONFIG_DEBUG_KOBJECT is not set |
| 929 | # CONFIG_DEBUG_BUGVERBOSE is not set | ||
| 909 | CONFIG_DEBUG_INFO=y | 930 | CONFIG_DEBUG_INFO=y |
| 910 | # CONFIG_DEBUG_FS is not set | ||
| 911 | # CONFIG_DEBUG_VM is not set | 931 | # CONFIG_DEBUG_VM is not set |
| 912 | # CONFIG_DEBUG_LIST is not set | 932 | # CONFIG_DEBUG_LIST is not set |
| 913 | CONFIG_FORCED_INLINING=y | 933 | CONFIG_FORCED_INLINING=y |
| 914 | # CONFIG_HEADERS_CHECK is not set | ||
| 915 | # CONFIG_RCU_TORTURE_TEST is not set | 934 | # CONFIG_RCU_TORTURE_TEST is not set |
| 916 | # CONFIG_DEBUGGER is not set | 935 | # CONFIG_DEBUGGER is not set |
| 917 | # CONFIG_BDI_SWITCH is not set | 936 | # CONFIG_BDI_SWITCH is not set |
diff --git a/arch/powerpc/configs/maple_defconfig b/arch/powerpc/configs/maple_defconfig index ae96a5b2f00d..de97f2f0ae96 100644 --- a/arch/powerpc/configs/maple_defconfig +++ b/arch/powerpc/configs/maple_defconfig | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.18 | 3 | # Linux kernel version: 2.6.20-rc5 |
| 4 | # Mon Oct 9 11:59:34 2006 | 4 | # Mon Jan 22 22:19:02 2007 |
| 5 | # | 5 | # |
| 6 | CONFIG_PPC64=y | 6 | CONFIG_PPC64=y |
| 7 | CONFIG_64BIT=y | 7 | CONFIG_64BIT=y |
| @@ -10,6 +10,8 @@ CONFIG_MMU=y | |||
| 10 | CONFIG_GENERIC_HARDIRQS=y | 10 | CONFIG_GENERIC_HARDIRQS=y |
| 11 | CONFIG_IRQ_PER_CPU=y | 11 | CONFIG_IRQ_PER_CPU=y |
| 12 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 12 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
| 13 | CONFIG_ARCH_HAS_ILOG2_U32=y | ||
| 14 | CONFIG_ARCH_HAS_ILOG2_U64=y | ||
| 13 | CONFIG_GENERIC_HWEIGHT=y | 15 | CONFIG_GENERIC_HWEIGHT=y |
| 14 | CONFIG_GENERIC_CALIBRATE_DELAY=y | 16 | CONFIG_GENERIC_CALIBRATE_DELAY=y |
| 15 | CONFIG_GENERIC_FIND_NEXT_BIT=y | 17 | CONFIG_GENERIC_FIND_NEXT_BIT=y |
| @@ -23,6 +25,7 @@ CONFIG_PPC_OF=y | |||
| 23 | CONFIG_PPC_UDBG_16550=y | 25 | CONFIG_PPC_UDBG_16550=y |
| 24 | CONFIG_GENERIC_TBSYNC=y | 26 | CONFIG_GENERIC_TBSYNC=y |
| 25 | CONFIG_AUDIT_ARCH=y | 27 | CONFIG_AUDIT_ARCH=y |
| 28 | CONFIG_GENERIC_BUG=y | ||
| 26 | # CONFIG_DEFAULT_UIMAGE is not set | 29 | # CONFIG_DEFAULT_UIMAGE is not set |
| 27 | 30 | ||
| 28 | # | 31 | # |
| @@ -31,6 +34,9 @@ CONFIG_AUDIT_ARCH=y | |||
| 31 | CONFIG_POWER4_ONLY=y | 34 | CONFIG_POWER4_ONLY=y |
| 32 | CONFIG_POWER4=y | 35 | CONFIG_POWER4=y |
| 33 | CONFIG_PPC_FPU=y | 36 | CONFIG_PPC_FPU=y |
| 37 | # CONFIG_PPC_DCR_NATIVE is not set | ||
| 38 | # CONFIG_PPC_DCR_MMIO is not set | ||
| 39 | # CONFIG_PPC_OF_PLATFORM_PCI is not set | ||
| 34 | # CONFIG_ALTIVEC is not set | 40 | # CONFIG_ALTIVEC is not set |
| 35 | CONFIG_PPC_STD_MMU=y | 41 | CONFIG_PPC_STD_MMU=y |
| 36 | CONFIG_VIRT_CPU_ACCOUNTING=y | 42 | CONFIG_VIRT_CPU_ACCOUNTING=y |
| @@ -61,12 +67,13 @@ CONFIG_POSIX_MQUEUE=y | |||
| 61 | CONFIG_IKCONFIG=y | 67 | CONFIG_IKCONFIG=y |
| 62 | CONFIG_IKCONFIG_PROC=y | 68 | CONFIG_IKCONFIG_PROC=y |
| 63 | # CONFIG_CPUSETS is not set | 69 | # CONFIG_CPUSETS is not set |
| 70 | CONFIG_SYSFS_DEPRECATED=y | ||
| 64 | # CONFIG_RELAY is not set | 71 | # CONFIG_RELAY is not set |
| 65 | CONFIG_INITRAMFS_SOURCE="" | 72 | CONFIG_INITRAMFS_SOURCE="" |
| 66 | CONFIG_CC_OPTIMIZE_FOR_SIZE=y | 73 | CONFIG_CC_OPTIMIZE_FOR_SIZE=y |
| 67 | CONFIG_SYSCTL=y | 74 | CONFIG_SYSCTL=y |
| 68 | # CONFIG_EMBEDDED is not set | 75 | # CONFIG_EMBEDDED is not set |
| 69 | # CONFIG_SYSCTL_SYSCALL is not set | 76 | CONFIG_SYSCTL_SYSCALL=y |
| 70 | CONFIG_KALLSYMS=y | 77 | CONFIG_KALLSYMS=y |
| 71 | CONFIG_KALLSYMS_ALL=y | 78 | CONFIG_KALLSYMS_ALL=y |
| 72 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | 79 | # CONFIG_KALLSYMS_EXTRA_PASS is not set |
| @@ -123,18 +130,27 @@ CONFIG_PPC_MULTIPLATFORM=y | |||
| 123 | # CONFIG_APUS is not set | 130 | # CONFIG_APUS is not set |
| 124 | # CONFIG_PPC_PSERIES is not set | 131 | # CONFIG_PPC_PSERIES is not set |
| 125 | # CONFIG_PPC_ISERIES is not set | 132 | # CONFIG_PPC_ISERIES is not set |
| 133 | # CONFIG_PPC_MPC52xx is not set | ||
| 126 | # CONFIG_PPC_PMAC is not set | 134 | # CONFIG_PPC_PMAC is not set |
| 127 | CONFIG_PPC_MAPLE=y | 135 | CONFIG_PPC_MAPLE=y |
| 128 | # CONFIG_PPC_PASEMI is not set | 136 | # CONFIG_PPC_PASEMI is not set |
| 129 | # CONFIG_PPC_CELL is not set | 137 | # CONFIG_PPC_CELL is not set |
| 130 | # CONFIG_PPC_CELL_NATIVE is not set | 138 | # CONFIG_PPC_CELL_NATIVE is not set |
| 131 | # CONFIG_PPC_IBM_CELL_BLADE is not set | 139 | # CONFIG_PPC_IBM_CELL_BLADE is not set |
| 140 | # CONFIG_PPC_PS3 is not set | ||
| 141 | CONFIG_PPC_NATIVE=y | ||
| 142 | CONFIG_UDBG_RTAS_CONSOLE=y | ||
| 132 | CONFIG_U3_DART=y | 143 | CONFIG_U3_DART=y |
| 133 | # CONFIG_PPC_RTAS is not set | 144 | CONFIG_PPC_RTAS=y |
| 145 | # CONFIG_RTAS_ERROR_LOGGING is not set | ||
| 146 | CONFIG_RTAS_PROC=y | ||
| 147 | # CONFIG_RTAS_FLASH is not set | ||
| 134 | # CONFIG_MMIO_NVRAM is not set | 148 | # CONFIG_MMIO_NVRAM is not set |
| 135 | CONFIG_MPIC_BROKEN_U3=y | 149 | CONFIG_MPIC_BROKEN_U3=y |
| 136 | # CONFIG_PPC_MPC106 is not set | 150 | # CONFIG_PPC_MPC106 is not set |
| 137 | CONFIG_PPC_970_NAP=y | 151 | CONFIG_PPC_970_NAP=y |
| 152 | # CONFIG_PPC_INDIRECT_IO is not set | ||
| 153 | # CONFIG_GENERIC_IOMAP is not set | ||
| 138 | # CONFIG_CPU_FREQ is not set | 154 | # CONFIG_CPU_FREQ is not set |
| 139 | # CONFIG_WANT_EARLY_SERIAL is not set | 155 | # CONFIG_WANT_EARLY_SERIAL is not set |
| 140 | CONFIG_MPIC=y | 156 | CONFIG_MPIC=y |
| @@ -144,6 +160,7 @@ CONFIG_MPIC=y | |||
| 144 | # | 160 | # |
| 145 | # CONFIG_HZ_100 is not set | 161 | # CONFIG_HZ_100 is not set |
| 146 | CONFIG_HZ_250=y | 162 | CONFIG_HZ_250=y |
| 163 | # CONFIG_HZ_300 is not set | ||
| 147 | # CONFIG_HZ_1000 is not set | 164 | # CONFIG_HZ_1000 is not set |
| 148 | CONFIG_HZ=250 | 165 | CONFIG_HZ=250 |
| 149 | CONFIG_PREEMPT_NONE=y | 166 | CONFIG_PREEMPT_NONE=y |
| @@ -190,7 +207,6 @@ CONFIG_GENERIC_ISA_DMA=y | |||
| 190 | CONFIG_PCI=y | 207 | CONFIG_PCI=y |
| 191 | CONFIG_PCI_DOMAINS=y | 208 | CONFIG_PCI_DOMAINS=y |
| 192 | # CONFIG_PCIEPORTBUS is not set | 209 | # CONFIG_PCIEPORTBUS is not set |
| 193 | # CONFIG_PCI_MULTITHREAD_PROBE is not set | ||
| 194 | # CONFIG_PCI_DEBUG is not set | 210 | # CONFIG_PCI_DEBUG is not set |
| 195 | 211 | ||
| 196 | # | 212 | # |
| @@ -246,6 +262,7 @@ CONFIG_INET_TCP_DIAG=y | |||
| 246 | # CONFIG_TCP_CONG_ADVANCED is not set | 262 | # CONFIG_TCP_CONG_ADVANCED is not set |
| 247 | CONFIG_TCP_CONG_CUBIC=y | 263 | CONFIG_TCP_CONG_CUBIC=y |
| 248 | CONFIG_DEFAULT_TCP_CONG="cubic" | 264 | CONFIG_DEFAULT_TCP_CONG="cubic" |
| 265 | # CONFIG_TCP_MD5SIG is not set | ||
| 249 | # CONFIG_IPV6 is not set | 266 | # CONFIG_IPV6 is not set |
| 250 | # CONFIG_INET6_XFRM_TUNNEL is not set | 267 | # CONFIG_INET6_XFRM_TUNNEL is not set |
| 251 | # CONFIG_INET6_TUNNEL is not set | 268 | # CONFIG_INET6_TUNNEL is not set |
| @@ -346,6 +363,12 @@ CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 | |||
| 346 | # CONFIG_ATA_OVER_ETH is not set | 363 | # CONFIG_ATA_OVER_ETH is not set |
| 347 | 364 | ||
| 348 | # | 365 | # |
| 366 | # Misc devices | ||
| 367 | # | ||
| 368 | # CONFIG_SGI_IOC4 is not set | ||
| 369 | # CONFIG_TIFM_CORE is not set | ||
| 370 | |||
| 371 | # | ||
| 349 | # ATA/ATAPI/MFM/RLL support | 372 | # ATA/ATAPI/MFM/RLL support |
| 350 | # | 373 | # |
| 351 | CONFIG_IDE=y | 374 | CONFIG_IDE=y |
| @@ -371,7 +394,6 @@ CONFIG_IDEPCI_SHARE_IRQ=y | |||
| 371 | # CONFIG_BLK_DEV_OFFBOARD is not set | 394 | # CONFIG_BLK_DEV_OFFBOARD is not set |
| 372 | CONFIG_BLK_DEV_GENERIC=y | 395 | CONFIG_BLK_DEV_GENERIC=y |
| 373 | # CONFIG_BLK_DEV_OPTI621 is not set | 396 | # CONFIG_BLK_DEV_OPTI621 is not set |
| 374 | # CONFIG_BLK_DEV_SL82C105 is not set | ||
| 375 | CONFIG_BLK_DEV_IDEDMA_PCI=y | 397 | CONFIG_BLK_DEV_IDEDMA_PCI=y |
| 376 | # CONFIG_BLK_DEV_IDEDMA_FORCED is not set | 398 | # CONFIG_BLK_DEV_IDEDMA_FORCED is not set |
| 377 | CONFIG_IDEDMA_PCI_AUTO=y | 399 | CONFIG_IDEDMA_PCI_AUTO=y |
| @@ -395,6 +417,7 @@ CONFIG_BLK_DEV_AMD74XX=y | |||
| 395 | # CONFIG_BLK_DEV_PDC202XX_NEW is not set | 417 | # CONFIG_BLK_DEV_PDC202XX_NEW is not set |
| 396 | # CONFIG_BLK_DEV_SVWKS is not set | 418 | # CONFIG_BLK_DEV_SVWKS is not set |
| 397 | # CONFIG_BLK_DEV_SIIMAGE is not set | 419 | # CONFIG_BLK_DEV_SIIMAGE is not set |
| 420 | # CONFIG_BLK_DEV_SL82C105 is not set | ||
| 398 | # CONFIG_BLK_DEV_SLC90E66 is not set | 421 | # CONFIG_BLK_DEV_SLC90E66 is not set |
| 399 | # CONFIG_BLK_DEV_TRM290 is not set | 422 | # CONFIG_BLK_DEV_TRM290 is not set |
| 400 | # CONFIG_BLK_DEV_VIA82CXXX is not set | 423 | # CONFIG_BLK_DEV_VIA82CXXX is not set |
| @@ -439,6 +462,7 @@ CONFIG_IDEDMA_AUTO=y | |||
| 439 | # | 462 | # |
| 440 | # Macintosh device drivers | 463 | # Macintosh device drivers |
| 441 | # | 464 | # |
| 465 | # CONFIG_MAC_EMUMOUSEBTN is not set | ||
| 442 | # CONFIG_WINDFARM is not set | 466 | # CONFIG_WINDFARM is not set |
| 443 | 467 | ||
| 444 | # | 468 | # |
| @@ -523,6 +547,7 @@ CONFIG_TIGON3=y | |||
| 523 | # CONFIG_IXGB is not set | 547 | # CONFIG_IXGB is not set |
| 524 | # CONFIG_S2IO is not set | 548 | # CONFIG_S2IO is not set |
| 525 | # CONFIG_MYRI10GE is not set | 549 | # CONFIG_MYRI10GE is not set |
| 550 | # CONFIG_NETXEN_NIC is not set | ||
| 526 | 551 | ||
| 527 | # | 552 | # |
| 528 | # Token Ring devices | 553 | # Token Ring devices |
| @@ -618,6 +643,8 @@ CONFIG_SERIAL_CORE_CONSOLE=y | |||
| 618 | CONFIG_UNIX98_PTYS=y | 643 | CONFIG_UNIX98_PTYS=y |
| 619 | CONFIG_LEGACY_PTYS=y | 644 | CONFIG_LEGACY_PTYS=y |
| 620 | CONFIG_LEGACY_PTY_COUNT=256 | 645 | CONFIG_LEGACY_PTY_COUNT=256 |
| 646 | CONFIG_HVC_DRIVER=y | ||
| 647 | CONFIG_HVC_RTAS=y | ||
| 621 | 648 | ||
| 622 | # | 649 | # |
| 623 | # IPMI | 650 | # IPMI |
| @@ -634,10 +661,6 @@ CONFIG_GEN_RTC=y | |||
| 634 | # CONFIG_DTLK is not set | 661 | # CONFIG_DTLK is not set |
| 635 | # CONFIG_R3964 is not set | 662 | # CONFIG_R3964 is not set |
| 636 | # CONFIG_APPLICOM is not set | 663 | # CONFIG_APPLICOM is not set |
| 637 | |||
| 638 | # | ||
| 639 | # Ftape, the floppy tape device driver | ||
| 640 | # | ||
| 641 | # CONFIG_AGP is not set | 664 | # CONFIG_AGP is not set |
| 642 | # CONFIG_DRM is not set | 665 | # CONFIG_DRM is not set |
| 643 | # CONFIG_RAW_DRIVER is not set | 666 | # CONFIG_RAW_DRIVER is not set |
| @@ -647,7 +670,6 @@ CONFIG_GEN_RTC=y | |||
| 647 | # TPM devices | 670 | # TPM devices |
| 648 | # | 671 | # |
| 649 | # CONFIG_TCG_TPM is not set | 672 | # CONFIG_TCG_TPM is not set |
| 650 | # CONFIG_TELCLOCK is not set | ||
| 651 | 673 | ||
| 652 | # | 674 | # |
| 653 | # I2C support | 675 | # I2C support |
| @@ -711,6 +733,7 @@ CONFIG_I2C_AMD8111=y | |||
| 711 | # | 733 | # |
| 712 | # Dallas's 1-wire bus | 734 | # Dallas's 1-wire bus |
| 713 | # | 735 | # |
| 736 | # CONFIG_W1 is not set | ||
| 714 | 737 | ||
| 715 | # | 738 | # |
| 716 | # Hardware Monitoring support | 739 | # Hardware Monitoring support |
| @@ -719,15 +742,9 @@ CONFIG_I2C_AMD8111=y | |||
| 719 | # CONFIG_HWMON_VID is not set | 742 | # CONFIG_HWMON_VID is not set |
| 720 | 743 | ||
| 721 | # | 744 | # |
| 722 | # Misc devices | ||
| 723 | # | ||
| 724 | # CONFIG_TIFM_CORE is not set | ||
| 725 | |||
| 726 | # | ||
| 727 | # Multimedia devices | 745 | # Multimedia devices |
| 728 | # | 746 | # |
| 729 | # CONFIG_VIDEO_DEV is not set | 747 | # CONFIG_VIDEO_DEV is not set |
| 730 | CONFIG_VIDEO_V4L2=y | ||
| 731 | 748 | ||
| 732 | # | 749 | # |
| 733 | # Digital Video Broadcasting Devices | 750 | # Digital Video Broadcasting Devices |
| @@ -740,6 +757,7 @@ CONFIG_VIDEO_V4L2=y | |||
| 740 | # | 757 | # |
| 741 | CONFIG_FIRMWARE_EDID=y | 758 | CONFIG_FIRMWARE_EDID=y |
| 742 | # CONFIG_FB is not set | 759 | # CONFIG_FB is not set |
| 760 | # CONFIG_FB_IBM_GXT4500 is not set | ||
| 743 | 761 | ||
| 744 | # | 762 | # |
| 745 | # Console display driver support | 763 | # Console display driver support |
| @@ -754,6 +772,11 @@ CONFIG_DUMMY_CONSOLE=y | |||
| 754 | # CONFIG_SOUND is not set | 772 | # CONFIG_SOUND is not set |
| 755 | 773 | ||
| 756 | # | 774 | # |
| 775 | # HID Devices | ||
| 776 | # | ||
| 777 | CONFIG_HID=y | ||
| 778 | |||
| 779 | # | ||
| 757 | # USB support | 780 | # USB support |
| 758 | # | 781 | # |
| 759 | CONFIG_USB_ARCH_HAS_HCD=y | 782 | CONFIG_USB_ARCH_HAS_HCD=y |
| @@ -768,6 +791,7 @@ CONFIG_USB=y | |||
| 768 | CONFIG_USB_DEVICEFS=y | 791 | CONFIG_USB_DEVICEFS=y |
| 769 | # CONFIG_USB_BANDWIDTH is not set | 792 | # CONFIG_USB_BANDWIDTH is not set |
| 770 | # CONFIG_USB_DYNAMIC_MINORS is not set | 793 | # CONFIG_USB_DYNAMIC_MINORS is not set |
| 794 | # CONFIG_USB_MULTITHREAD_PROBE is not set | ||
| 771 | # CONFIG_USB_OTG is not set | 795 | # CONFIG_USB_OTG is not set |
| 772 | 796 | ||
| 773 | # | 797 | # |
| @@ -803,7 +827,6 @@ CONFIG_USB_UHCI_HCD=y | |||
| 803 | # USB Input Devices | 827 | # USB Input Devices |
| 804 | # | 828 | # |
| 805 | CONFIG_USB_HID=y | 829 | CONFIG_USB_HID=y |
| 806 | CONFIG_USB_HIDINPUT=y | ||
| 807 | # CONFIG_USB_HIDINPUT_POWERBOOK is not set | 830 | # CONFIG_USB_HIDINPUT_POWERBOOK is not set |
| 808 | # CONFIG_HID_FF is not set | 831 | # CONFIG_HID_FF is not set |
| 809 | # CONFIG_USB_HIDDEV is not set | 832 | # CONFIG_USB_HIDDEV is not set |
| @@ -819,7 +842,6 @@ CONFIG_USB_HIDINPUT=y | |||
| 819 | # CONFIG_USB_ATI_REMOTE2 is not set | 842 | # CONFIG_USB_ATI_REMOTE2 is not set |
| 820 | # CONFIG_USB_KEYSPAN_REMOTE is not set | 843 | # CONFIG_USB_KEYSPAN_REMOTE is not set |
| 821 | # CONFIG_USB_APPLETOUCH is not set | 844 | # CONFIG_USB_APPLETOUCH is not set |
| 822 | # CONFIG_USB_TRANCEVIBRATOR is not set | ||
| 823 | 845 | ||
| 824 | # | 846 | # |
| 825 | # USB Imaging devices | 847 | # USB Imaging devices |
| @@ -833,6 +855,7 @@ CONFIG_USB_HIDINPUT=y | |||
| 833 | # CONFIG_USB_KAWETH is not set | 855 | # CONFIG_USB_KAWETH is not set |
| 834 | CONFIG_USB_PEGASUS=y | 856 | CONFIG_USB_PEGASUS=y |
| 835 | # CONFIG_USB_RTL8150 is not set | 857 | # CONFIG_USB_RTL8150 is not set |
| 858 | # CONFIG_USB_USBNET_MII is not set | ||
| 836 | # CONFIG_USB_USBNET is not set | 859 | # CONFIG_USB_USBNET is not set |
| 837 | CONFIG_USB_MON=y | 860 | CONFIG_USB_MON=y |
| 838 | 861 | ||
| @@ -881,6 +904,7 @@ CONFIG_USB_SERIAL_KEYSPAN_USA49WLC=y | |||
| 881 | # CONFIG_USB_SERIAL_KLSI is not set | 904 | # CONFIG_USB_SERIAL_KLSI is not set |
| 882 | # CONFIG_USB_SERIAL_KOBIL_SCT is not set | 905 | # CONFIG_USB_SERIAL_KOBIL_SCT is not set |
| 883 | # CONFIG_USB_SERIAL_MCT_U232 is not set | 906 | # CONFIG_USB_SERIAL_MCT_U232 is not set |
| 907 | # CONFIG_USB_SERIAL_MOS7720 is not set | ||
| 884 | # CONFIG_USB_SERIAL_MOS7840 is not set | 908 | # CONFIG_USB_SERIAL_MOS7840 is not set |
| 885 | # CONFIG_USB_SERIAL_NAVMAN is not set | 909 | # CONFIG_USB_SERIAL_NAVMAN is not set |
| 886 | # CONFIG_USB_SERIAL_PL2303 is not set | 910 | # CONFIG_USB_SERIAL_PL2303 is not set |
| @@ -892,6 +916,7 @@ CONFIG_USB_SERIAL_TI=m | |||
| 892 | # CONFIG_USB_SERIAL_XIRCOM is not set | 916 | # CONFIG_USB_SERIAL_XIRCOM is not set |
| 893 | # CONFIG_USB_SERIAL_OPTION is not set | 917 | # CONFIG_USB_SERIAL_OPTION is not set |
| 894 | # CONFIG_USB_SERIAL_OMNINET is not set | 918 | # CONFIG_USB_SERIAL_OMNINET is not set |
| 919 | # CONFIG_USB_SERIAL_DEBUG is not set | ||
| 895 | CONFIG_USB_EZUSB=y | 920 | CONFIG_USB_EZUSB=y |
| 896 | 921 | ||
| 897 | # | 922 | # |
| @@ -913,6 +938,7 @@ CONFIG_USB_EZUSB=y | |||
| 913 | # CONFIG_USB_APPLEDISPLAY is not set | 938 | # CONFIG_USB_APPLEDISPLAY is not set |
| 914 | # CONFIG_USB_SISUSBVGA is not set | 939 | # CONFIG_USB_SISUSBVGA is not set |
| 915 | # CONFIG_USB_LD is not set | 940 | # CONFIG_USB_LD is not set |
| 941 | # CONFIG_USB_TRANCEVIBRATOR is not set | ||
| 916 | # CONFIG_USB_TEST is not set | 942 | # CONFIG_USB_TEST is not set |
| 917 | 943 | ||
| 918 | # | 944 | # |
| @@ -970,6 +996,10 @@ CONFIG_USB_EZUSB=y | |||
| 970 | # | 996 | # |
| 971 | 997 | ||
| 972 | # | 998 | # |
| 999 | # Virtualization | ||
| 1000 | # | ||
| 1001 | |||
| 1002 | # | ||
| 973 | # File systems | 1003 | # File systems |
| 974 | # | 1004 | # |
| 975 | CONFIG_EXT2_FS=y | 1005 | CONFIG_EXT2_FS=y |
| @@ -978,12 +1008,14 @@ CONFIG_EXT2_FS_XIP=y | |||
| 978 | CONFIG_FS_XIP=y | 1008 | CONFIG_FS_XIP=y |
| 979 | CONFIG_EXT3_FS=y | 1009 | CONFIG_EXT3_FS=y |
| 980 | # CONFIG_EXT3_FS_XATTR is not set | 1010 | # CONFIG_EXT3_FS_XATTR is not set |
| 1011 | # CONFIG_EXT4DEV_FS is not set | ||
| 981 | CONFIG_JBD=y | 1012 | CONFIG_JBD=y |
| 982 | # CONFIG_JBD_DEBUG is not set | 1013 | # CONFIG_JBD_DEBUG is not set |
| 983 | # CONFIG_REISERFS_FS is not set | 1014 | # CONFIG_REISERFS_FS is not set |
| 984 | # CONFIG_JFS_FS is not set | 1015 | # CONFIG_JFS_FS is not set |
| 985 | CONFIG_FS_POSIX_ACL=y | 1016 | CONFIG_FS_POSIX_ACL=y |
| 986 | # CONFIG_XFS_FS is not set | 1017 | # CONFIG_XFS_FS is not set |
| 1018 | # CONFIG_GFS2_FS is not set | ||
| 987 | # CONFIG_OCFS2_FS is not set | 1019 | # CONFIG_OCFS2_FS is not set |
| 988 | # CONFIG_MINIX_FS is not set | 1020 | # CONFIG_MINIX_FS is not set |
| 989 | # CONFIG_ROMFS_FS is not set | 1021 | # CONFIG_ROMFS_FS is not set |
| @@ -1133,14 +1165,21 @@ CONFIG_NLS_DEFAULT="utf-8" | |||
| 1133 | CONFIG_NLS_UTF8=y | 1165 | CONFIG_NLS_UTF8=y |
| 1134 | 1166 | ||
| 1135 | # | 1167 | # |
| 1168 | # Distributed Lock Manager | ||
| 1169 | # | ||
| 1170 | # CONFIG_DLM is not set | ||
| 1171 | |||
| 1172 | # | ||
| 1136 | # Library routines | 1173 | # Library routines |
| 1137 | # | 1174 | # |
| 1175 | CONFIG_BITREVERSE=y | ||
| 1138 | CONFIG_CRC_CCITT=y | 1176 | CONFIG_CRC_CCITT=y |
| 1139 | # CONFIG_CRC16 is not set | 1177 | # CONFIG_CRC16 is not set |
| 1140 | CONFIG_CRC32=y | 1178 | CONFIG_CRC32=y |
| 1141 | # CONFIG_LIBCRC32C is not set | 1179 | # CONFIG_LIBCRC32C is not set |
| 1142 | CONFIG_ZLIB_INFLATE=y | 1180 | CONFIG_ZLIB_INFLATE=y |
| 1143 | CONFIG_PLIST=y | 1181 | CONFIG_PLIST=y |
| 1182 | CONFIG_IOMAP_COPY=y | ||
| 1144 | 1183 | ||
| 1145 | # | 1184 | # |
| 1146 | # Instrumentation Support | 1185 | # Instrumentation Support |
| @@ -1155,6 +1194,8 @@ CONFIG_PLIST=y | |||
| 1155 | CONFIG_ENABLE_MUST_CHECK=y | 1194 | CONFIG_ENABLE_MUST_CHECK=y |
| 1156 | CONFIG_MAGIC_SYSRQ=y | 1195 | CONFIG_MAGIC_SYSRQ=y |
| 1157 | # CONFIG_UNUSED_SYMBOLS is not set | 1196 | # CONFIG_UNUSED_SYMBOLS is not set |
| 1197 | CONFIG_DEBUG_FS=y | ||
| 1198 | # CONFIG_HEADERS_CHECK is not set | ||
| 1158 | CONFIG_DEBUG_KERNEL=y | 1199 | CONFIG_DEBUG_KERNEL=y |
| 1159 | CONFIG_LOG_BUF_SHIFT=17 | 1200 | CONFIG_LOG_BUF_SHIFT=17 |
| 1160 | CONFIG_DETECT_SOFTLOCKUP=y | 1201 | CONFIG_DETECT_SOFTLOCKUP=y |
| @@ -1169,8 +1210,8 @@ CONFIG_DEBUG_SLAB=y | |||
| 1169 | CONFIG_DEBUG_SPINLOCK_SLEEP=y | 1210 | CONFIG_DEBUG_SPINLOCK_SLEEP=y |
| 1170 | # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set | 1211 | # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set |
| 1171 | # CONFIG_DEBUG_KOBJECT is not set | 1212 | # CONFIG_DEBUG_KOBJECT is not set |
| 1213 | CONFIG_DEBUG_BUGVERBOSE=y | ||
| 1172 | # CONFIG_DEBUG_INFO is not set | 1214 | # CONFIG_DEBUG_INFO is not set |
| 1173 | CONFIG_DEBUG_FS=y | ||
| 1174 | # CONFIG_DEBUG_VM is not set | 1215 | # CONFIG_DEBUG_VM is not set |
| 1175 | # CONFIG_DEBUG_LIST is not set | 1216 | # CONFIG_DEBUG_LIST is not set |
| 1176 | # CONFIG_FORCED_INLINING is not set | 1217 | # CONFIG_FORCED_INLINING is not set |
| @@ -1180,6 +1221,7 @@ CONFIG_DEBUG_STACK_USAGE=y | |||
| 1180 | CONFIG_DEBUGGER=y | 1221 | CONFIG_DEBUGGER=y |
| 1181 | CONFIG_XMON=y | 1222 | CONFIG_XMON=y |
| 1182 | CONFIG_XMON_DEFAULT=y | 1223 | CONFIG_XMON_DEFAULT=y |
| 1224 | CONFIG_XMON_DISASSEMBLY=y | ||
| 1183 | # CONFIG_IRQSTACKS is not set | 1225 | # CONFIG_IRQSTACKS is not set |
| 1184 | CONFIG_BOOTX_TEXT=y | 1226 | CONFIG_BOOTX_TEXT=y |
| 1185 | # CONFIG_PPC_EARLY_DEBUG is not set | 1227 | # CONFIG_PPC_EARLY_DEBUG is not set |
| @@ -1195,9 +1237,10 @@ CONFIG_BOOTX_TEXT=y | |||
| 1195 | # | 1237 | # |
| 1196 | CONFIG_CRYPTO=y | 1238 | CONFIG_CRYPTO=y |
| 1197 | CONFIG_CRYPTO_ALGAPI=y | 1239 | CONFIG_CRYPTO_ALGAPI=y |
| 1198 | CONFIG_CRYPTO_BLKCIPHER=m | 1240 | CONFIG_CRYPTO_BLKCIPHER=y |
| 1199 | CONFIG_CRYPTO_MANAGER=m | 1241 | CONFIG_CRYPTO_MANAGER=y |
| 1200 | # CONFIG_CRYPTO_HMAC is not set | 1242 | # CONFIG_CRYPTO_HMAC is not set |
| 1243 | # CONFIG_CRYPTO_XCBC is not set | ||
| 1201 | # CONFIG_CRYPTO_NULL is not set | 1244 | # CONFIG_CRYPTO_NULL is not set |
| 1202 | # CONFIG_CRYPTO_MD4 is not set | 1245 | # CONFIG_CRYPTO_MD4 is not set |
| 1203 | CONFIG_CRYPTO_MD5=y | 1246 | CONFIG_CRYPTO_MD5=y |
| @@ -1206,8 +1249,10 @@ CONFIG_CRYPTO_MD5=y | |||
| 1206 | # CONFIG_CRYPTO_SHA512 is not set | 1249 | # CONFIG_CRYPTO_SHA512 is not set |
| 1207 | # CONFIG_CRYPTO_WP512 is not set | 1250 | # CONFIG_CRYPTO_WP512 is not set |
| 1208 | # CONFIG_CRYPTO_TGR192 is not set | 1251 | # CONFIG_CRYPTO_TGR192 is not set |
| 1252 | # CONFIG_CRYPTO_GF128MUL is not set | ||
| 1209 | CONFIG_CRYPTO_ECB=m | 1253 | CONFIG_CRYPTO_ECB=m |
| 1210 | CONFIG_CRYPTO_CBC=m | 1254 | CONFIG_CRYPTO_CBC=y |
| 1255 | # CONFIG_CRYPTO_LRW is not set | ||
| 1211 | CONFIG_CRYPTO_DES=y | 1256 | CONFIG_CRYPTO_DES=y |
| 1212 | # CONFIG_CRYPTO_BLOWFISH is not set | 1257 | # CONFIG_CRYPTO_BLOWFISH is not set |
| 1213 | # CONFIG_CRYPTO_TWOFISH is not set | 1258 | # CONFIG_CRYPTO_TWOFISH is not set |
diff --git a/arch/powerpc/configs/mpc7448_hpc2_defconfig b/arch/powerpc/configs/mpc7448_hpc2_defconfig index d1811e754518..fdf09eabe6e7 100644 --- a/arch/powerpc/configs/mpc7448_hpc2_defconfig +++ b/arch/powerpc/configs/mpc7448_hpc2_defconfig | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.18-rc6 | 3 | # Linux kernel version: 2.6.20-rc5 |
| 4 | # Sun Sep 10 10:26:55 2006 | 4 | # Mon Jan 22 22:20:53 2007 |
| 5 | # | 5 | # |
| 6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
| 7 | CONFIG_PPC32=y | 7 | CONFIG_PPC32=y |
| @@ -10,6 +10,7 @@ CONFIG_MMU=y | |||
| 10 | CONFIG_GENERIC_HARDIRQS=y | 10 | CONFIG_GENERIC_HARDIRQS=y |
| 11 | CONFIG_IRQ_PER_CPU=y | 11 | CONFIG_IRQ_PER_CPU=y |
| 12 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 12 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
| 13 | CONFIG_ARCH_HAS_ILOG2_U32=y | ||
| 13 | CONFIG_GENERIC_HWEIGHT=y | 14 | CONFIG_GENERIC_HWEIGHT=y |
| 14 | CONFIG_GENERIC_CALIBRATE_DELAY=y | 15 | CONFIG_GENERIC_CALIBRATE_DELAY=y |
| 15 | CONFIG_GENERIC_FIND_NEXT_BIT=y | 16 | CONFIG_GENERIC_FIND_NEXT_BIT=y |
| @@ -21,13 +22,14 @@ CONFIG_ARCH_MAY_HAVE_PC_FDC=y | |||
| 21 | CONFIG_PPC_OF=y | 22 | CONFIG_PPC_OF=y |
| 22 | CONFIG_PPC_UDBG_16550=y | 23 | CONFIG_PPC_UDBG_16550=y |
| 23 | # CONFIG_GENERIC_TBSYNC is not set | 24 | # CONFIG_GENERIC_TBSYNC is not set |
| 25 | CONFIG_AUDIT_ARCH=y | ||
| 26 | CONFIG_GENERIC_BUG=y | ||
| 24 | CONFIG_DEFAULT_UIMAGE=y | 27 | CONFIG_DEFAULT_UIMAGE=y |
| 25 | 28 | ||
| 26 | # | 29 | # |
| 27 | # Processor support | 30 | # Processor support |
| 28 | # | 31 | # |
| 29 | CONFIG_CLASSIC32=y | 32 | CONFIG_CLASSIC32=y |
| 30 | # CONFIG_PPC_52xx is not set | ||
| 31 | # CONFIG_PPC_82xx is not set | 33 | # CONFIG_PPC_82xx is not set |
| 32 | # CONFIG_PPC_83xx is not set | 34 | # CONFIG_PPC_83xx is not set |
| 33 | # CONFIG_PPC_85xx is not set | 35 | # CONFIG_PPC_85xx is not set |
| @@ -38,6 +40,8 @@ CONFIG_CLASSIC32=y | |||
| 38 | # CONFIG_E200 is not set | 40 | # CONFIG_E200 is not set |
| 39 | CONFIG_6xx=y | 41 | CONFIG_6xx=y |
| 40 | CONFIG_PPC_FPU=y | 42 | CONFIG_PPC_FPU=y |
| 43 | # CONFIG_PPC_DCR_NATIVE is not set | ||
| 44 | # CONFIG_PPC_DCR_MMIO is not set | ||
| 41 | # CONFIG_ALTIVEC is not set | 45 | # CONFIG_ALTIVEC is not set |
| 42 | CONFIG_PPC_STD_MMU=y | 46 | CONFIG_PPC_STD_MMU=y |
| 43 | CONFIG_PPC_STD_MMU_32=y | 47 | CONFIG_PPC_STD_MMU_32=y |
| @@ -58,16 +62,20 @@ CONFIG_LOCALVERSION="" | |||
| 58 | CONFIG_LOCALVERSION_AUTO=y | 62 | CONFIG_LOCALVERSION_AUTO=y |
| 59 | CONFIG_SWAP=y | 63 | CONFIG_SWAP=y |
| 60 | CONFIG_SYSVIPC=y | 64 | CONFIG_SYSVIPC=y |
| 65 | # CONFIG_IPC_NS is not set | ||
| 61 | # CONFIG_POSIX_MQUEUE is not set | 66 | # CONFIG_POSIX_MQUEUE is not set |
| 62 | # CONFIG_BSD_PROCESS_ACCT is not set | 67 | # CONFIG_BSD_PROCESS_ACCT is not set |
| 63 | # CONFIG_TASKSTATS is not set | 68 | # CONFIG_TASKSTATS is not set |
| 64 | CONFIG_SYSCTL=y | 69 | # CONFIG_UTS_NS is not set |
| 65 | # CONFIG_AUDIT is not set | 70 | # CONFIG_AUDIT is not set |
| 66 | # CONFIG_IKCONFIG is not set | 71 | # CONFIG_IKCONFIG is not set |
| 72 | CONFIG_SYSFS_DEPRECATED=y | ||
| 67 | # CONFIG_RELAY is not set | 73 | # CONFIG_RELAY is not set |
| 68 | CONFIG_INITRAMFS_SOURCE="" | 74 | CONFIG_INITRAMFS_SOURCE="" |
| 69 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | 75 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set |
| 76 | CONFIG_SYSCTL=y | ||
| 70 | CONFIG_EMBEDDED=y | 77 | CONFIG_EMBEDDED=y |
| 78 | CONFIG_SYSCTL_SYSCALL=y | ||
| 71 | CONFIG_KALLSYMS=y | 79 | CONFIG_KALLSYMS=y |
| 72 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | 80 | # CONFIG_KALLSYMS_EXTRA_PASS is not set |
| 73 | CONFIG_HOTPLUG=y | 81 | CONFIG_HOTPLUG=y |
| @@ -75,12 +83,12 @@ CONFIG_PRINTK=y | |||
| 75 | CONFIG_BUG=y | 83 | CONFIG_BUG=y |
| 76 | CONFIG_ELF_CORE=y | 84 | CONFIG_ELF_CORE=y |
| 77 | CONFIG_BASE_FULL=y | 85 | CONFIG_BASE_FULL=y |
| 78 | CONFIG_RT_MUTEXES=y | ||
| 79 | CONFIG_FUTEX=y | 86 | CONFIG_FUTEX=y |
| 80 | CONFIG_EPOLL=y | 87 | CONFIG_EPOLL=y |
| 81 | CONFIG_SHMEM=y | 88 | CONFIG_SHMEM=y |
| 82 | CONFIG_SLAB=y | 89 | CONFIG_SLAB=y |
| 83 | CONFIG_VM_EVENT_COUNTERS=y | 90 | CONFIG_VM_EVENT_COUNTERS=y |
| 91 | CONFIG_RT_MUTEXES=y | ||
| 84 | # CONFIG_TINY_SHMEM is not set | 92 | # CONFIG_TINY_SHMEM is not set |
| 85 | CONFIG_BASE_SMALL=0 | 93 | CONFIG_BASE_SMALL=0 |
| 86 | # CONFIG_SLOB is not set | 94 | # CONFIG_SLOB is not set |
| @@ -93,6 +101,7 @@ CONFIG_BASE_SMALL=0 | |||
| 93 | # | 101 | # |
| 94 | # Block layer | 102 | # Block layer |
| 95 | # | 103 | # |
| 104 | CONFIG_BLOCK=y | ||
| 96 | CONFIG_LBD=y | 105 | CONFIG_LBD=y |
| 97 | # CONFIG_BLK_DEV_IO_TRACE is not set | 106 | # CONFIG_BLK_DEV_IO_TRACE is not set |
| 98 | # CONFIG_LSF is not set | 107 | # CONFIG_LSF is not set |
| @@ -114,19 +123,19 @@ CONFIG_DEFAULT_IOSCHED="anticipatory" | |||
| 114 | # Platform support | 123 | # Platform support |
| 115 | # | 124 | # |
| 116 | # CONFIG_PPC_MULTIPLATFORM is not set | 125 | # CONFIG_PPC_MULTIPLATFORM is not set |
| 117 | # CONFIG_PPC_ISERIES is not set | ||
| 118 | CONFIG_EMBEDDED6xx=y | 126 | CONFIG_EMBEDDED6xx=y |
| 119 | # CONFIG_APUS is not set | 127 | # CONFIG_APUS is not set |
| 128 | # CONFIG_PPC_MPC52xx is not set | ||
| 120 | # CONFIG_PPC_CELL is not set | 129 | # CONFIG_PPC_CELL is not set |
| 121 | # CONFIG_PPC_CELL_NATIVE is not set | 130 | # CONFIG_PPC_CELL_NATIVE is not set |
| 122 | # CONFIG_UDBG_RTAS_CONSOLE is not set | ||
| 123 | # CONFIG_PPC_RTAS is not set | 131 | # CONFIG_PPC_RTAS is not set |
| 124 | # CONFIG_MMIO_NVRAM is not set | 132 | # CONFIG_MMIO_NVRAM is not set |
| 125 | # CONFIG_PPC_MPC106 is not set | 133 | # CONFIG_PPC_MPC106 is not set |
| 126 | # CONFIG_PPC_970_NAP is not set | 134 | # CONFIG_PPC_970_NAP is not set |
| 135 | # CONFIG_PPC_INDIRECT_IO is not set | ||
| 136 | # CONFIG_GENERIC_IOMAP is not set | ||
| 127 | # CONFIG_CPU_FREQ is not set | 137 | # CONFIG_CPU_FREQ is not set |
| 128 | # CONFIG_TAU is not set | 138 | # CONFIG_TAU is not set |
| 129 | # CONFIG_PPC_TODC is not set | ||
| 130 | # CONFIG_KATANA is not set | 139 | # CONFIG_KATANA is not set |
| 131 | # CONFIG_WILLOW is not set | 140 | # CONFIG_WILLOW is not set |
| 132 | # CONFIG_CPCI690 is not set | 141 | # CONFIG_CPCI690 is not set |
| @@ -141,6 +150,7 @@ CONFIG_EMBEDDED6xx=y | |||
| 141 | # CONFIG_PRPMC750 is not set | 150 | # CONFIG_PRPMC750 is not set |
| 142 | # CONFIG_PRPMC800 is not set | 151 | # CONFIG_PRPMC800 is not set |
| 143 | # CONFIG_SANDPOINT is not set | 152 | # CONFIG_SANDPOINT is not set |
| 153 | # CONFIG_LINKSTATION is not set | ||
| 144 | CONFIG_MPC7448HPC2=y | 154 | CONFIG_MPC7448HPC2=y |
| 145 | # CONFIG_RADSTONE_PPC7D is not set | 155 | # CONFIG_RADSTONE_PPC7D is not set |
| 146 | # CONFIG_PAL4 is not set | 156 | # CONFIG_PAL4 is not set |
| @@ -152,7 +162,6 @@ CONFIG_MPC7448HPC2=y | |||
| 152 | # CONFIG_TQM8260 is not set | 162 | # CONFIG_TQM8260 is not set |
| 153 | # CONFIG_ADS8272 is not set | 163 | # CONFIG_ADS8272 is not set |
| 154 | # CONFIG_PQ2FADS is not set | 164 | # CONFIG_PQ2FADS is not set |
| 155 | # CONFIG_LITE5200 is not set | ||
| 156 | # CONFIG_EV64360 is not set | 165 | # CONFIG_EV64360 is not set |
| 157 | CONFIG_TSI108_BRIDGE=y | 166 | CONFIG_TSI108_BRIDGE=y |
| 158 | # CONFIG_WANT_EARLY_SERIAL is not set | 167 | # CONFIG_WANT_EARLY_SERIAL is not set |
| @@ -164,6 +173,7 @@ CONFIG_MPIC=y | |||
| 164 | # CONFIG_HIGHMEM is not set | 173 | # CONFIG_HIGHMEM is not set |
| 165 | # CONFIG_HZ_100 is not set | 174 | # CONFIG_HZ_100 is not set |
| 166 | CONFIG_HZ_250=y | 175 | CONFIG_HZ_250=y |
| 176 | # CONFIG_HZ_300 is not set | ||
| 167 | # CONFIG_HZ_1000 is not set | 177 | # CONFIG_HZ_1000 is not set |
| 168 | CONFIG_HZ=250 | 178 | CONFIG_HZ=250 |
| 169 | CONFIG_PREEMPT_NONE=y | 179 | CONFIG_PREEMPT_NONE=y |
| @@ -173,6 +183,7 @@ CONFIG_BINFMT_ELF=y | |||
| 173 | CONFIG_BINFMT_MISC=y | 183 | CONFIG_BINFMT_MISC=y |
| 174 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y | 184 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y |
| 175 | CONFIG_ARCH_FLATMEM_ENABLE=y | 185 | CONFIG_ARCH_FLATMEM_ENABLE=y |
| 186 | CONFIG_ARCH_POPULATES_NODE_MAP=y | ||
| 176 | CONFIG_SELECT_MEMORY_MODEL=y | 187 | CONFIG_SELECT_MEMORY_MODEL=y |
| 177 | CONFIG_FLATMEM_MANUAL=y | 188 | CONFIG_FLATMEM_MANUAL=y |
| 178 | # CONFIG_DISCONTIGMEM_MANUAL is not set | 189 | # CONFIG_DISCONTIGMEM_MANUAL is not set |
| @@ -237,6 +248,7 @@ CONFIG_PACKET=y | |||
| 237 | CONFIG_UNIX=y | 248 | CONFIG_UNIX=y |
| 238 | CONFIG_XFRM=y | 249 | CONFIG_XFRM=y |
| 239 | CONFIG_XFRM_USER=y | 250 | CONFIG_XFRM_USER=y |
| 251 | # CONFIG_XFRM_SUB_POLICY is not set | ||
| 240 | # CONFIG_NET_KEY is not set | 252 | # CONFIG_NET_KEY is not set |
| 241 | CONFIG_INET=y | 253 | CONFIG_INET=y |
| 242 | CONFIG_IP_MULTICAST=y | 254 | CONFIG_IP_MULTICAST=y |
| @@ -258,10 +270,13 @@ CONFIG_SYN_COOKIES=y | |||
| 258 | # CONFIG_INET_TUNNEL is not set | 270 | # CONFIG_INET_TUNNEL is not set |
| 259 | CONFIG_INET_XFRM_MODE_TRANSPORT=y | 271 | CONFIG_INET_XFRM_MODE_TRANSPORT=y |
| 260 | CONFIG_INET_XFRM_MODE_TUNNEL=y | 272 | CONFIG_INET_XFRM_MODE_TUNNEL=y |
| 273 | CONFIG_INET_XFRM_MODE_BEET=y | ||
| 261 | CONFIG_INET_DIAG=y | 274 | CONFIG_INET_DIAG=y |
| 262 | CONFIG_INET_TCP_DIAG=y | 275 | CONFIG_INET_TCP_DIAG=y |
| 263 | # CONFIG_TCP_CONG_ADVANCED is not set | 276 | # CONFIG_TCP_CONG_ADVANCED is not set |
| 264 | CONFIG_TCP_CONG_BIC=y | 277 | CONFIG_TCP_CONG_CUBIC=y |
| 278 | CONFIG_DEFAULT_TCP_CONG="cubic" | ||
| 279 | # CONFIG_TCP_MD5SIG is not set | ||
| 265 | # CONFIG_IPV6 is not set | 280 | # CONFIG_IPV6 is not set |
| 266 | # CONFIG_INET6_XFRM_TUNNEL is not set | 281 | # CONFIG_INET6_XFRM_TUNNEL is not set |
| 267 | # CONFIG_INET6_TUNNEL is not set | 282 | # CONFIG_INET6_TUNNEL is not set |
| @@ -291,7 +306,6 @@ CONFIG_TCP_CONG_BIC=y | |||
| 291 | # CONFIG_ATALK is not set | 306 | # CONFIG_ATALK is not set |
| 292 | # CONFIG_X25 is not set | 307 | # CONFIG_X25 is not set |
| 293 | # CONFIG_LAPB is not set | 308 | # CONFIG_LAPB is not set |
| 294 | # CONFIG_NET_DIVERT is not set | ||
| 295 | # CONFIG_ECONET is not set | 309 | # CONFIG_ECONET is not set |
| 296 | # CONFIG_WAN_ROUTER is not set | 310 | # CONFIG_WAN_ROUTER is not set |
| 297 | 311 | ||
| @@ -362,6 +376,12 @@ CONFIG_BLK_DEV_INITRD=y | |||
| 362 | # CONFIG_ATA_OVER_ETH is not set | 376 | # CONFIG_ATA_OVER_ETH is not set |
| 363 | 377 | ||
| 364 | # | 378 | # |
| 379 | # Misc devices | ||
| 380 | # | ||
| 381 | # CONFIG_SGI_IOC4 is not set | ||
| 382 | # CONFIG_TIFM_CORE is not set | ||
| 383 | |||
| 384 | # | ||
| 365 | # ATA/ATAPI/MFM/RLL support | 385 | # ATA/ATAPI/MFM/RLL support |
| 366 | # | 386 | # |
| 367 | # CONFIG_IDE is not set | 387 | # CONFIG_IDE is not set |
| @@ -371,6 +391,8 @@ CONFIG_BLK_DEV_INITRD=y | |||
| 371 | # | 391 | # |
| 372 | # CONFIG_RAID_ATTRS is not set | 392 | # CONFIG_RAID_ATTRS is not set |
| 373 | CONFIG_SCSI=y | 393 | CONFIG_SCSI=y |
| 394 | # CONFIG_SCSI_TGT is not set | ||
| 395 | # CONFIG_SCSI_NETLINK is not set | ||
| 374 | CONFIG_SCSI_PROC_FS=y | 396 | CONFIG_SCSI_PROC_FS=y |
| 375 | 397 | ||
| 376 | # | 398 | # |
| @@ -389,14 +411,16 @@ CONFIG_BLK_DEV_SD=y | |||
| 389 | # CONFIG_SCSI_MULTI_LUN is not set | 411 | # CONFIG_SCSI_MULTI_LUN is not set |
| 390 | # CONFIG_SCSI_CONSTANTS is not set | 412 | # CONFIG_SCSI_CONSTANTS is not set |
| 391 | # CONFIG_SCSI_LOGGING is not set | 413 | # CONFIG_SCSI_LOGGING is not set |
| 414 | # CONFIG_SCSI_SCAN_ASYNC is not set | ||
| 392 | 415 | ||
| 393 | # | 416 | # |
| 394 | # SCSI Transport Attributes | 417 | # SCSI Transports |
| 395 | # | 418 | # |
| 396 | # CONFIG_SCSI_SPI_ATTRS is not set | 419 | # CONFIG_SCSI_SPI_ATTRS is not set |
| 397 | # CONFIG_SCSI_FC_ATTRS is not set | 420 | # CONFIG_SCSI_FC_ATTRS is not set |
| 398 | # CONFIG_SCSI_ISCSI_ATTRS is not set | 421 | # CONFIG_SCSI_ISCSI_ATTRS is not set |
| 399 | # CONFIG_SCSI_SAS_ATTRS is not set | 422 | # CONFIG_SCSI_SAS_ATTRS is not set |
| 423 | # CONFIG_SCSI_SAS_LIBSAS is not set | ||
| 400 | 424 | ||
| 401 | # | 425 | # |
| 402 | # SCSI low-level drivers | 426 | # SCSI low-level drivers |
| @@ -409,27 +433,13 @@ CONFIG_BLK_DEV_SD=y | |||
| 409 | # CONFIG_SCSI_AIC7XXX is not set | 433 | # CONFIG_SCSI_AIC7XXX is not set |
| 410 | # CONFIG_SCSI_AIC7XXX_OLD is not set | 434 | # CONFIG_SCSI_AIC7XXX_OLD is not set |
| 411 | # CONFIG_SCSI_AIC79XX is not set | 435 | # CONFIG_SCSI_AIC79XX is not set |
| 436 | # CONFIG_SCSI_AIC94XX is not set | ||
| 412 | # CONFIG_SCSI_DPT_I2O is not set | 437 | # CONFIG_SCSI_DPT_I2O is not set |
| 438 | # CONFIG_SCSI_ARCMSR is not set | ||
| 413 | # CONFIG_MEGARAID_NEWGEN is not set | 439 | # CONFIG_MEGARAID_NEWGEN is not set |
| 414 | # CONFIG_MEGARAID_LEGACY is not set | 440 | # CONFIG_MEGARAID_LEGACY is not set |
| 415 | # CONFIG_MEGARAID_SAS is not set | 441 | # CONFIG_MEGARAID_SAS is not set |
| 416 | CONFIG_ATA=y | ||
| 417 | # CONFIG_SATA_AHCI is not set | ||
| 418 | # CONFIG_SATA_SVW is not set | ||
| 419 | # CONFIG_SCSI_ATA_PIIX is not set | ||
| 420 | CONFIG_SATA_MV=y | ||
| 421 | # CONFIG_SATA_NV is not set | ||
| 422 | # CONFIG_SCSI_PDC_ADMA is not set | ||
| 423 | # CONFIG_SCSI_HPTIOP is not set | 442 | # CONFIG_SCSI_HPTIOP is not set |
| 424 | # CONFIG_SATA_QSTOR is not set | ||
| 425 | # CONFIG_SATA_PROMISE is not set | ||
| 426 | # CONFIG_SATA_SX4 is not set | ||
| 427 | # CONFIG_SATA_SIL is not set | ||
| 428 | # CONFIG_SATA_SIL24 is not set | ||
| 429 | # CONFIG_SATA_SIS is not set | ||
| 430 | # CONFIG_SATA_ULI is not set | ||
| 431 | # CONFIG_SATA_VIA is not set | ||
| 432 | # CONFIG_SATA_VITESSE is not set | ||
| 433 | # CONFIG_SCSI_BUSLOGIC is not set | 443 | # CONFIG_SCSI_BUSLOGIC is not set |
| 434 | # CONFIG_SCSI_DMX3191D is not set | 444 | # CONFIG_SCSI_DMX3191D is not set |
| 435 | # CONFIG_SCSI_EATA is not set | 445 | # CONFIG_SCSI_EATA is not set |
| @@ -438,15 +448,73 @@ CONFIG_SATA_MV=y | |||
| 438 | # CONFIG_SCSI_IPS is not set | 448 | # CONFIG_SCSI_IPS is not set |
| 439 | # CONFIG_SCSI_INITIO is not set | 449 | # CONFIG_SCSI_INITIO is not set |
| 440 | # CONFIG_SCSI_INIA100 is not set | 450 | # CONFIG_SCSI_INIA100 is not set |
| 451 | # CONFIG_SCSI_STEX is not set | ||
| 441 | # CONFIG_SCSI_SYM53C8XX_2 is not set | 452 | # CONFIG_SCSI_SYM53C8XX_2 is not set |
| 442 | # CONFIG_SCSI_IPR is not set | 453 | # CONFIG_SCSI_IPR is not set |
| 443 | # CONFIG_SCSI_QLOGIC_1280 is not set | 454 | # CONFIG_SCSI_QLOGIC_1280 is not set |
| 444 | # CONFIG_SCSI_QLA_FC is not set | 455 | # CONFIG_SCSI_QLA_FC is not set |
| 456 | # CONFIG_SCSI_QLA_ISCSI is not set | ||
| 445 | # CONFIG_SCSI_LPFC is not set | 457 | # CONFIG_SCSI_LPFC is not set |
| 446 | # CONFIG_SCSI_DC395x is not set | 458 | # CONFIG_SCSI_DC395x is not set |
| 447 | # CONFIG_SCSI_DC390T is not set | 459 | # CONFIG_SCSI_DC390T is not set |
| 448 | # CONFIG_SCSI_NSP32 is not set | 460 | # CONFIG_SCSI_NSP32 is not set |
| 449 | # CONFIG_SCSI_DEBUG is not set | 461 | # CONFIG_SCSI_DEBUG is not set |
| 462 | # CONFIG_SCSI_SRP is not set | ||
| 463 | |||
| 464 | # | ||
| 465 | # Serial ATA (prod) and Parallel ATA (experimental) drivers | ||
| 466 | # | ||
| 467 | CONFIG_ATA=y | ||
| 468 | # CONFIG_SATA_AHCI is not set | ||
| 469 | # CONFIG_SATA_SVW is not set | ||
| 470 | # CONFIG_ATA_PIIX is not set | ||
| 471 | CONFIG_SATA_MV=y | ||
| 472 | # CONFIG_SATA_NV is not set | ||
| 473 | # CONFIG_PDC_ADMA is not set | ||
| 474 | # CONFIG_SATA_QSTOR is not set | ||
| 475 | # CONFIG_SATA_PROMISE is not set | ||
| 476 | # CONFIG_SATA_SX4 is not set | ||
| 477 | # CONFIG_SATA_SIL is not set | ||
| 478 | # CONFIG_SATA_SIL24 is not set | ||
| 479 | # CONFIG_SATA_SIS is not set | ||
| 480 | # CONFIG_SATA_ULI is not set | ||
| 481 | # CONFIG_SATA_VIA is not set | ||
| 482 | # CONFIG_SATA_VITESSE is not set | ||
| 483 | # CONFIG_PATA_ALI is not set | ||
| 484 | # CONFIG_PATA_AMD is not set | ||
| 485 | # CONFIG_PATA_ARTOP is not set | ||
| 486 | # CONFIG_PATA_ATIIXP is not set | ||
| 487 | # CONFIG_PATA_CMD64X is not set | ||
| 488 | # CONFIG_PATA_CS5520 is not set | ||
| 489 | # CONFIG_PATA_CS5530 is not set | ||
| 490 | # CONFIG_PATA_CYPRESS is not set | ||
| 491 | # CONFIG_PATA_EFAR is not set | ||
| 492 | # CONFIG_ATA_GENERIC is not set | ||
| 493 | # CONFIG_PATA_HPT366 is not set | ||
| 494 | # CONFIG_PATA_HPT37X is not set | ||
| 495 | # CONFIG_PATA_HPT3X2N is not set | ||
| 496 | # CONFIG_PATA_HPT3X3 is not set | ||
| 497 | # CONFIG_PATA_IT821X is not set | ||
| 498 | # CONFIG_PATA_JMICRON is not set | ||
| 499 | # CONFIG_PATA_TRIFLEX is not set | ||
| 500 | # CONFIG_PATA_MARVELL is not set | ||
| 501 | # CONFIG_PATA_MPIIX is not set | ||
| 502 | # CONFIG_PATA_OLDPIIX is not set | ||
| 503 | # CONFIG_PATA_NETCELL is not set | ||
| 504 | # CONFIG_PATA_NS87410 is not set | ||
| 505 | # CONFIG_PATA_OPTI is not set | ||
| 506 | # CONFIG_PATA_OPTIDMA is not set | ||
| 507 | # CONFIG_PATA_PDC_OLD is not set | ||
| 508 | # CONFIG_PATA_RADISYS is not set | ||
| 509 | # CONFIG_PATA_RZ1000 is not set | ||
| 510 | # CONFIG_PATA_SC1200 is not set | ||
| 511 | # CONFIG_PATA_SERVERWORKS is not set | ||
| 512 | # CONFIG_PATA_PDC2027X is not set | ||
| 513 | # CONFIG_PATA_SIL680 is not set | ||
| 514 | # CONFIG_PATA_SIS is not set | ||
| 515 | # CONFIG_PATA_VIA is not set | ||
| 516 | # CONFIG_PATA_WINBOND is not set | ||
| 517 | # CONFIG_PATA_PLATFORM is not set | ||
| 450 | 518 | ||
| 451 | # | 519 | # |
| 452 | # Multi-device support (RAID and LVM) | 520 | # Multi-device support (RAID and LVM) |
| @@ -474,6 +542,7 @@ CONFIG_SATA_MV=y | |||
| 474 | # | 542 | # |
| 475 | # Macintosh device drivers | 543 | # Macintosh device drivers |
| 476 | # | 544 | # |
| 545 | # CONFIG_MAC_EMUMOUSEBTN is not set | ||
| 477 | # CONFIG_WINDFARM is not set | 546 | # CONFIG_WINDFARM is not set |
| 478 | 547 | ||
| 479 | # | 548 | # |
| @@ -505,6 +574,7 @@ CONFIG_PHYLIB=y | |||
| 505 | # CONFIG_CICADA_PHY is not set | 574 | # CONFIG_CICADA_PHY is not set |
| 506 | # CONFIG_VITESSE_PHY is not set | 575 | # CONFIG_VITESSE_PHY is not set |
| 507 | # CONFIG_SMSC_PHY is not set | 576 | # CONFIG_SMSC_PHY is not set |
| 577 | # CONFIG_BROADCOM_PHY is not set | ||
| 508 | # CONFIG_FIXED_PHY is not set | 578 | # CONFIG_FIXED_PHY is not set |
| 509 | 579 | ||
| 510 | # | 580 | # |
| @@ -563,6 +633,8 @@ CONFIG_8139TOO=y | |||
| 563 | # CONFIG_VIA_VELOCITY is not set | 633 | # CONFIG_VIA_VELOCITY is not set |
| 564 | # CONFIG_TIGON3 is not set | 634 | # CONFIG_TIGON3 is not set |
| 565 | # CONFIG_BNX2 is not set | 635 | # CONFIG_BNX2 is not set |
| 636 | CONFIG_TSI108_ETH=y | ||
| 637 | # CONFIG_QLA3XXX is not set | ||
| 566 | 638 | ||
| 567 | # | 639 | # |
| 568 | # Ethernet (10000 Mbit) | 640 | # Ethernet (10000 Mbit) |
| @@ -571,6 +643,7 @@ CONFIG_8139TOO=y | |||
| 571 | # CONFIG_IXGB is not set | 643 | # CONFIG_IXGB is not set |
| 572 | # CONFIG_S2IO is not set | 644 | # CONFIG_S2IO is not set |
| 573 | # CONFIG_MYRI10GE is not set | 645 | # CONFIG_MYRI10GE is not set |
| 646 | # CONFIG_NETXEN_NIC is not set | ||
| 574 | 647 | ||
| 575 | # | 648 | # |
| 576 | # Token Ring devices | 649 | # Token Ring devices |
| @@ -610,6 +683,7 @@ CONFIG_8139TOO=y | |||
| 610 | # Input device support | 683 | # Input device support |
| 611 | # | 684 | # |
| 612 | CONFIG_INPUT=y | 685 | CONFIG_INPUT=y |
| 686 | # CONFIG_INPUT_FF_MEMLESS is not set | ||
| 613 | 687 | ||
| 614 | # | 688 | # |
| 615 | # Userland interfaces | 689 | # Userland interfaces |
| @@ -654,6 +728,7 @@ CONFIG_SERIAL_8250_RUNTIME_UARTS=4 | |||
| 654 | # | 728 | # |
| 655 | # Non-8250 serial port support | 729 | # Non-8250 serial port support |
| 656 | # | 730 | # |
| 731 | # CONFIG_SERIAL_UARTLITE is not set | ||
| 657 | CONFIG_SERIAL_CORE=y | 732 | CONFIG_SERIAL_CORE=y |
| 658 | CONFIG_SERIAL_CORE_CONSOLE=y | 733 | CONFIG_SERIAL_CORE_CONSOLE=y |
| 659 | # CONFIG_SERIAL_JSM is not set | 734 | # CONFIG_SERIAL_JSM is not set |
| @@ -677,10 +752,6 @@ CONFIG_GEN_RTC=y | |||
| 677 | # CONFIG_DTLK is not set | 752 | # CONFIG_DTLK is not set |
| 678 | # CONFIG_R3964 is not set | 753 | # CONFIG_R3964 is not set |
| 679 | # CONFIG_APPLICOM is not set | 754 | # CONFIG_APPLICOM is not set |
| 680 | |||
| 681 | # | ||
| 682 | # Ftape, the floppy tape device driver | ||
| 683 | # | ||
| 684 | # CONFIG_AGP is not set | 755 | # CONFIG_AGP is not set |
| 685 | # CONFIG_DRM is not set | 756 | # CONFIG_DRM is not set |
| 686 | # CONFIG_RAW_DRIVER is not set | 757 | # CONFIG_RAW_DRIVER is not set |
| @@ -689,7 +760,6 @@ CONFIG_GEN_RTC=y | |||
| 689 | # TPM devices | 760 | # TPM devices |
| 690 | # | 761 | # |
| 691 | # CONFIG_TCG_TPM is not set | 762 | # CONFIG_TCG_TPM is not set |
| 692 | # CONFIG_TELCLOCK is not set | ||
| 693 | 763 | ||
| 694 | # | 764 | # |
| 695 | # I2C support | 765 | # I2C support |
| @@ -705,6 +775,7 @@ CONFIG_GEN_RTC=y | |||
| 705 | # | 775 | # |
| 706 | # Dallas's 1-wire bus | 776 | # Dallas's 1-wire bus |
| 707 | # | 777 | # |
| 778 | # CONFIG_W1 is not set | ||
| 708 | 779 | ||
| 709 | # | 780 | # |
| 710 | # Hardware Monitoring support | 781 | # Hardware Monitoring support |
| @@ -713,17 +784,14 @@ CONFIG_HWMON=y | |||
| 713 | # CONFIG_HWMON_VID is not set | 784 | # CONFIG_HWMON_VID is not set |
| 714 | # CONFIG_SENSORS_ABITUGURU is not set | 785 | # CONFIG_SENSORS_ABITUGURU is not set |
| 715 | # CONFIG_SENSORS_F71805F is not set | 786 | # CONFIG_SENSORS_F71805F is not set |
| 787 | # CONFIG_SENSORS_PC87427 is not set | ||
| 788 | # CONFIG_SENSORS_VT1211 is not set | ||
| 716 | # CONFIG_HWMON_DEBUG_CHIP is not set | 789 | # CONFIG_HWMON_DEBUG_CHIP is not set |
| 717 | 790 | ||
| 718 | # | 791 | # |
| 719 | # Misc devices | ||
| 720 | # | ||
| 721 | |||
| 722 | # | ||
| 723 | # Multimedia devices | 792 | # Multimedia devices |
| 724 | # | 793 | # |
| 725 | # CONFIG_VIDEO_DEV is not set | 794 | # CONFIG_VIDEO_DEV is not set |
| 726 | CONFIG_VIDEO_V4L2=y | ||
| 727 | 795 | ||
| 728 | # | 796 | # |
| 729 | # Digital Video Broadcasting Devices | 797 | # Digital Video Broadcasting Devices |
| @@ -735,6 +803,7 @@ CONFIG_VIDEO_V4L2=y | |||
| 735 | # | 803 | # |
| 736 | CONFIG_FIRMWARE_EDID=y | 804 | CONFIG_FIRMWARE_EDID=y |
| 737 | # CONFIG_FB is not set | 805 | # CONFIG_FB is not set |
| 806 | # CONFIG_FB_IBM_GXT4500 is not set | ||
| 738 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set | 807 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set |
| 739 | 808 | ||
| 740 | # | 809 | # |
| @@ -743,6 +812,11 @@ CONFIG_FIRMWARE_EDID=y | |||
| 743 | # CONFIG_SOUND is not set | 812 | # CONFIG_SOUND is not set |
| 744 | 813 | ||
| 745 | # | 814 | # |
| 815 | # HID Devices | ||
| 816 | # | ||
| 817 | CONFIG_HID=y | ||
| 818 | |||
| 819 | # | ||
| 746 | # USB support | 820 | # USB support |
| 747 | # | 821 | # |
| 748 | CONFIG_USB_ARCH_HAS_HCD=y | 822 | CONFIG_USB_ARCH_HAS_HCD=y |
| @@ -805,6 +879,10 @@ CONFIG_USB_ARCH_HAS_EHCI=y | |||
| 805 | # | 879 | # |
| 806 | 880 | ||
| 807 | # | 881 | # |
| 882 | # Virtualization | ||
| 883 | # | ||
| 884 | |||
| 885 | # | ||
| 808 | # File systems | 886 | # File systems |
| 809 | # | 887 | # |
| 810 | CONFIG_EXT2_FS=y | 888 | CONFIG_EXT2_FS=y |
| @@ -814,6 +892,7 @@ CONFIG_EXT3_FS=y | |||
| 814 | CONFIG_EXT3_FS_XATTR=y | 892 | CONFIG_EXT3_FS_XATTR=y |
| 815 | # CONFIG_EXT3_FS_POSIX_ACL is not set | 893 | # CONFIG_EXT3_FS_POSIX_ACL is not set |
| 816 | # CONFIG_EXT3_FS_SECURITY is not set | 894 | # CONFIG_EXT3_FS_SECURITY is not set |
| 895 | # CONFIG_EXT4DEV_FS is not set | ||
| 817 | CONFIG_JBD=y | 896 | CONFIG_JBD=y |
| 818 | # CONFIG_JBD_DEBUG is not set | 897 | # CONFIG_JBD_DEBUG is not set |
| 819 | CONFIG_FS_MBCACHE=y | 898 | CONFIG_FS_MBCACHE=y |
| @@ -821,6 +900,7 @@ CONFIG_FS_MBCACHE=y | |||
| 821 | # CONFIG_JFS_FS is not set | 900 | # CONFIG_JFS_FS is not set |
| 822 | # CONFIG_FS_POSIX_ACL is not set | 901 | # CONFIG_FS_POSIX_ACL is not set |
| 823 | # CONFIG_XFS_FS is not set | 902 | # CONFIG_XFS_FS is not set |
| 903 | # CONFIG_GFS2_FS is not set | ||
| 824 | # CONFIG_OCFS2_FS is not set | 904 | # CONFIG_OCFS2_FS is not set |
| 825 | # CONFIG_MINIX_FS is not set | 905 | # CONFIG_MINIX_FS is not set |
| 826 | # CONFIG_ROMFS_FS is not set | 906 | # CONFIG_ROMFS_FS is not set |
| @@ -850,8 +930,10 @@ CONFIG_DNOTIFY=y | |||
| 850 | # | 930 | # |
| 851 | CONFIG_PROC_FS=y | 931 | CONFIG_PROC_FS=y |
| 852 | CONFIG_PROC_KCORE=y | 932 | CONFIG_PROC_KCORE=y |
| 933 | CONFIG_PROC_SYSCTL=y | ||
| 853 | CONFIG_SYSFS=y | 934 | CONFIG_SYSFS=y |
| 854 | CONFIG_TMPFS=y | 935 | CONFIG_TMPFS=y |
| 936 | # CONFIG_TMPFS_POSIX_ACL is not set | ||
| 855 | # CONFIG_HUGETLB_PAGE is not set | 937 | # CONFIG_HUGETLB_PAGE is not set |
| 856 | CONFIG_RAMFS=y | 938 | CONFIG_RAMFS=y |
| 857 | # CONFIG_CONFIGFS_FS is not set | 939 | # CONFIG_CONFIGFS_FS is not set |
| @@ -921,13 +1003,20 @@ CONFIG_MSDOS_PARTITION=y | |||
| 921 | # CONFIG_NLS is not set | 1003 | # CONFIG_NLS is not set |
| 922 | 1004 | ||
| 923 | # | 1005 | # |
| 1006 | # Distributed Lock Manager | ||
| 1007 | # | ||
| 1008 | # CONFIG_DLM is not set | ||
| 1009 | |||
| 1010 | # | ||
| 924 | # Library routines | 1011 | # Library routines |
| 925 | # | 1012 | # |
| 1013 | CONFIG_BITREVERSE=y | ||
| 926 | # CONFIG_CRC_CCITT is not set | 1014 | # CONFIG_CRC_CCITT is not set |
| 927 | # CONFIG_CRC16 is not set | 1015 | # CONFIG_CRC16 is not set |
| 928 | CONFIG_CRC32=y | 1016 | CONFIG_CRC32=y |
| 929 | # CONFIG_LIBCRC32C is not set | 1017 | # CONFIG_LIBCRC32C is not set |
| 930 | CONFIG_PLIST=y | 1018 | CONFIG_PLIST=y |
| 1019 | CONFIG_IOMAP_COPY=y | ||
| 931 | 1020 | ||
| 932 | # | 1021 | # |
| 933 | # Instrumentation Support | 1022 | # Instrumentation Support |
| @@ -938,12 +1027,14 @@ CONFIG_PLIST=y | |||
| 938 | # Kernel hacking | 1027 | # Kernel hacking |
| 939 | # | 1028 | # |
| 940 | # CONFIG_PRINTK_TIME is not set | 1029 | # CONFIG_PRINTK_TIME is not set |
| 1030 | CONFIG_ENABLE_MUST_CHECK=y | ||
| 941 | # CONFIG_MAGIC_SYSRQ is not set | 1031 | # CONFIG_MAGIC_SYSRQ is not set |
| 942 | # CONFIG_UNUSED_SYMBOLS is not set | 1032 | # CONFIG_UNUSED_SYMBOLS is not set |
| 1033 | # CONFIG_DEBUG_FS is not set | ||
| 1034 | # CONFIG_HEADERS_CHECK is not set | ||
| 943 | # CONFIG_DEBUG_KERNEL is not set | 1035 | # CONFIG_DEBUG_KERNEL is not set |
| 944 | CONFIG_LOG_BUF_SHIFT=14 | 1036 | CONFIG_LOG_BUF_SHIFT=14 |
| 945 | # CONFIG_DEBUG_FS is not set | 1037 | # CONFIG_DEBUG_BUGVERBOSE is not set |
| 946 | # CONFIG_UNWIND_INFO is not set | ||
| 947 | # CONFIG_BOOTX_TEXT is not set | 1038 | # CONFIG_BOOTX_TEXT is not set |
| 948 | # CONFIG_PPC_EARLY_DEBUG is not set | 1039 | # CONFIG_PPC_EARLY_DEBUG is not set |
| 949 | 1040 | ||
| @@ -957,7 +1048,3 @@ CONFIG_LOG_BUF_SHIFT=14 | |||
| 957 | # Cryptographic options | 1048 | # Cryptographic options |
| 958 | # | 1049 | # |
| 959 | # CONFIG_CRYPTO is not set | 1050 | # CONFIG_CRYPTO is not set |
| 960 | |||
| 961 | # | ||
| 962 | # Hardware crypto devices | ||
| 963 | # | ||
diff --git a/arch/powerpc/configs/mpc834x_itx_defconfig b/arch/powerpc/configs/mpc834x_itx_defconfig index 0561b73a918f..45757b613702 100644 --- a/arch/powerpc/configs/mpc834x_itx_defconfig +++ b/arch/powerpc/configs/mpc834x_itx_defconfig | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.18 | 3 | # Linux kernel version: 2.6.20-rc5 |
| 4 | # Mon Sep 25 19:41:14 2006 | 4 | # Mon Jan 22 22:23:43 2007 |
| 5 | # | 5 | # |
| 6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
| 7 | CONFIG_PPC32=y | 7 | CONFIG_PPC32=y |
| @@ -10,6 +10,7 @@ CONFIG_MMU=y | |||
| 10 | CONFIG_GENERIC_HARDIRQS=y | 10 | CONFIG_GENERIC_HARDIRQS=y |
| 11 | CONFIG_IRQ_PER_CPU=y | 11 | CONFIG_IRQ_PER_CPU=y |
| 12 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 12 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
| 13 | CONFIG_ARCH_HAS_ILOG2_U32=y | ||
| 13 | CONFIG_GENERIC_HWEIGHT=y | 14 | CONFIG_GENERIC_HWEIGHT=y |
| 14 | CONFIG_GENERIC_CALIBRATE_DELAY=y | 15 | CONFIG_GENERIC_CALIBRATE_DELAY=y |
| 15 | CONFIG_GENERIC_FIND_NEXT_BIT=y | 16 | CONFIG_GENERIC_FIND_NEXT_BIT=y |
| @@ -22,13 +23,13 @@ CONFIG_PPC_OF=y | |||
| 22 | CONFIG_PPC_UDBG_16550=y | 23 | CONFIG_PPC_UDBG_16550=y |
| 23 | # CONFIG_GENERIC_TBSYNC is not set | 24 | # CONFIG_GENERIC_TBSYNC is not set |
| 24 | CONFIG_AUDIT_ARCH=y | 25 | CONFIG_AUDIT_ARCH=y |
| 26 | CONFIG_GENERIC_BUG=y | ||
| 25 | CONFIG_DEFAULT_UIMAGE=y | 27 | CONFIG_DEFAULT_UIMAGE=y |
| 26 | 28 | ||
| 27 | # | 29 | # |
| 28 | # Processor support | 30 | # Processor support |
| 29 | # | 31 | # |
| 30 | # CONFIG_CLASSIC32 is not set | 32 | # CONFIG_CLASSIC32 is not set |
| 31 | # CONFIG_PPC_52xx is not set | ||
| 32 | # CONFIG_PPC_82xx is not set | 33 | # CONFIG_PPC_82xx is not set |
| 33 | CONFIG_PPC_83xx=y | 34 | CONFIG_PPC_83xx=y |
| 34 | # CONFIG_PPC_85xx is not set | 35 | # CONFIG_PPC_85xx is not set |
| @@ -40,6 +41,8 @@ CONFIG_PPC_83xx=y | |||
| 40 | CONFIG_6xx=y | 41 | CONFIG_6xx=y |
| 41 | CONFIG_83xx=y | 42 | CONFIG_83xx=y |
| 42 | CONFIG_PPC_FPU=y | 43 | CONFIG_PPC_FPU=y |
| 44 | # CONFIG_PPC_DCR_NATIVE is not set | ||
| 45 | # CONFIG_PPC_DCR_MMIO is not set | ||
| 43 | CONFIG_PPC_STD_MMU=y | 46 | CONFIG_PPC_STD_MMU=y |
| 44 | CONFIG_PPC_STD_MMU_32=y | 47 | CONFIG_PPC_STD_MMU_32=y |
| 45 | # CONFIG_SMP is not set | 48 | # CONFIG_SMP is not set |
| @@ -59,16 +62,20 @@ CONFIG_LOCALVERSION="" | |||
| 59 | CONFIG_LOCALVERSION_AUTO=y | 62 | CONFIG_LOCALVERSION_AUTO=y |
| 60 | CONFIG_SWAP=y | 63 | CONFIG_SWAP=y |
| 61 | CONFIG_SYSVIPC=y | 64 | CONFIG_SYSVIPC=y |
| 65 | # CONFIG_IPC_NS is not set | ||
| 62 | # CONFIG_POSIX_MQUEUE is not set | 66 | # CONFIG_POSIX_MQUEUE is not set |
| 63 | # CONFIG_BSD_PROCESS_ACCT is not set | 67 | # CONFIG_BSD_PROCESS_ACCT is not set |
| 64 | # CONFIG_TASKSTATS is not set | 68 | # CONFIG_TASKSTATS is not set |
| 69 | # CONFIG_UTS_NS is not set | ||
| 65 | # CONFIG_AUDIT is not set | 70 | # CONFIG_AUDIT is not set |
| 66 | # CONFIG_IKCONFIG is not set | 71 | # CONFIG_IKCONFIG is not set |
| 72 | CONFIG_SYSFS_DEPRECATED=y | ||
| 67 | # CONFIG_RELAY is not set | 73 | # CONFIG_RELAY is not set |
| 68 | CONFIG_INITRAMFS_SOURCE="" | 74 | CONFIG_INITRAMFS_SOURCE="" |
| 69 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | 75 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set |
| 70 | CONFIG_EMBEDDED=y | ||
| 71 | CONFIG_SYSCTL=y | 76 | CONFIG_SYSCTL=y |
| 77 | CONFIG_EMBEDDED=y | ||
| 78 | CONFIG_SYSCTL_SYSCALL=y | ||
| 72 | # CONFIG_KALLSYMS is not set | 79 | # CONFIG_KALLSYMS is not set |
| 73 | CONFIG_HOTPLUG=y | 80 | CONFIG_HOTPLUG=y |
| 74 | CONFIG_PRINTK=y | 81 | CONFIG_PRINTK=y |
| @@ -98,6 +105,7 @@ CONFIG_MODULE_UNLOAD=y | |||
| 98 | # | 105 | # |
| 99 | # Block layer | 106 | # Block layer |
| 100 | # | 107 | # |
| 108 | CONFIG_BLOCK=y | ||
| 101 | # CONFIG_LBD is not set | 109 | # CONFIG_LBD is not set |
| 102 | # CONFIG_BLK_DEV_IO_TRACE is not set | 110 | # CONFIG_BLK_DEV_IO_TRACE is not set |
| 103 | # CONFIG_LSF is not set | 111 | # CONFIG_LSF is not set |
| @@ -120,8 +128,10 @@ CONFIG_PPC_GEN550=y | |||
| 120 | # | 128 | # |
| 121 | # Platform support | 129 | # Platform support |
| 122 | # | 130 | # |
| 131 | # CONFIG_MPC832x_MDS is not set | ||
| 123 | # CONFIG_MPC834x_SYS is not set | 132 | # CONFIG_MPC834x_SYS is not set |
| 124 | CONFIG_MPC834x_ITX=y | 133 | CONFIG_MPC834x_ITX=y |
| 134 | # CONFIG_MPC8360E_PB is not set | ||
| 125 | CONFIG_MPC834x=y | 135 | CONFIG_MPC834x=y |
| 126 | # CONFIG_MPIC is not set | 136 | # CONFIG_MPIC is not set |
| 127 | 137 | ||
| @@ -131,6 +141,7 @@ CONFIG_MPC834x=y | |||
| 131 | # CONFIG_HIGHMEM is not set | 141 | # CONFIG_HIGHMEM is not set |
| 132 | # CONFIG_HZ_100 is not set | 142 | # CONFIG_HZ_100 is not set |
| 133 | CONFIG_HZ_250=y | 143 | CONFIG_HZ_250=y |
| 144 | # CONFIG_HZ_300 is not set | ||
| 134 | # CONFIG_HZ_1000 is not set | 145 | # CONFIG_HZ_1000 is not set |
| 135 | CONFIG_HZ=250 | 146 | CONFIG_HZ=250 |
| 136 | CONFIG_PREEMPT_NONE=y | 147 | CONFIG_PREEMPT_NONE=y |
| @@ -138,8 +149,10 @@ CONFIG_PREEMPT_NONE=y | |||
| 138 | # CONFIG_PREEMPT is not set | 149 | # CONFIG_PREEMPT is not set |
| 139 | CONFIG_BINFMT_ELF=y | 150 | CONFIG_BINFMT_ELF=y |
| 140 | # CONFIG_BINFMT_MISC is not set | 151 | # CONFIG_BINFMT_MISC is not set |
| 152 | CONFIG_MATH_EMULATION=y | ||
| 141 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y | 153 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y |
| 142 | CONFIG_ARCH_FLATMEM_ENABLE=y | 154 | CONFIG_ARCH_FLATMEM_ENABLE=y |
| 155 | CONFIG_ARCH_POPULATES_NODE_MAP=y | ||
| 143 | CONFIG_SELECT_MEMORY_MODEL=y | 156 | CONFIG_SELECT_MEMORY_MODEL=y |
| 144 | CONFIG_FLATMEM_MANUAL=y | 157 | CONFIG_FLATMEM_MANUAL=y |
| 145 | # CONFIG_DISCONTIGMEM_MANUAL is not set | 158 | # CONFIG_DISCONTIGMEM_MANUAL is not set |
| @@ -206,6 +219,7 @@ CONFIG_PACKET=y | |||
| 206 | CONFIG_UNIX=y | 219 | CONFIG_UNIX=y |
| 207 | CONFIG_XFRM=y | 220 | CONFIG_XFRM=y |
| 208 | # CONFIG_XFRM_USER is not set | 221 | # CONFIG_XFRM_USER is not set |
| 222 | # CONFIG_XFRM_SUB_POLICY is not set | ||
| 209 | # CONFIG_NET_KEY is not set | 223 | # CONFIG_NET_KEY is not set |
| 210 | CONFIG_INET=y | 224 | CONFIG_INET=y |
| 211 | CONFIG_IP_MULTICAST=y | 225 | CONFIG_IP_MULTICAST=y |
| @@ -227,10 +241,13 @@ CONFIG_SYN_COOKIES=y | |||
| 227 | # CONFIG_INET_TUNNEL is not set | 241 | # CONFIG_INET_TUNNEL is not set |
| 228 | CONFIG_INET_XFRM_MODE_TRANSPORT=y | 242 | CONFIG_INET_XFRM_MODE_TRANSPORT=y |
| 229 | CONFIG_INET_XFRM_MODE_TUNNEL=y | 243 | CONFIG_INET_XFRM_MODE_TUNNEL=y |
| 244 | CONFIG_INET_XFRM_MODE_BEET=y | ||
| 230 | CONFIG_INET_DIAG=y | 245 | CONFIG_INET_DIAG=y |
| 231 | CONFIG_INET_TCP_DIAG=y | 246 | CONFIG_INET_TCP_DIAG=y |
| 232 | # CONFIG_TCP_CONG_ADVANCED is not set | 247 | # CONFIG_TCP_CONG_ADVANCED is not set |
| 233 | CONFIG_TCP_CONG_BIC=y | 248 | CONFIG_TCP_CONG_CUBIC=y |
| 249 | CONFIG_DEFAULT_TCP_CONG="cubic" | ||
| 250 | # CONFIG_TCP_MD5SIG is not set | ||
| 234 | # CONFIG_IPV6 is not set | 251 | # CONFIG_IPV6 is not set |
| 235 | # CONFIG_INET6_XFRM_TUNNEL is not set | 252 | # CONFIG_INET6_XFRM_TUNNEL is not set |
| 236 | # CONFIG_INET6_TUNNEL is not set | 253 | # CONFIG_INET6_TUNNEL is not set |
| @@ -411,9 +428,16 @@ CONFIG_BLK_DEV_INITRD=y | |||
| 411 | # CONFIG_ATA_OVER_ETH is not set | 428 | # CONFIG_ATA_OVER_ETH is not set |
| 412 | 429 | ||
| 413 | # | 430 | # |
| 431 | # Misc devices | ||
| 432 | # | ||
| 433 | # CONFIG_SGI_IOC4 is not set | ||
| 434 | # CONFIG_TIFM_CORE is not set | ||
| 435 | |||
| 436 | # | ||
| 414 | # ATA/ATAPI/MFM/RLL support | 437 | # ATA/ATAPI/MFM/RLL support |
| 415 | # | 438 | # |
| 416 | CONFIG_IDE=y | 439 | CONFIG_IDE=y |
| 440 | CONFIG_IDE_MAX_HWIFS=4 | ||
| 417 | # CONFIG_BLK_DEV_IDE is not set | 441 | # CONFIG_BLK_DEV_IDE is not set |
| 418 | # CONFIG_BLK_DEV_HD_ONLY is not set | 442 | # CONFIG_BLK_DEV_HD_ONLY is not set |
| 419 | # CONFIG_BLK_DEV_HD is not set | 443 | # CONFIG_BLK_DEV_HD is not set |
| @@ -423,6 +447,8 @@ CONFIG_IDE=y | |||
| 423 | # | 447 | # |
| 424 | # CONFIG_RAID_ATTRS is not set | 448 | # CONFIG_RAID_ATTRS is not set |
| 425 | CONFIG_SCSI=y | 449 | CONFIG_SCSI=y |
| 450 | # CONFIG_SCSI_TGT is not set | ||
| 451 | # CONFIG_SCSI_NETLINK is not set | ||
| 426 | CONFIG_SCSI_PROC_FS=y | 452 | CONFIG_SCSI_PROC_FS=y |
| 427 | 453 | ||
| 428 | # | 454 | # |
| @@ -441,14 +467,16 @@ CONFIG_CHR_DEV_SG=y | |||
| 441 | # CONFIG_SCSI_MULTI_LUN is not set | 467 | # CONFIG_SCSI_MULTI_LUN is not set |
| 442 | # CONFIG_SCSI_CONSTANTS is not set | 468 | # CONFIG_SCSI_CONSTANTS is not set |
| 443 | # CONFIG_SCSI_LOGGING is not set | 469 | # CONFIG_SCSI_LOGGING is not set |
| 470 | # CONFIG_SCSI_SCAN_ASYNC is not set | ||
| 444 | 471 | ||
| 445 | # | 472 | # |
| 446 | # SCSI Transport Attributes | 473 | # SCSI Transports |
| 447 | # | 474 | # |
| 448 | CONFIG_SCSI_SPI_ATTRS=y | 475 | CONFIG_SCSI_SPI_ATTRS=y |
| 449 | # CONFIG_SCSI_FC_ATTRS is not set | 476 | # CONFIG_SCSI_FC_ATTRS is not set |
| 450 | # CONFIG_SCSI_ISCSI_ATTRS is not set | 477 | # CONFIG_SCSI_ISCSI_ATTRS is not set |
| 451 | # CONFIG_SCSI_SAS_ATTRS is not set | 478 | # CONFIG_SCSI_SAS_ATTRS is not set |
| 479 | # CONFIG_SCSI_SAS_LIBSAS is not set | ||
| 452 | 480 | ||
| 453 | # | 481 | # |
| 454 | # SCSI low-level drivers | 482 | # SCSI low-level drivers |
| @@ -461,27 +489,13 @@ CONFIG_SCSI_SPI_ATTRS=y | |||
| 461 | # CONFIG_SCSI_AIC7XXX is not set | 489 | # CONFIG_SCSI_AIC7XXX is not set |
| 462 | # CONFIG_SCSI_AIC7XXX_OLD is not set | 490 | # CONFIG_SCSI_AIC7XXX_OLD is not set |
| 463 | # CONFIG_SCSI_AIC79XX is not set | 491 | # CONFIG_SCSI_AIC79XX is not set |
| 492 | # CONFIG_SCSI_AIC94XX is not set | ||
| 464 | # CONFIG_SCSI_DPT_I2O is not set | 493 | # CONFIG_SCSI_DPT_I2O is not set |
| 494 | # CONFIG_SCSI_ARCMSR is not set | ||
| 465 | # CONFIG_MEGARAID_NEWGEN is not set | 495 | # CONFIG_MEGARAID_NEWGEN is not set |
| 466 | # CONFIG_MEGARAID_LEGACY is not set | 496 | # CONFIG_MEGARAID_LEGACY is not set |
| 467 | # CONFIG_MEGARAID_SAS is not set | 497 | # CONFIG_MEGARAID_SAS is not set |
| 468 | CONFIG_ATA=y | ||
| 469 | # CONFIG_SATA_AHCI is not set | ||
| 470 | # CONFIG_SATA_SVW is not set | ||
| 471 | # CONFIG_SCSI_ATA_PIIX is not set | ||
| 472 | # CONFIG_SATA_MV is not set | ||
| 473 | # CONFIG_SATA_NV is not set | ||
| 474 | # CONFIG_SCSI_PDC_ADMA is not set | ||
| 475 | # CONFIG_SCSI_HPTIOP is not set | 498 | # CONFIG_SCSI_HPTIOP is not set |
| 476 | # CONFIG_SATA_QSTOR is not set | ||
| 477 | # CONFIG_SATA_PROMISE is not set | ||
| 478 | # CONFIG_SATA_SX4 is not set | ||
| 479 | CONFIG_SATA_SIL=y | ||
| 480 | # CONFIG_SATA_SIL24 is not set | ||
| 481 | # CONFIG_SATA_SIS is not set | ||
| 482 | # CONFIG_SATA_ULI is not set | ||
| 483 | # CONFIG_SATA_VIA is not set | ||
| 484 | # CONFIG_SATA_VITESSE is not set | ||
| 485 | # CONFIG_SCSI_BUSLOGIC is not set | 499 | # CONFIG_SCSI_BUSLOGIC is not set |
| 486 | # CONFIG_SCSI_DMX3191D is not set | 500 | # CONFIG_SCSI_DMX3191D is not set |
| 487 | # CONFIG_SCSI_EATA is not set | 501 | # CONFIG_SCSI_EATA is not set |
| @@ -490,15 +504,73 @@ CONFIG_SATA_SIL=y | |||
| 490 | # CONFIG_SCSI_IPS is not set | 504 | # CONFIG_SCSI_IPS is not set |
| 491 | # CONFIG_SCSI_INITIO is not set | 505 | # CONFIG_SCSI_INITIO is not set |
| 492 | # CONFIG_SCSI_INIA100 is not set | 506 | # CONFIG_SCSI_INIA100 is not set |
| 507 | # CONFIG_SCSI_STEX is not set | ||
| 493 | # CONFIG_SCSI_SYM53C8XX_2 is not set | 508 | # CONFIG_SCSI_SYM53C8XX_2 is not set |
| 494 | # CONFIG_SCSI_IPR is not set | 509 | # CONFIG_SCSI_IPR is not set |
| 495 | # CONFIG_SCSI_QLOGIC_1280 is not set | 510 | # CONFIG_SCSI_QLOGIC_1280 is not set |
| 496 | # CONFIG_SCSI_QLA_FC is not set | 511 | # CONFIG_SCSI_QLA_FC is not set |
| 512 | # CONFIG_SCSI_QLA_ISCSI is not set | ||
| 497 | # CONFIG_SCSI_LPFC is not set | 513 | # CONFIG_SCSI_LPFC is not set |
| 498 | # CONFIG_SCSI_DC395x is not set | 514 | # CONFIG_SCSI_DC395x is not set |
| 499 | # CONFIG_SCSI_DC390T is not set | 515 | # CONFIG_SCSI_DC390T is not set |
| 500 | # CONFIG_SCSI_NSP32 is not set | 516 | # CONFIG_SCSI_NSP32 is not set |
| 501 | # CONFIG_SCSI_DEBUG is not set | 517 | # CONFIG_SCSI_DEBUG is not set |
| 518 | # CONFIG_SCSI_SRP is not set | ||
| 519 | |||
| 520 | # | ||
| 521 | # Serial ATA (prod) and Parallel ATA (experimental) drivers | ||
| 522 | # | ||
| 523 | CONFIG_ATA=y | ||
| 524 | # CONFIG_SATA_AHCI is not set | ||
| 525 | # CONFIG_SATA_SVW is not set | ||
| 526 | # CONFIG_ATA_PIIX is not set | ||
| 527 | # CONFIG_SATA_MV is not set | ||
| 528 | # CONFIG_SATA_NV is not set | ||
| 529 | # CONFIG_PDC_ADMA is not set | ||
| 530 | # CONFIG_SATA_QSTOR is not set | ||
| 531 | # CONFIG_SATA_PROMISE is not set | ||
| 532 | # CONFIG_SATA_SX4 is not set | ||
| 533 | CONFIG_SATA_SIL=y | ||
| 534 | # CONFIG_SATA_SIL24 is not set | ||
| 535 | # CONFIG_SATA_SIS is not set | ||
| 536 | # CONFIG_SATA_ULI is not set | ||
| 537 | # CONFIG_SATA_VIA is not set | ||
| 538 | # CONFIG_SATA_VITESSE is not set | ||
| 539 | # CONFIG_PATA_ALI is not set | ||
| 540 | # CONFIG_PATA_AMD is not set | ||
| 541 | # CONFIG_PATA_ARTOP is not set | ||
| 542 | # CONFIG_PATA_ATIIXP is not set | ||
| 543 | # CONFIG_PATA_CMD64X is not set | ||
| 544 | # CONFIG_PATA_CS5520 is not set | ||
| 545 | # CONFIG_PATA_CS5530 is not set | ||
| 546 | # CONFIG_PATA_CYPRESS is not set | ||
| 547 | # CONFIG_PATA_EFAR is not set | ||
| 548 | # CONFIG_ATA_GENERIC is not set | ||
| 549 | # CONFIG_PATA_HPT366 is not set | ||
| 550 | # CONFIG_PATA_HPT37X is not set | ||
| 551 | # CONFIG_PATA_HPT3X2N is not set | ||
| 552 | # CONFIG_PATA_HPT3X3 is not set | ||
| 553 | # CONFIG_PATA_IT821X is not set | ||
| 554 | # CONFIG_PATA_JMICRON is not set | ||
| 555 | # CONFIG_PATA_TRIFLEX is not set | ||
| 556 | # CONFIG_PATA_MARVELL is not set | ||
| 557 | # CONFIG_PATA_MPIIX is not set | ||
| 558 | # CONFIG_PATA_OLDPIIX is not set | ||
| 559 | # CONFIG_PATA_NETCELL is not set | ||
| 560 | # CONFIG_PATA_NS87410 is not set | ||
| 561 | # CONFIG_PATA_OPTI is not set | ||
| 562 | # CONFIG_PATA_OPTIDMA is not set | ||
| 563 | # CONFIG_PATA_PDC_OLD is not set | ||
| 564 | # CONFIG_PATA_RADISYS is not set | ||
| 565 | # CONFIG_PATA_RZ1000 is not set | ||
| 566 | # CONFIG_PATA_SC1200 is not set | ||
| 567 | # CONFIG_PATA_SERVERWORKS is not set | ||
| 568 | # CONFIG_PATA_PDC2027X is not set | ||
| 569 | # CONFIG_PATA_SIL680 is not set | ||
| 570 | # CONFIG_PATA_SIS is not set | ||
| 571 | # CONFIG_PATA_VIA is not set | ||
| 572 | # CONFIG_PATA_WINBOND is not set | ||
| 573 | # CONFIG_PATA_PLATFORM is not set | ||
| 502 | 574 | ||
| 503 | # | 575 | # |
| 504 | # Multi-device support (RAID and LVM) | 576 | # Multi-device support (RAID and LVM) |
| @@ -535,6 +607,7 @@ CONFIG_MD_RAID1=y | |||
| 535 | # | 607 | # |
| 536 | # Macintosh device drivers | 608 | # Macintosh device drivers |
| 537 | # | 609 | # |
| 610 | # CONFIG_MAC_EMUMOUSEBTN is not set | ||
| 538 | # CONFIG_WINDFARM is not set | 611 | # CONFIG_WINDFARM is not set |
| 539 | 612 | ||
| 540 | # | 613 | # |
| @@ -566,6 +639,7 @@ CONFIG_PHYLIB=y | |||
| 566 | CONFIG_CICADA_PHY=y | 639 | CONFIG_CICADA_PHY=y |
| 567 | # CONFIG_VITESSE_PHY is not set | 640 | # CONFIG_VITESSE_PHY is not set |
| 568 | # CONFIG_SMSC_PHY is not set | 641 | # CONFIG_SMSC_PHY is not set |
| 642 | # CONFIG_BROADCOM_PHY is not set | ||
| 569 | # CONFIG_FIXED_PHY is not set | 643 | # CONFIG_FIXED_PHY is not set |
| 570 | 644 | ||
| 571 | # | 645 | # |
| @@ -622,6 +696,7 @@ CONFIG_E100=y | |||
| 622 | # CONFIG_BNX2 is not set | 696 | # CONFIG_BNX2 is not set |
| 623 | CONFIG_GIANFAR=y | 697 | CONFIG_GIANFAR=y |
| 624 | CONFIG_GFAR_NAPI=y | 698 | CONFIG_GFAR_NAPI=y |
| 699 | # CONFIG_QLA3XXX is not set | ||
| 625 | 700 | ||
| 626 | # | 701 | # |
| 627 | # Ethernet (10000 Mbit) | 702 | # Ethernet (10000 Mbit) |
| @@ -630,6 +705,7 @@ CONFIG_GFAR_NAPI=y | |||
| 630 | # CONFIG_IXGB is not set | 705 | # CONFIG_IXGB is not set |
| 631 | # CONFIG_S2IO is not set | 706 | # CONFIG_S2IO is not set |
| 632 | # CONFIG_MYRI10GE is not set | 707 | # CONFIG_MYRI10GE is not set |
| 708 | # CONFIG_NETXEN_NIC is not set | ||
| 633 | 709 | ||
| 634 | # | 710 | # |
| 635 | # Token Ring devices | 711 | # Token Ring devices |
| @@ -669,6 +745,7 @@ CONFIG_GFAR_NAPI=y | |||
| 669 | # Input device support | 745 | # Input device support |
| 670 | # | 746 | # |
| 671 | CONFIG_INPUT=y | 747 | CONFIG_INPUT=y |
| 748 | # CONFIG_INPUT_FF_MEMLESS is not set | ||
| 672 | 749 | ||
| 673 | # | 750 | # |
| 674 | # Userland interfaces | 751 | # Userland interfaces |
| @@ -713,6 +790,7 @@ CONFIG_SERIAL_8250_RUNTIME_UARTS=4 | |||
| 713 | # | 790 | # |
| 714 | # Non-8250 serial port support | 791 | # Non-8250 serial port support |
| 715 | # | 792 | # |
| 793 | # CONFIG_SERIAL_UARTLITE is not set | ||
| 716 | CONFIG_SERIAL_CORE=y | 794 | CONFIG_SERIAL_CORE=y |
| 717 | CONFIG_SERIAL_CORE_CONSOLE=y | 795 | CONFIG_SERIAL_CORE_CONSOLE=y |
| 718 | # CONFIG_SERIAL_JSM is not set | 796 | # CONFIG_SERIAL_JSM is not set |
| @@ -753,10 +831,6 @@ CONFIG_HW_RANDOM=y | |||
| 753 | # CONFIG_DTLK is not set | 831 | # CONFIG_DTLK is not set |
| 754 | # CONFIG_R3964 is not set | 832 | # CONFIG_R3964 is not set |
| 755 | # CONFIG_APPLICOM is not set | 833 | # CONFIG_APPLICOM is not set |
| 756 | |||
| 757 | # | ||
| 758 | # Ftape, the floppy tape device driver | ||
| 759 | # | ||
| 760 | # CONFIG_AGP is not set | 834 | # CONFIG_AGP is not set |
| 761 | # CONFIG_DRM is not set | 835 | # CONFIG_DRM is not set |
| 762 | # CONFIG_RAW_DRIVER is not set | 836 | # CONFIG_RAW_DRIVER is not set |
| @@ -765,7 +839,6 @@ CONFIG_HW_RANDOM=y | |||
| 765 | # TPM devices | 839 | # TPM devices |
| 766 | # | 840 | # |
| 767 | # CONFIG_TCG_TPM is not set | 841 | # CONFIG_TCG_TPM is not set |
| 768 | # CONFIG_TELCLOCK is not set | ||
| 769 | 842 | ||
| 770 | # | 843 | # |
| 771 | # I2C support | 844 | # I2C support |
| @@ -842,6 +915,7 @@ CONFIG_SPI_MPC83xx=y | |||
| 842 | # | 915 | # |
| 843 | # Dallas's 1-wire bus | 916 | # Dallas's 1-wire bus |
| 844 | # | 917 | # |
| 918 | # CONFIG_W1 is not set | ||
| 845 | 919 | ||
| 846 | # | 920 | # |
| 847 | # Hardware Monitoring support | 921 | # Hardware Monitoring support |
| @@ -876,29 +950,27 @@ CONFIG_HWMON=y | |||
| 876 | # CONFIG_SENSORS_LM92 is not set | 950 | # CONFIG_SENSORS_LM92 is not set |
| 877 | # CONFIG_SENSORS_MAX1619 is not set | 951 | # CONFIG_SENSORS_MAX1619 is not set |
| 878 | # CONFIG_SENSORS_PC87360 is not set | 952 | # CONFIG_SENSORS_PC87360 is not set |
| 953 | # CONFIG_SENSORS_PC87427 is not set | ||
| 879 | # CONFIG_SENSORS_SIS5595 is not set | 954 | # CONFIG_SENSORS_SIS5595 is not set |
| 880 | # CONFIG_SENSORS_SMSC47M1 is not set | 955 | # CONFIG_SENSORS_SMSC47M1 is not set |
| 881 | # CONFIG_SENSORS_SMSC47M192 is not set | 956 | # CONFIG_SENSORS_SMSC47M192 is not set |
| 882 | # CONFIG_SENSORS_SMSC47B397 is not set | 957 | # CONFIG_SENSORS_SMSC47B397 is not set |
| 883 | # CONFIG_SENSORS_VIA686A is not set | 958 | # CONFIG_SENSORS_VIA686A is not set |
| 959 | # CONFIG_SENSORS_VT1211 is not set | ||
| 884 | # CONFIG_SENSORS_VT8231 is not set | 960 | # CONFIG_SENSORS_VT8231 is not set |
| 885 | # CONFIG_SENSORS_W83781D is not set | 961 | # CONFIG_SENSORS_W83781D is not set |
| 886 | # CONFIG_SENSORS_W83791D is not set | 962 | # CONFIG_SENSORS_W83791D is not set |
| 887 | # CONFIG_SENSORS_W83792D is not set | 963 | # CONFIG_SENSORS_W83792D is not set |
| 964 | # CONFIG_SENSORS_W83793 is not set | ||
| 888 | # CONFIG_SENSORS_W83L785TS is not set | 965 | # CONFIG_SENSORS_W83L785TS is not set |
| 889 | # CONFIG_SENSORS_W83627HF is not set | 966 | # CONFIG_SENSORS_W83627HF is not set |
| 890 | # CONFIG_SENSORS_W83627EHF is not set | 967 | # CONFIG_SENSORS_W83627EHF is not set |
| 891 | # CONFIG_HWMON_DEBUG_CHIP is not set | 968 | # CONFIG_HWMON_DEBUG_CHIP is not set |
| 892 | 969 | ||
| 893 | # | 970 | # |
| 894 | # Misc devices | ||
| 895 | # | ||
| 896 | |||
| 897 | # | ||
| 898 | # Multimedia devices | 971 | # Multimedia devices |
| 899 | # | 972 | # |
| 900 | # CONFIG_VIDEO_DEV is not set | 973 | # CONFIG_VIDEO_DEV is not set |
| 901 | CONFIG_VIDEO_V4L2=y | ||
| 902 | 974 | ||
| 903 | # | 975 | # |
| 904 | # Digital Video Broadcasting Devices | 976 | # Digital Video Broadcasting Devices |
| @@ -911,6 +983,7 @@ CONFIG_VIDEO_V4L2=y | |||
| 911 | # | 983 | # |
| 912 | CONFIG_FIRMWARE_EDID=y | 984 | CONFIG_FIRMWARE_EDID=y |
| 913 | # CONFIG_FB is not set | 985 | # CONFIG_FB is not set |
| 986 | # CONFIG_FB_IBM_GXT4500 is not set | ||
| 914 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set | 987 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set |
| 915 | 988 | ||
| 916 | # | 989 | # |
| @@ -919,6 +992,11 @@ CONFIG_FIRMWARE_EDID=y | |||
| 919 | # CONFIG_SOUND is not set | 992 | # CONFIG_SOUND is not set |
| 920 | 993 | ||
| 921 | # | 994 | # |
| 995 | # HID Devices | ||
| 996 | # | ||
| 997 | CONFIG_HID=y | ||
| 998 | |||
| 999 | # | ||
| 922 | # USB support | 1000 | # USB support |
| 923 | # | 1001 | # |
| 924 | CONFIG_USB_ARCH_HAS_HCD=y | 1002 | CONFIG_USB_ARCH_HAS_HCD=y |
| @@ -933,6 +1011,7 @@ CONFIG_USB=y | |||
| 933 | CONFIG_USB_DEVICEFS=y | 1011 | CONFIG_USB_DEVICEFS=y |
| 934 | # CONFIG_USB_BANDWIDTH is not set | 1012 | # CONFIG_USB_BANDWIDTH is not set |
| 935 | # CONFIG_USB_DYNAMIC_MINORS is not set | 1013 | # CONFIG_USB_DYNAMIC_MINORS is not set |
| 1014 | # CONFIG_USB_MULTITHREAD_PROBE is not set | ||
| 936 | # CONFIG_USB_OTG is not set | 1015 | # CONFIG_USB_OTG is not set |
| 937 | 1016 | ||
| 938 | # | 1017 | # |
| @@ -972,6 +1051,7 @@ CONFIG_USB_STORAGE=y | |||
| 972 | # CONFIG_USB_STORAGE_SDDR55 is not set | 1051 | # CONFIG_USB_STORAGE_SDDR55 is not set |
| 973 | # CONFIG_USB_STORAGE_JUMPSHOT is not set | 1052 | # CONFIG_USB_STORAGE_JUMPSHOT is not set |
| 974 | # CONFIG_USB_STORAGE_ALAUDA is not set | 1053 | # CONFIG_USB_STORAGE_ALAUDA is not set |
| 1054 | # CONFIG_USB_STORAGE_KARMA is not set | ||
| 975 | # CONFIG_USB_LIBUSUAL is not set | 1055 | # CONFIG_USB_LIBUSUAL is not set |
| 976 | 1056 | ||
| 977 | # | 1057 | # |
| @@ -1010,6 +1090,7 @@ CONFIG_USB_STORAGE=y | |||
| 1010 | # CONFIG_USB_KAWETH is not set | 1090 | # CONFIG_USB_KAWETH is not set |
| 1011 | # CONFIG_USB_PEGASUS is not set | 1091 | # CONFIG_USB_PEGASUS is not set |
| 1012 | # CONFIG_USB_RTL8150 is not set | 1092 | # CONFIG_USB_RTL8150 is not set |
| 1093 | # CONFIG_USB_USBNET_MII is not set | ||
| 1013 | # CONFIG_USB_USBNET is not set | 1094 | # CONFIG_USB_USBNET is not set |
| 1014 | CONFIG_USB_MON=y | 1095 | CONFIG_USB_MON=y |
| 1015 | 1096 | ||
| @@ -1027,6 +1108,7 @@ CONFIG_USB_MON=y | |||
| 1027 | # | 1108 | # |
| 1028 | # CONFIG_USB_EMI62 is not set | 1109 | # CONFIG_USB_EMI62 is not set |
| 1029 | # CONFIG_USB_EMI26 is not set | 1110 | # CONFIG_USB_EMI26 is not set |
| 1111 | # CONFIG_USB_ADUTUX is not set | ||
| 1030 | # CONFIG_USB_AUERSWALD is not set | 1112 | # CONFIG_USB_AUERSWALD is not set |
| 1031 | # CONFIG_USB_RIO500 is not set | 1113 | # CONFIG_USB_RIO500 is not set |
| 1032 | # CONFIG_USB_LEGOTOWER is not set | 1114 | # CONFIG_USB_LEGOTOWER is not set |
| @@ -1034,12 +1116,13 @@ CONFIG_USB_MON=y | |||
| 1034 | # CONFIG_USB_LED is not set | 1116 | # CONFIG_USB_LED is not set |
| 1035 | # CONFIG_USB_CYPRESS_CY7C63 is not set | 1117 | # CONFIG_USB_CYPRESS_CY7C63 is not set |
| 1036 | # CONFIG_USB_CYTHERM is not set | 1118 | # CONFIG_USB_CYTHERM is not set |
| 1037 | # CONFIG_USB_PHIDGETKIT is not set | 1119 | # CONFIG_USB_PHIDGET is not set |
| 1038 | # CONFIG_USB_PHIDGETSERVO is not set | ||
| 1039 | # CONFIG_USB_IDMOUSE is not set | 1120 | # CONFIG_USB_IDMOUSE is not set |
| 1121 | # CONFIG_USB_FTDI_ELAN is not set | ||
| 1040 | # CONFIG_USB_APPLEDISPLAY is not set | 1122 | # CONFIG_USB_APPLEDISPLAY is not set |
| 1041 | # CONFIG_USB_SISUSBVGA is not set | 1123 | # CONFIG_USB_SISUSBVGA is not set |
| 1042 | # CONFIG_USB_LD is not set | 1124 | # CONFIG_USB_LD is not set |
| 1125 | # CONFIG_USB_TRANCEVIBRATOR is not set | ||
| 1043 | # CONFIG_USB_TEST is not set | 1126 | # CONFIG_USB_TEST is not set |
| 1044 | 1127 | ||
| 1045 | # | 1128 | # |
| @@ -1067,6 +1150,7 @@ CONFIG_USB_ETH_RNDIS=y | |||
| 1067 | # CONFIG_USB_GADGETFS is not set | 1150 | # CONFIG_USB_GADGETFS is not set |
| 1068 | # CONFIG_USB_FILE_STORAGE is not set | 1151 | # CONFIG_USB_FILE_STORAGE is not set |
| 1069 | # CONFIG_USB_G_SERIAL is not set | 1152 | # CONFIG_USB_G_SERIAL is not set |
| 1153 | # CONFIG_USB_MIDI_GADGET is not set | ||
| 1070 | 1154 | ||
| 1071 | # | 1155 | # |
| 1072 | # MMC/SD Card support | 1156 | # MMC/SD Card support |
| @@ -1102,6 +1186,7 @@ CONFIG_RTC_LIB=y | |||
| 1102 | CONFIG_RTC_CLASS=y | 1186 | CONFIG_RTC_CLASS=y |
| 1103 | CONFIG_RTC_HCTOSYS=y | 1187 | CONFIG_RTC_HCTOSYS=y |
| 1104 | CONFIG_RTC_HCTOSYS_DEVICE="rtc0" | 1188 | CONFIG_RTC_HCTOSYS_DEVICE="rtc0" |
| 1189 | # CONFIG_RTC_DEBUG is not set | ||
| 1105 | 1190 | ||
| 1106 | # | 1191 | # |
| 1107 | # RTC interfaces | 1192 | # RTC interfaces |
| @@ -1145,6 +1230,10 @@ CONFIG_NET_DMA=y | |||
| 1145 | CONFIG_INTEL_IOATDMA=y | 1230 | CONFIG_INTEL_IOATDMA=y |
| 1146 | 1231 | ||
| 1147 | # | 1232 | # |
| 1233 | # Virtualization | ||
| 1234 | # | ||
| 1235 | |||
| 1236 | # | ||
| 1148 | # File systems | 1237 | # File systems |
| 1149 | # | 1238 | # |
| 1150 | CONFIG_EXT2_FS=y | 1239 | CONFIG_EXT2_FS=y |
| @@ -1154,6 +1243,7 @@ CONFIG_EXT3_FS=y | |||
| 1154 | CONFIG_EXT3_FS_XATTR=y | 1243 | CONFIG_EXT3_FS_XATTR=y |
| 1155 | # CONFIG_EXT3_FS_POSIX_ACL is not set | 1244 | # CONFIG_EXT3_FS_POSIX_ACL is not set |
| 1156 | # CONFIG_EXT3_FS_SECURITY is not set | 1245 | # CONFIG_EXT3_FS_SECURITY is not set |
| 1246 | # CONFIG_EXT4DEV_FS is not set | ||
| 1157 | CONFIG_JBD=y | 1247 | CONFIG_JBD=y |
| 1158 | # CONFIG_JBD_DEBUG is not set | 1248 | # CONFIG_JBD_DEBUG is not set |
| 1159 | CONFIG_FS_MBCACHE=y | 1249 | CONFIG_FS_MBCACHE=y |
| @@ -1161,6 +1251,7 @@ CONFIG_FS_MBCACHE=y | |||
| 1161 | # CONFIG_JFS_FS is not set | 1251 | # CONFIG_JFS_FS is not set |
| 1162 | # CONFIG_FS_POSIX_ACL is not set | 1252 | # CONFIG_FS_POSIX_ACL is not set |
| 1163 | # CONFIG_XFS_FS is not set | 1253 | # CONFIG_XFS_FS is not set |
| 1254 | # CONFIG_GFS2_FS is not set | ||
| 1164 | # CONFIG_OCFS2_FS is not set | 1255 | # CONFIG_OCFS2_FS is not set |
| 1165 | # CONFIG_MINIX_FS is not set | 1256 | # CONFIG_MINIX_FS is not set |
| 1166 | # CONFIG_ROMFS_FS is not set | 1257 | # CONFIG_ROMFS_FS is not set |
| @@ -1190,8 +1281,10 @@ CONFIG_DNOTIFY=y | |||
| 1190 | # | 1281 | # |
| 1191 | CONFIG_PROC_FS=y | 1282 | CONFIG_PROC_FS=y |
| 1192 | CONFIG_PROC_KCORE=y | 1283 | CONFIG_PROC_KCORE=y |
| 1284 | CONFIG_PROC_SYSCTL=y | ||
| 1193 | CONFIG_SYSFS=y | 1285 | CONFIG_SYSFS=y |
| 1194 | CONFIG_TMPFS=y | 1286 | CONFIG_TMPFS=y |
| 1287 | # CONFIG_TMPFS_POSIX_ACL is not set | ||
| 1195 | # CONFIG_HUGETLB_PAGE is not set | 1288 | # CONFIG_HUGETLB_PAGE is not set |
| 1196 | CONFIG_RAMFS=y | 1289 | CONFIG_RAMFS=y |
| 1197 | # CONFIG_CONFIGFS_FS is not set | 1290 | # CONFIG_CONFIGFS_FS is not set |
| @@ -1206,7 +1299,6 @@ CONFIG_RAMFS=y | |||
| 1206 | # CONFIG_BEFS_FS is not set | 1299 | # CONFIG_BEFS_FS is not set |
| 1207 | # CONFIG_BFS_FS is not set | 1300 | # CONFIG_BFS_FS is not set |
| 1208 | # CONFIG_EFS_FS is not set | 1301 | # CONFIG_EFS_FS is not set |
| 1209 | # CONFIG_JFFS_FS is not set | ||
| 1210 | # CONFIG_JFFS2_FS is not set | 1302 | # CONFIG_JFFS2_FS is not set |
| 1211 | # CONFIG_CRAMFS is not set | 1303 | # CONFIG_CRAMFS is not set |
| 1212 | # CONFIG_VXFS_FS is not set | 1304 | # CONFIG_VXFS_FS is not set |
| @@ -1249,6 +1341,10 @@ CONFIG_PARTITION_ADVANCED=y | |||
| 1249 | # CONFIG_ATARI_PARTITION is not set | 1341 | # CONFIG_ATARI_PARTITION is not set |
| 1250 | # CONFIG_MAC_PARTITION is not set | 1342 | # CONFIG_MAC_PARTITION is not set |
| 1251 | CONFIG_MSDOS_PARTITION=y | 1343 | CONFIG_MSDOS_PARTITION=y |
| 1344 | # CONFIG_BSD_DISKLABEL is not set | ||
| 1345 | # CONFIG_MINIX_SUBPARTITION is not set | ||
| 1346 | # CONFIG_SOLARIS_X86_PARTITION is not set | ||
| 1347 | # CONFIG_UNIXWARE_DISKLABEL is not set | ||
| 1252 | # CONFIG_LDM_PARTITION is not set | 1348 | # CONFIG_LDM_PARTITION is not set |
| 1253 | # CONFIG_SGI_PARTITION is not set | 1349 | # CONFIG_SGI_PARTITION is not set |
| 1254 | # CONFIG_ULTRIX_PARTITION is not set | 1350 | # CONFIG_ULTRIX_PARTITION is not set |
| @@ -1262,13 +1358,20 @@ CONFIG_MSDOS_PARTITION=y | |||
| 1262 | # CONFIG_NLS is not set | 1358 | # CONFIG_NLS is not set |
| 1263 | 1359 | ||
| 1264 | # | 1360 | # |
| 1361 | # Distributed Lock Manager | ||
| 1362 | # | ||
| 1363 | # CONFIG_DLM is not set | ||
| 1364 | |||
| 1365 | # | ||
| 1265 | # Library routines | 1366 | # Library routines |
| 1266 | # | 1367 | # |
| 1368 | CONFIG_BITREVERSE=y | ||
| 1267 | # CONFIG_CRC_CCITT is not set | 1369 | # CONFIG_CRC_CCITT is not set |
| 1268 | # CONFIG_CRC16 is not set | 1370 | # CONFIG_CRC16 is not set |
| 1269 | CONFIG_CRC32=y | 1371 | CONFIG_CRC32=y |
| 1270 | # CONFIG_LIBCRC32C is not set | 1372 | # CONFIG_LIBCRC32C is not set |
| 1271 | CONFIG_PLIST=y | 1373 | CONFIG_PLIST=y |
| 1374 | CONFIG_IOMAP_COPY=y | ||
| 1272 | 1375 | ||
| 1273 | # | 1376 | # |
| 1274 | # Instrumentation Support | 1377 | # Instrumentation Support |
| @@ -1279,8 +1382,11 @@ CONFIG_PLIST=y | |||
| 1279 | # Kernel hacking | 1382 | # Kernel hacking |
| 1280 | # | 1383 | # |
| 1281 | # CONFIG_PRINTK_TIME is not set | 1384 | # CONFIG_PRINTK_TIME is not set |
| 1385 | CONFIG_ENABLE_MUST_CHECK=y | ||
| 1282 | # CONFIG_MAGIC_SYSRQ is not set | 1386 | # CONFIG_MAGIC_SYSRQ is not set |
| 1283 | # CONFIG_UNUSED_SYMBOLS is not set | 1387 | # CONFIG_UNUSED_SYMBOLS is not set |
| 1388 | # CONFIG_DEBUG_FS is not set | ||
| 1389 | # CONFIG_HEADERS_CHECK is not set | ||
| 1284 | CONFIG_DEBUG_KERNEL=y | 1390 | CONFIG_DEBUG_KERNEL=y |
| 1285 | CONFIG_LOG_BUF_SHIFT=14 | 1391 | CONFIG_LOG_BUF_SHIFT=14 |
| 1286 | CONFIG_DETECT_SOFTLOCKUP=y | 1392 | CONFIG_DETECT_SOFTLOCKUP=y |
| @@ -1294,9 +1400,10 @@ CONFIG_DETECT_SOFTLOCKUP=y | |||
| 1294 | # CONFIG_DEBUG_SPINLOCK_SLEEP is not set | 1400 | # CONFIG_DEBUG_SPINLOCK_SLEEP is not set |
| 1295 | # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set | 1401 | # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set |
| 1296 | # CONFIG_DEBUG_KOBJECT is not set | 1402 | # CONFIG_DEBUG_KOBJECT is not set |
| 1403 | # CONFIG_DEBUG_BUGVERBOSE is not set | ||
| 1297 | # CONFIG_DEBUG_INFO is not set | 1404 | # CONFIG_DEBUG_INFO is not set |
| 1298 | # CONFIG_DEBUG_FS is not set | ||
| 1299 | # CONFIG_DEBUG_VM is not set | 1405 | # CONFIG_DEBUG_VM is not set |
| 1406 | # CONFIG_DEBUG_LIST is not set | ||
| 1300 | CONFIG_FORCED_INLINING=y | 1407 | CONFIG_FORCED_INLINING=y |
| 1301 | # CONFIG_RCU_TORTURE_TEST is not set | 1408 | # CONFIG_RCU_TORTURE_TEST is not set |
| 1302 | # CONFIG_DEBUGGER is not set | 1409 | # CONFIG_DEBUGGER is not set |
| @@ -1316,8 +1423,10 @@ CONFIG_FORCED_INLINING=y | |||
| 1316 | # | 1423 | # |
| 1317 | CONFIG_CRYPTO=y | 1424 | CONFIG_CRYPTO=y |
| 1318 | CONFIG_CRYPTO_ALGAPI=y | 1425 | CONFIG_CRYPTO_ALGAPI=y |
| 1319 | # CONFIG_CRYPTO_MANAGER is not set | 1426 | CONFIG_CRYPTO_BLKCIPHER=y |
| 1427 | CONFIG_CRYPTO_MANAGER=y | ||
| 1320 | # CONFIG_CRYPTO_HMAC is not set | 1428 | # CONFIG_CRYPTO_HMAC is not set |
| 1429 | # CONFIG_CRYPTO_XCBC is not set | ||
| 1321 | # CONFIG_CRYPTO_NULL is not set | 1430 | # CONFIG_CRYPTO_NULL is not set |
| 1322 | # CONFIG_CRYPTO_MD4 is not set | 1431 | # CONFIG_CRYPTO_MD4 is not set |
| 1323 | CONFIG_CRYPTO_MD5=y | 1432 | CONFIG_CRYPTO_MD5=y |
| @@ -1326,8 +1435,10 @@ CONFIG_CRYPTO_MD5=y | |||
| 1326 | # CONFIG_CRYPTO_SHA512 is not set | 1435 | # CONFIG_CRYPTO_SHA512 is not set |
| 1327 | # CONFIG_CRYPTO_WP512 is not set | 1436 | # CONFIG_CRYPTO_WP512 is not set |
| 1328 | # CONFIG_CRYPTO_TGR192 is not set | 1437 | # CONFIG_CRYPTO_TGR192 is not set |
| 1438 | # CONFIG_CRYPTO_GF128MUL is not set | ||
| 1329 | # CONFIG_CRYPTO_ECB is not set | 1439 | # CONFIG_CRYPTO_ECB is not set |
| 1330 | # CONFIG_CRYPTO_CBC is not set | 1440 | CONFIG_CRYPTO_CBC=y |
| 1441 | # CONFIG_CRYPTO_LRW is not set | ||
| 1331 | CONFIG_CRYPTO_DES=y | 1442 | CONFIG_CRYPTO_DES=y |
| 1332 | # CONFIG_CRYPTO_BLOWFISH is not set | 1443 | # CONFIG_CRYPTO_BLOWFISH is not set |
| 1333 | # CONFIG_CRYPTO_TWOFISH is not set | 1444 | # CONFIG_CRYPTO_TWOFISH is not set |
diff --git a/arch/powerpc/configs/mpc834x_mds_defconfig b/arch/powerpc/configs/mpc834x_mds_defconfig index 9eefab967898..c24db58be457 100644 --- a/arch/powerpc/configs/mpc834x_mds_defconfig +++ b/arch/powerpc/configs/mpc834x_mds_defconfig | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.18-rc6 | 3 | # Linux kernel version: 2.6.20-rc5 |
| 4 | # Sun Sep 10 10:28:54 2006 | 4 | # Mon Jan 22 22:24:10 2007 |
| 5 | # | 5 | # |
| 6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
| 7 | CONFIG_PPC32=y | 7 | CONFIG_PPC32=y |
| @@ -10,6 +10,7 @@ CONFIG_MMU=y | |||
| 10 | CONFIG_GENERIC_HARDIRQS=y | 10 | CONFIG_GENERIC_HARDIRQS=y |
| 11 | CONFIG_IRQ_PER_CPU=y | 11 | CONFIG_IRQ_PER_CPU=y |
| 12 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 12 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
| 13 | CONFIG_ARCH_HAS_ILOG2_U32=y | ||
| 13 | CONFIG_GENERIC_HWEIGHT=y | 14 | CONFIG_GENERIC_HWEIGHT=y |
| 14 | CONFIG_GENERIC_CALIBRATE_DELAY=y | 15 | CONFIG_GENERIC_CALIBRATE_DELAY=y |
| 15 | CONFIG_GENERIC_FIND_NEXT_BIT=y | 16 | CONFIG_GENERIC_FIND_NEXT_BIT=y |
| @@ -21,13 +22,14 @@ CONFIG_ARCH_MAY_HAVE_PC_FDC=y | |||
| 21 | CONFIG_PPC_OF=y | 22 | CONFIG_PPC_OF=y |
| 22 | CONFIG_PPC_UDBG_16550=y | 23 | CONFIG_PPC_UDBG_16550=y |
| 23 | # CONFIG_GENERIC_TBSYNC is not set | 24 | # CONFIG_GENERIC_TBSYNC is not set |
| 25 | CONFIG_AUDIT_ARCH=y | ||
| 26 | CONFIG_GENERIC_BUG=y | ||
| 24 | CONFIG_DEFAULT_UIMAGE=y | 27 | CONFIG_DEFAULT_UIMAGE=y |
| 25 | 28 | ||
| 26 | # | 29 | # |
| 27 | # Processor support | 30 | # Processor support |
| 28 | # | 31 | # |
| 29 | # CONFIG_CLASSIC32 is not set | 32 | # CONFIG_CLASSIC32 is not set |
| 30 | # CONFIG_PPC_52xx is not set | ||
| 31 | # CONFIG_PPC_82xx is not set | 33 | # CONFIG_PPC_82xx is not set |
| 32 | CONFIG_PPC_83xx=y | 34 | CONFIG_PPC_83xx=y |
| 33 | # CONFIG_PPC_85xx is not set | 35 | # CONFIG_PPC_85xx is not set |
| @@ -39,6 +41,8 @@ CONFIG_PPC_83xx=y | |||
| 39 | CONFIG_6xx=y | 41 | CONFIG_6xx=y |
| 40 | CONFIG_83xx=y | 42 | CONFIG_83xx=y |
| 41 | CONFIG_PPC_FPU=y | 43 | CONFIG_PPC_FPU=y |
| 44 | # CONFIG_PPC_DCR_NATIVE is not set | ||
| 45 | # CONFIG_PPC_DCR_MMIO is not set | ||
| 42 | CONFIG_PPC_STD_MMU=y | 46 | CONFIG_PPC_STD_MMU=y |
| 43 | CONFIG_PPC_STD_MMU_32=y | 47 | CONFIG_PPC_STD_MMU_32=y |
| 44 | # CONFIG_SMP is not set | 48 | # CONFIG_SMP is not set |
| @@ -58,28 +62,32 @@ CONFIG_LOCALVERSION="" | |||
| 58 | CONFIG_LOCALVERSION_AUTO=y | 62 | CONFIG_LOCALVERSION_AUTO=y |
| 59 | CONFIG_SWAP=y | 63 | CONFIG_SWAP=y |
| 60 | CONFIG_SYSVIPC=y | 64 | CONFIG_SYSVIPC=y |
| 65 | # CONFIG_IPC_NS is not set | ||
| 61 | # CONFIG_POSIX_MQUEUE is not set | 66 | # CONFIG_POSIX_MQUEUE is not set |
| 62 | # CONFIG_BSD_PROCESS_ACCT is not set | 67 | # CONFIG_BSD_PROCESS_ACCT is not set |
| 63 | # CONFIG_TASKSTATS is not set | 68 | # CONFIG_TASKSTATS is not set |
| 64 | CONFIG_SYSCTL=y | 69 | # CONFIG_UTS_NS is not set |
| 65 | # CONFIG_AUDIT is not set | 70 | # CONFIG_AUDIT is not set |
| 66 | # CONFIG_IKCONFIG is not set | 71 | # CONFIG_IKCONFIG is not set |
| 72 | CONFIG_SYSFS_DEPRECATED=y | ||
| 67 | # CONFIG_RELAY is not set | 73 | # CONFIG_RELAY is not set |
| 68 | CONFIG_INITRAMFS_SOURCE="" | 74 | CONFIG_INITRAMFS_SOURCE="" |
| 69 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | 75 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set |
| 76 | CONFIG_SYSCTL=y | ||
| 70 | CONFIG_EMBEDDED=y | 77 | CONFIG_EMBEDDED=y |
| 78 | CONFIG_SYSCTL_SYSCALL=y | ||
| 71 | # CONFIG_KALLSYMS is not set | 79 | # CONFIG_KALLSYMS is not set |
| 72 | CONFIG_HOTPLUG=y | 80 | CONFIG_HOTPLUG=y |
| 73 | CONFIG_PRINTK=y | 81 | CONFIG_PRINTK=y |
| 74 | CONFIG_BUG=y | 82 | CONFIG_BUG=y |
| 75 | CONFIG_ELF_CORE=y | 83 | CONFIG_ELF_CORE=y |
| 76 | CONFIG_BASE_FULL=y | 84 | CONFIG_BASE_FULL=y |
| 77 | CONFIG_RT_MUTEXES=y | ||
| 78 | CONFIG_FUTEX=y | 85 | CONFIG_FUTEX=y |
| 79 | # CONFIG_EPOLL is not set | 86 | # CONFIG_EPOLL is not set |
| 80 | CONFIG_SHMEM=y | 87 | CONFIG_SHMEM=y |
| 81 | CONFIG_SLAB=y | 88 | CONFIG_SLAB=y |
| 82 | CONFIG_VM_EVENT_COUNTERS=y | 89 | CONFIG_VM_EVENT_COUNTERS=y |
| 90 | CONFIG_RT_MUTEXES=y | ||
| 83 | # CONFIG_TINY_SHMEM is not set | 91 | # CONFIG_TINY_SHMEM is not set |
| 84 | CONFIG_BASE_SMALL=0 | 92 | CONFIG_BASE_SMALL=0 |
| 85 | # CONFIG_SLOB is not set | 93 | # CONFIG_SLOB is not set |
| @@ -97,6 +105,7 @@ CONFIG_MODULE_UNLOAD=y | |||
| 97 | # | 105 | # |
| 98 | # Block layer | 106 | # Block layer |
| 99 | # | 107 | # |
| 108 | CONFIG_BLOCK=y | ||
| 100 | # CONFIG_LBD is not set | 109 | # CONFIG_LBD is not set |
| 101 | # CONFIG_BLK_DEV_IO_TRACE is not set | 110 | # CONFIG_BLK_DEV_IO_TRACE is not set |
| 102 | # CONFIG_LSF is not set | 111 | # CONFIG_LSF is not set |
| @@ -119,8 +128,10 @@ CONFIG_PPC_GEN550=y | |||
| 119 | # | 128 | # |
| 120 | # Platform support | 129 | # Platform support |
| 121 | # | 130 | # |
| 131 | # CONFIG_MPC832x_MDS is not set | ||
| 122 | CONFIG_MPC834x_SYS=y | 132 | CONFIG_MPC834x_SYS=y |
| 123 | # CONFIG_MPC834x_ITX is not set | 133 | # CONFIG_MPC834x_ITX is not set |
| 134 | # CONFIG_MPC8360E_PB is not set | ||
| 124 | CONFIG_MPC834x=y | 135 | CONFIG_MPC834x=y |
| 125 | # CONFIG_MPIC is not set | 136 | # CONFIG_MPIC is not set |
| 126 | 137 | ||
| @@ -130,6 +141,7 @@ CONFIG_MPC834x=y | |||
| 130 | # CONFIG_HIGHMEM is not set | 141 | # CONFIG_HIGHMEM is not set |
| 131 | # CONFIG_HZ_100 is not set | 142 | # CONFIG_HZ_100 is not set |
| 132 | CONFIG_HZ_250=y | 143 | CONFIG_HZ_250=y |
| 144 | # CONFIG_HZ_300 is not set | ||
| 133 | # CONFIG_HZ_1000 is not set | 145 | # CONFIG_HZ_1000 is not set |
| 134 | CONFIG_HZ=250 | 146 | CONFIG_HZ=250 |
| 135 | CONFIG_PREEMPT_NONE=y | 147 | CONFIG_PREEMPT_NONE=y |
| @@ -137,8 +149,10 @@ CONFIG_PREEMPT_NONE=y | |||
| 137 | # CONFIG_PREEMPT is not set | 149 | # CONFIG_PREEMPT is not set |
| 138 | CONFIG_BINFMT_ELF=y | 150 | CONFIG_BINFMT_ELF=y |
| 139 | # CONFIG_BINFMT_MISC is not set | 151 | # CONFIG_BINFMT_MISC is not set |
| 152 | CONFIG_MATH_EMULATION=y | ||
| 140 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y | 153 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y |
| 141 | CONFIG_ARCH_FLATMEM_ENABLE=y | 154 | CONFIG_ARCH_FLATMEM_ENABLE=y |
| 155 | CONFIG_ARCH_POPULATES_NODE_MAP=y | ||
| 142 | CONFIG_SELECT_MEMORY_MODEL=y | 156 | CONFIG_SELECT_MEMORY_MODEL=y |
| 143 | CONFIG_FLATMEM_MANUAL=y | 157 | CONFIG_FLATMEM_MANUAL=y |
| 144 | # CONFIG_DISCONTIGMEM_MANUAL is not set | 158 | # CONFIG_DISCONTIGMEM_MANUAL is not set |
| @@ -204,6 +218,7 @@ CONFIG_PACKET=y | |||
| 204 | CONFIG_UNIX=y | 218 | CONFIG_UNIX=y |
| 205 | CONFIG_XFRM=y | 219 | CONFIG_XFRM=y |
| 206 | CONFIG_XFRM_USER=m | 220 | CONFIG_XFRM_USER=m |
| 221 | # CONFIG_XFRM_SUB_POLICY is not set | ||
| 207 | # CONFIG_NET_KEY is not set | 222 | # CONFIG_NET_KEY is not set |
| 208 | CONFIG_INET=y | 223 | CONFIG_INET=y |
| 209 | CONFIG_IP_MULTICAST=y | 224 | CONFIG_IP_MULTICAST=y |
| @@ -225,10 +240,13 @@ CONFIG_SYN_COOKIES=y | |||
| 225 | # CONFIG_INET_TUNNEL is not set | 240 | # CONFIG_INET_TUNNEL is not set |
| 226 | CONFIG_INET_XFRM_MODE_TRANSPORT=y | 241 | CONFIG_INET_XFRM_MODE_TRANSPORT=y |
| 227 | CONFIG_INET_XFRM_MODE_TUNNEL=y | 242 | CONFIG_INET_XFRM_MODE_TUNNEL=y |
| 243 | CONFIG_INET_XFRM_MODE_BEET=y | ||
| 228 | CONFIG_INET_DIAG=y | 244 | CONFIG_INET_DIAG=y |
| 229 | CONFIG_INET_TCP_DIAG=y | 245 | CONFIG_INET_TCP_DIAG=y |
| 230 | # CONFIG_TCP_CONG_ADVANCED is not set | 246 | # CONFIG_TCP_CONG_ADVANCED is not set |
| 231 | CONFIG_TCP_CONG_BIC=y | 247 | CONFIG_TCP_CONG_CUBIC=y |
| 248 | CONFIG_DEFAULT_TCP_CONG="cubic" | ||
| 249 | # CONFIG_TCP_MD5SIG is not set | ||
| 232 | # CONFIG_IPV6 is not set | 250 | # CONFIG_IPV6 is not set |
| 233 | # CONFIG_INET6_XFRM_TUNNEL is not set | 251 | # CONFIG_INET6_XFRM_TUNNEL is not set |
| 234 | # CONFIG_INET6_TUNNEL is not set | 252 | # CONFIG_INET6_TUNNEL is not set |
| @@ -258,7 +276,6 @@ CONFIG_TCP_CONG_BIC=y | |||
| 258 | # CONFIG_ATALK is not set | 276 | # CONFIG_ATALK is not set |
| 259 | # CONFIG_X25 is not set | 277 | # CONFIG_X25 is not set |
| 260 | # CONFIG_LAPB is not set | 278 | # CONFIG_LAPB is not set |
| 261 | # CONFIG_NET_DIVERT is not set | ||
| 262 | # CONFIG_ECONET is not set | 279 | # CONFIG_ECONET is not set |
| 263 | # CONFIG_WAN_ROUTER is not set | 280 | # CONFIG_WAN_ROUTER is not set |
| 264 | 281 | ||
| @@ -329,6 +346,12 @@ CONFIG_BLK_DEV_INITRD=y | |||
| 329 | # CONFIG_ATA_OVER_ETH is not set | 346 | # CONFIG_ATA_OVER_ETH is not set |
| 330 | 347 | ||
| 331 | # | 348 | # |
| 349 | # Misc devices | ||
| 350 | # | ||
| 351 | # CONFIG_SGI_IOC4 is not set | ||
| 352 | # CONFIG_TIFM_CORE is not set | ||
| 353 | |||
| 354 | # | ||
| 332 | # ATA/ATAPI/MFM/RLL support | 355 | # ATA/ATAPI/MFM/RLL support |
| 333 | # | 356 | # |
| 334 | # CONFIG_IDE is not set | 357 | # CONFIG_IDE is not set |
| @@ -338,6 +361,12 @@ CONFIG_BLK_DEV_INITRD=y | |||
| 338 | # | 361 | # |
| 339 | # CONFIG_RAID_ATTRS is not set | 362 | # CONFIG_RAID_ATTRS is not set |
| 340 | # CONFIG_SCSI is not set | 363 | # CONFIG_SCSI is not set |
| 364 | # CONFIG_SCSI_NETLINK is not set | ||
| 365 | |||
| 366 | # | ||
| 367 | # Serial ATA (prod) and Parallel ATA (experimental) drivers | ||
| 368 | # | ||
| 369 | # CONFIG_ATA is not set | ||
| 341 | 370 | ||
| 342 | # | 371 | # |
| 343 | # Multi-device support (RAID and LVM) | 372 | # Multi-device support (RAID and LVM) |
| @@ -362,6 +391,7 @@ CONFIG_BLK_DEV_INITRD=y | |||
| 362 | # | 391 | # |
| 363 | # Macintosh device drivers | 392 | # Macintosh device drivers |
| 364 | # | 393 | # |
| 394 | # CONFIG_MAC_EMUMOUSEBTN is not set | ||
| 365 | # CONFIG_WINDFARM is not set | 395 | # CONFIG_WINDFARM is not set |
| 366 | 396 | ||
| 367 | # | 397 | # |
| @@ -393,6 +423,7 @@ CONFIG_MARVELL_PHY=y | |||
| 393 | # CONFIG_CICADA_PHY is not set | 423 | # CONFIG_CICADA_PHY is not set |
| 394 | # CONFIG_VITESSE_PHY is not set | 424 | # CONFIG_VITESSE_PHY is not set |
| 395 | # CONFIG_SMSC_PHY is not set | 425 | # CONFIG_SMSC_PHY is not set |
| 426 | # CONFIG_BROADCOM_PHY is not set | ||
| 396 | # CONFIG_FIXED_PHY is not set | 427 | # CONFIG_FIXED_PHY is not set |
| 397 | 428 | ||
| 398 | # | 429 | # |
| @@ -449,6 +480,7 @@ CONFIG_E100=y | |||
| 449 | # CONFIG_BNX2 is not set | 480 | # CONFIG_BNX2 is not set |
| 450 | CONFIG_GIANFAR=y | 481 | CONFIG_GIANFAR=y |
| 451 | # CONFIG_GFAR_NAPI is not set | 482 | # CONFIG_GFAR_NAPI is not set |
| 483 | # CONFIG_QLA3XXX is not set | ||
| 452 | 484 | ||
| 453 | # | 485 | # |
| 454 | # Ethernet (10000 Mbit) | 486 | # Ethernet (10000 Mbit) |
| @@ -457,6 +489,7 @@ CONFIG_GIANFAR=y | |||
| 457 | # CONFIG_IXGB is not set | 489 | # CONFIG_IXGB is not set |
| 458 | # CONFIG_S2IO is not set | 490 | # CONFIG_S2IO is not set |
| 459 | # CONFIG_MYRI10GE is not set | 491 | # CONFIG_MYRI10GE is not set |
| 492 | # CONFIG_NETXEN_NIC is not set | ||
| 460 | 493 | ||
| 461 | # | 494 | # |
| 462 | # Token Ring devices | 495 | # Token Ring devices |
| @@ -495,6 +528,7 @@ CONFIG_GIANFAR=y | |||
| 495 | # Input device support | 528 | # Input device support |
| 496 | # | 529 | # |
| 497 | CONFIG_INPUT=y | 530 | CONFIG_INPUT=y |
| 531 | # CONFIG_INPUT_FF_MEMLESS is not set | ||
| 498 | 532 | ||
| 499 | # | 533 | # |
| 500 | # Userland interfaces | 534 | # Userland interfaces |
| @@ -539,6 +573,7 @@ CONFIG_SERIAL_8250_RUNTIME_UARTS=4 | |||
| 539 | # | 573 | # |
| 540 | # Non-8250 serial port support | 574 | # Non-8250 serial port support |
| 541 | # | 575 | # |
| 576 | # CONFIG_SERIAL_UARTLITE is not set | ||
| 542 | CONFIG_SERIAL_CORE=y | 577 | CONFIG_SERIAL_CORE=y |
| 543 | CONFIG_SERIAL_CORE_CONSOLE=y | 578 | CONFIG_SERIAL_CORE_CONSOLE=y |
| 544 | # CONFIG_SERIAL_JSM is not set | 579 | # CONFIG_SERIAL_JSM is not set |
| @@ -575,10 +610,6 @@ CONFIG_GEN_RTC=y | |||
| 575 | # CONFIG_DTLK is not set | 610 | # CONFIG_DTLK is not set |
| 576 | # CONFIG_R3964 is not set | 611 | # CONFIG_R3964 is not set |
| 577 | # CONFIG_APPLICOM is not set | 612 | # CONFIG_APPLICOM is not set |
| 578 | |||
| 579 | # | ||
| 580 | # Ftape, the floppy tape device driver | ||
| 581 | # | ||
| 582 | # CONFIG_AGP is not set | 613 | # CONFIG_AGP is not set |
| 583 | # CONFIG_DRM is not set | 614 | # CONFIG_DRM is not set |
| 584 | # CONFIG_RAW_DRIVER is not set | 615 | # CONFIG_RAW_DRIVER is not set |
| @@ -587,7 +618,6 @@ CONFIG_GEN_RTC=y | |||
| 587 | # TPM devices | 618 | # TPM devices |
| 588 | # | 619 | # |
| 589 | # CONFIG_TCG_TPM is not set | 620 | # CONFIG_TCG_TPM is not set |
| 590 | # CONFIG_TELCLOCK is not set | ||
| 591 | 621 | ||
| 592 | # | 622 | # |
| 593 | # I2C support | 623 | # I2C support |
| @@ -653,6 +683,7 @@ CONFIG_I2C_MPC=y | |||
| 653 | # | 683 | # |
| 654 | # Dallas's 1-wire bus | 684 | # Dallas's 1-wire bus |
| 655 | # | 685 | # |
| 686 | # CONFIG_W1 is not set | ||
| 656 | 687 | ||
| 657 | # | 688 | # |
| 658 | # Hardware Monitoring support | 689 | # Hardware Monitoring support |
| @@ -686,29 +717,27 @@ CONFIG_HWMON=y | |||
| 686 | # CONFIG_SENSORS_LM92 is not set | 717 | # CONFIG_SENSORS_LM92 is not set |
| 687 | # CONFIG_SENSORS_MAX1619 is not set | 718 | # CONFIG_SENSORS_MAX1619 is not set |
| 688 | # CONFIG_SENSORS_PC87360 is not set | 719 | # CONFIG_SENSORS_PC87360 is not set |
| 720 | # CONFIG_SENSORS_PC87427 is not set | ||
| 689 | # CONFIG_SENSORS_SIS5595 is not set | 721 | # CONFIG_SENSORS_SIS5595 is not set |
| 690 | # CONFIG_SENSORS_SMSC47M1 is not set | 722 | # CONFIG_SENSORS_SMSC47M1 is not set |
| 691 | # CONFIG_SENSORS_SMSC47M192 is not set | 723 | # CONFIG_SENSORS_SMSC47M192 is not set |
| 692 | # CONFIG_SENSORS_SMSC47B397 is not set | 724 | # CONFIG_SENSORS_SMSC47B397 is not set |
| 693 | # CONFIG_SENSORS_VIA686A is not set | 725 | # CONFIG_SENSORS_VIA686A is not set |
| 726 | # CONFIG_SENSORS_VT1211 is not set | ||
| 694 | # CONFIG_SENSORS_VT8231 is not set | 727 | # CONFIG_SENSORS_VT8231 is not set |
| 695 | # CONFIG_SENSORS_W83781D is not set | 728 | # CONFIG_SENSORS_W83781D is not set |
| 696 | # CONFIG_SENSORS_W83791D is not set | 729 | # CONFIG_SENSORS_W83791D is not set |
| 697 | # CONFIG_SENSORS_W83792D is not set | 730 | # CONFIG_SENSORS_W83792D is not set |
| 731 | # CONFIG_SENSORS_W83793 is not set | ||
| 698 | # CONFIG_SENSORS_W83L785TS is not set | 732 | # CONFIG_SENSORS_W83L785TS is not set |
| 699 | # CONFIG_SENSORS_W83627HF is not set | 733 | # CONFIG_SENSORS_W83627HF is not set |
| 700 | # CONFIG_SENSORS_W83627EHF is not set | 734 | # CONFIG_SENSORS_W83627EHF is not set |
| 701 | # CONFIG_HWMON_DEBUG_CHIP is not set | 735 | # CONFIG_HWMON_DEBUG_CHIP is not set |
| 702 | 736 | ||
| 703 | # | 737 | # |
| 704 | # Misc devices | ||
| 705 | # | ||
| 706 | |||
| 707 | # | ||
| 708 | # Multimedia devices | 738 | # Multimedia devices |
| 709 | # | 739 | # |
| 710 | # CONFIG_VIDEO_DEV is not set | 740 | # CONFIG_VIDEO_DEV is not set |
| 711 | CONFIG_VIDEO_V4L2=y | ||
| 712 | 741 | ||
| 713 | # | 742 | # |
| 714 | # Digital Video Broadcasting Devices | 743 | # Digital Video Broadcasting Devices |
| @@ -720,6 +749,7 @@ CONFIG_VIDEO_V4L2=y | |||
| 720 | # | 749 | # |
| 721 | CONFIG_FIRMWARE_EDID=y | 750 | CONFIG_FIRMWARE_EDID=y |
| 722 | # CONFIG_FB is not set | 751 | # CONFIG_FB is not set |
| 752 | # CONFIG_FB_IBM_GXT4500 is not set | ||
| 723 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set | 753 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set |
| 724 | 754 | ||
| 725 | # | 755 | # |
| @@ -728,6 +758,11 @@ CONFIG_FIRMWARE_EDID=y | |||
| 728 | # CONFIG_SOUND is not set | 758 | # CONFIG_SOUND is not set |
| 729 | 759 | ||
| 730 | # | 760 | # |
| 761 | # HID Devices | ||
| 762 | # | ||
| 763 | CONFIG_HID=y | ||
| 764 | |||
| 765 | # | ||
| 731 | # USB support | 766 | # USB support |
| 732 | # | 767 | # |
| 733 | CONFIG_USB_ARCH_HAS_HCD=y | 768 | CONFIG_USB_ARCH_HAS_HCD=y |
| @@ -790,6 +825,10 @@ CONFIG_USB_ARCH_HAS_EHCI=y | |||
| 790 | # | 825 | # |
| 791 | 826 | ||
| 792 | # | 827 | # |
| 828 | # Virtualization | ||
| 829 | # | ||
| 830 | |||
| 831 | # | ||
| 793 | # File systems | 832 | # File systems |
| 794 | # | 833 | # |
| 795 | CONFIG_EXT2_FS=y | 834 | CONFIG_EXT2_FS=y |
| @@ -799,6 +838,7 @@ CONFIG_EXT3_FS=y | |||
| 799 | CONFIG_EXT3_FS_XATTR=y | 838 | CONFIG_EXT3_FS_XATTR=y |
| 800 | # CONFIG_EXT3_FS_POSIX_ACL is not set | 839 | # CONFIG_EXT3_FS_POSIX_ACL is not set |
| 801 | # CONFIG_EXT3_FS_SECURITY is not set | 840 | # CONFIG_EXT3_FS_SECURITY is not set |
| 841 | # CONFIG_EXT4DEV_FS is not set | ||
| 802 | CONFIG_JBD=y | 842 | CONFIG_JBD=y |
| 803 | # CONFIG_JBD_DEBUG is not set | 843 | # CONFIG_JBD_DEBUG is not set |
| 804 | CONFIG_FS_MBCACHE=y | 844 | CONFIG_FS_MBCACHE=y |
| @@ -806,6 +846,7 @@ CONFIG_FS_MBCACHE=y | |||
| 806 | # CONFIG_JFS_FS is not set | 846 | # CONFIG_JFS_FS is not set |
| 807 | # CONFIG_FS_POSIX_ACL is not set | 847 | # CONFIG_FS_POSIX_ACL is not set |
| 808 | # CONFIG_XFS_FS is not set | 848 | # CONFIG_XFS_FS is not set |
| 849 | # CONFIG_GFS2_FS is not set | ||
| 809 | # CONFIG_OCFS2_FS is not set | 850 | # CONFIG_OCFS2_FS is not set |
| 810 | # CONFIG_MINIX_FS is not set | 851 | # CONFIG_MINIX_FS is not set |
| 811 | # CONFIG_ROMFS_FS is not set | 852 | # CONFIG_ROMFS_FS is not set |
| @@ -835,8 +876,10 @@ CONFIG_DNOTIFY=y | |||
| 835 | # | 876 | # |
| 836 | CONFIG_PROC_FS=y | 877 | CONFIG_PROC_FS=y |
| 837 | CONFIG_PROC_KCORE=y | 878 | CONFIG_PROC_KCORE=y |
| 879 | CONFIG_PROC_SYSCTL=y | ||
| 838 | CONFIG_SYSFS=y | 880 | CONFIG_SYSFS=y |
| 839 | CONFIG_TMPFS=y | 881 | CONFIG_TMPFS=y |
| 882 | # CONFIG_TMPFS_POSIX_ACL is not set | ||
| 840 | # CONFIG_HUGETLB_PAGE is not set | 883 | # CONFIG_HUGETLB_PAGE is not set |
| 841 | CONFIG_RAMFS=y | 884 | CONFIG_RAMFS=y |
| 842 | # CONFIG_CONFIGFS_FS is not set | 885 | # CONFIG_CONFIGFS_FS is not set |
| @@ -905,13 +948,20 @@ CONFIG_PARTITION_ADVANCED=y | |||
| 905 | # CONFIG_NLS is not set | 948 | # CONFIG_NLS is not set |
| 906 | 949 | ||
| 907 | # | 950 | # |
| 951 | # Distributed Lock Manager | ||
| 952 | # | ||
| 953 | # CONFIG_DLM is not set | ||
| 954 | |||
| 955 | # | ||
| 908 | # Library routines | 956 | # Library routines |
| 909 | # | 957 | # |
| 958 | CONFIG_BITREVERSE=y | ||
| 910 | # CONFIG_CRC_CCITT is not set | 959 | # CONFIG_CRC_CCITT is not set |
| 911 | # CONFIG_CRC16 is not set | 960 | # CONFIG_CRC16 is not set |
| 912 | CONFIG_CRC32=y | 961 | CONFIG_CRC32=y |
| 913 | # CONFIG_LIBCRC32C is not set | 962 | # CONFIG_LIBCRC32C is not set |
| 914 | CONFIG_PLIST=y | 963 | CONFIG_PLIST=y |
| 964 | CONFIG_IOMAP_COPY=y | ||
| 915 | 965 | ||
| 916 | # | 966 | # |
| 917 | # Instrumentation Support | 967 | # Instrumentation Support |
| @@ -922,11 +972,14 @@ CONFIG_PLIST=y | |||
| 922 | # Kernel hacking | 972 | # Kernel hacking |
| 923 | # | 973 | # |
| 924 | # CONFIG_PRINTK_TIME is not set | 974 | # CONFIG_PRINTK_TIME is not set |
| 975 | CONFIG_ENABLE_MUST_CHECK=y | ||
| 925 | # CONFIG_MAGIC_SYSRQ is not set | 976 | # CONFIG_MAGIC_SYSRQ is not set |
| 926 | # CONFIG_UNUSED_SYMBOLS is not set | 977 | # CONFIG_UNUSED_SYMBOLS is not set |
| 978 | # CONFIG_DEBUG_FS is not set | ||
| 979 | # CONFIG_HEADERS_CHECK is not set | ||
| 927 | # CONFIG_DEBUG_KERNEL is not set | 980 | # CONFIG_DEBUG_KERNEL is not set |
| 928 | CONFIG_LOG_BUF_SHIFT=14 | 981 | CONFIG_LOG_BUF_SHIFT=14 |
| 929 | # CONFIG_DEBUG_FS is not set | 982 | # CONFIG_DEBUG_BUGVERBOSE is not set |
| 930 | # CONFIG_BOOTX_TEXT is not set | 983 | # CONFIG_BOOTX_TEXT is not set |
| 931 | # CONFIG_SERIAL_TEXT_DEBUG is not set | 984 | # CONFIG_SERIAL_TEXT_DEBUG is not set |
| 932 | # CONFIG_PPC_EARLY_DEBUG is not set | 985 | # CONFIG_PPC_EARLY_DEBUG is not set |
| @@ -941,7 +994,11 @@ CONFIG_LOG_BUF_SHIFT=14 | |||
| 941 | # Cryptographic options | 994 | # Cryptographic options |
| 942 | # | 995 | # |
| 943 | CONFIG_CRYPTO=y | 996 | CONFIG_CRYPTO=y |
| 997 | CONFIG_CRYPTO_ALGAPI=y | ||
| 998 | CONFIG_CRYPTO_BLKCIPHER=y | ||
| 999 | CONFIG_CRYPTO_MANAGER=y | ||
| 944 | # CONFIG_CRYPTO_HMAC is not set | 1000 | # CONFIG_CRYPTO_HMAC is not set |
| 1001 | # CONFIG_CRYPTO_XCBC is not set | ||
| 945 | # CONFIG_CRYPTO_NULL is not set | 1002 | # CONFIG_CRYPTO_NULL is not set |
| 946 | # CONFIG_CRYPTO_MD4 is not set | 1003 | # CONFIG_CRYPTO_MD4 is not set |
| 947 | CONFIG_CRYPTO_MD5=y | 1004 | CONFIG_CRYPTO_MD5=y |
| @@ -950,6 +1007,10 @@ CONFIG_CRYPTO_MD5=y | |||
| 950 | # CONFIG_CRYPTO_SHA512 is not set | 1007 | # CONFIG_CRYPTO_SHA512 is not set |
| 951 | # CONFIG_CRYPTO_WP512 is not set | 1008 | # CONFIG_CRYPTO_WP512 is not set |
| 952 | # CONFIG_CRYPTO_TGR192 is not set | 1009 | # CONFIG_CRYPTO_TGR192 is not set |
| 1010 | # CONFIG_CRYPTO_GF128MUL is not set | ||
| 1011 | CONFIG_CRYPTO_ECB=m | ||
| 1012 | CONFIG_CRYPTO_CBC=y | ||
| 1013 | # CONFIG_CRYPTO_LRW is not set | ||
| 953 | CONFIG_CRYPTO_DES=y | 1014 | CONFIG_CRYPTO_DES=y |
| 954 | # CONFIG_CRYPTO_BLOWFISH is not set | 1015 | # CONFIG_CRYPTO_BLOWFISH is not set |
| 955 | # CONFIG_CRYPTO_TWOFISH is not set | 1016 | # CONFIG_CRYPTO_TWOFISH is not set |
diff --git a/arch/powerpc/configs/mpc8360emds_defconfig b/arch/powerpc/configs/mpc8360emds_defconfig index c0703415d608..58e6795dbfe5 100644 --- a/arch/powerpc/configs/mpc8360emds_defconfig +++ b/arch/powerpc/configs/mpc8360emds_defconfig | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.18 | 3 | # Linux kernel version: 2.6.20-rc5 |
| 4 | # Thu Sep 21 18:14:27 2006 | 4 | # Mon Jan 22 22:24:40 2007 |
| 5 | # | 5 | # |
| 6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
| 7 | CONFIG_PPC32=y | 7 | CONFIG_PPC32=y |
| @@ -10,6 +10,7 @@ CONFIG_MMU=y | |||
| 10 | CONFIG_GENERIC_HARDIRQS=y | 10 | CONFIG_GENERIC_HARDIRQS=y |
| 11 | CONFIG_IRQ_PER_CPU=y | 11 | CONFIG_IRQ_PER_CPU=y |
| 12 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 12 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
| 13 | CONFIG_ARCH_HAS_ILOG2_U32=y | ||
| 13 | CONFIG_GENERIC_HWEIGHT=y | 14 | CONFIG_GENERIC_HWEIGHT=y |
| 14 | CONFIG_GENERIC_CALIBRATE_DELAY=y | 15 | CONFIG_GENERIC_CALIBRATE_DELAY=y |
| 15 | CONFIG_GENERIC_FIND_NEXT_BIT=y | 16 | CONFIG_GENERIC_FIND_NEXT_BIT=y |
| @@ -22,13 +23,13 @@ CONFIG_PPC_OF=y | |||
| 22 | CONFIG_PPC_UDBG_16550=y | 23 | CONFIG_PPC_UDBG_16550=y |
| 23 | # CONFIG_GENERIC_TBSYNC is not set | 24 | # CONFIG_GENERIC_TBSYNC is not set |
| 24 | CONFIG_AUDIT_ARCH=y | 25 | CONFIG_AUDIT_ARCH=y |
| 26 | CONFIG_GENERIC_BUG=y | ||
| 25 | CONFIG_DEFAULT_UIMAGE=y | 27 | CONFIG_DEFAULT_UIMAGE=y |
| 26 | 28 | ||
| 27 | # | 29 | # |
| 28 | # Processor support | 30 | # Processor support |
| 29 | # | 31 | # |
| 30 | # CONFIG_CLASSIC32 is not set | 32 | # CONFIG_CLASSIC32 is not set |
| 31 | # CONFIG_PPC_52xx is not set | ||
| 32 | # CONFIG_PPC_82xx is not set | 33 | # CONFIG_PPC_82xx is not set |
| 33 | CONFIG_PPC_83xx=y | 34 | CONFIG_PPC_83xx=y |
| 34 | # CONFIG_PPC_85xx is not set | 35 | # CONFIG_PPC_85xx is not set |
| @@ -40,6 +41,8 @@ CONFIG_PPC_83xx=y | |||
| 40 | CONFIG_6xx=y | 41 | CONFIG_6xx=y |
| 41 | CONFIG_83xx=y | 42 | CONFIG_83xx=y |
| 42 | CONFIG_PPC_FPU=y | 43 | CONFIG_PPC_FPU=y |
| 44 | # CONFIG_PPC_DCR_NATIVE is not set | ||
| 45 | # CONFIG_PPC_DCR_MMIO is not set | ||
| 43 | CONFIG_PPC_STD_MMU=y | 46 | CONFIG_PPC_STD_MMU=y |
| 44 | CONFIG_PPC_STD_MMU_32=y | 47 | CONFIG_PPC_STD_MMU_32=y |
| 45 | # CONFIG_SMP is not set | 48 | # CONFIG_SMP is not set |
| @@ -59,16 +62,20 @@ CONFIG_LOCALVERSION="" | |||
| 59 | CONFIG_LOCALVERSION_AUTO=y | 62 | CONFIG_LOCALVERSION_AUTO=y |
| 60 | CONFIG_SWAP=y | 63 | CONFIG_SWAP=y |
| 61 | CONFIG_SYSVIPC=y | 64 | CONFIG_SYSVIPC=y |
| 65 | # CONFIG_IPC_NS is not set | ||
| 62 | # CONFIG_POSIX_MQUEUE is not set | 66 | # CONFIG_POSIX_MQUEUE is not set |
| 63 | # CONFIG_BSD_PROCESS_ACCT is not set | 67 | # CONFIG_BSD_PROCESS_ACCT is not set |
| 64 | # CONFIG_TASKSTATS is not set | 68 | # CONFIG_TASKSTATS is not set |
| 69 | # CONFIG_UTS_NS is not set | ||
| 65 | # CONFIG_AUDIT is not set | 70 | # CONFIG_AUDIT is not set |
| 66 | # CONFIG_IKCONFIG is not set | 71 | # CONFIG_IKCONFIG is not set |
| 72 | CONFIG_SYSFS_DEPRECATED=y | ||
| 67 | # CONFIG_RELAY is not set | 73 | # CONFIG_RELAY is not set |
| 68 | CONFIG_INITRAMFS_SOURCE="" | 74 | CONFIG_INITRAMFS_SOURCE="" |
| 69 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | 75 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set |
| 70 | CONFIG_EMBEDDED=y | ||
| 71 | CONFIG_SYSCTL=y | 76 | CONFIG_SYSCTL=y |
| 77 | CONFIG_EMBEDDED=y | ||
| 78 | CONFIG_SYSCTL_SYSCALL=y | ||
| 72 | # CONFIG_KALLSYMS is not set | 79 | # CONFIG_KALLSYMS is not set |
| 73 | CONFIG_HOTPLUG=y | 80 | CONFIG_HOTPLUG=y |
| 74 | CONFIG_PRINTK=y | 81 | CONFIG_PRINTK=y |
| @@ -98,6 +105,7 @@ CONFIG_MODULE_UNLOAD=y | |||
| 98 | # | 105 | # |
| 99 | # Block layer | 106 | # Block layer |
| 100 | # | 107 | # |
| 108 | CONFIG_BLOCK=y | ||
| 101 | # CONFIG_LBD is not set | 109 | # CONFIG_LBD is not set |
| 102 | # CONFIG_BLK_DEV_IO_TRACE is not set | 110 | # CONFIG_BLK_DEV_IO_TRACE is not set |
| 103 | # CONFIG_LSF is not set | 111 | # CONFIG_LSF is not set |
| @@ -121,6 +129,7 @@ CONFIG_PPC_GEN550=y | |||
| 121 | # | 129 | # |
| 122 | # Platform support | 130 | # Platform support |
| 123 | # | 131 | # |
| 132 | # CONFIG_MPC832x_MDS is not set | ||
| 124 | # CONFIG_MPC834x_SYS is not set | 133 | # CONFIG_MPC834x_SYS is not set |
| 125 | # CONFIG_MPC834x_ITX is not set | 134 | # CONFIG_MPC834x_ITX is not set |
| 126 | CONFIG_MPC8360E_PB=y | 135 | CONFIG_MPC8360E_PB=y |
| @@ -133,6 +142,7 @@ CONFIG_PPC_MPC836x=y | |||
| 133 | # CONFIG_HIGHMEM is not set | 142 | # CONFIG_HIGHMEM is not set |
| 134 | # CONFIG_HZ_100 is not set | 143 | # CONFIG_HZ_100 is not set |
| 135 | CONFIG_HZ_250=y | 144 | CONFIG_HZ_250=y |
| 145 | # CONFIG_HZ_300 is not set | ||
| 136 | # CONFIG_HZ_1000 is not set | 146 | # CONFIG_HZ_1000 is not set |
| 137 | CONFIG_HZ=250 | 147 | CONFIG_HZ=250 |
| 138 | CONFIG_PREEMPT_NONE=y | 148 | CONFIG_PREEMPT_NONE=y |
| @@ -140,8 +150,10 @@ CONFIG_PREEMPT_NONE=y | |||
| 140 | # CONFIG_PREEMPT is not set | 150 | # CONFIG_PREEMPT is not set |
| 141 | CONFIG_BINFMT_ELF=y | 151 | CONFIG_BINFMT_ELF=y |
| 142 | # CONFIG_BINFMT_MISC is not set | 152 | # CONFIG_BINFMT_MISC is not set |
| 153 | CONFIG_MATH_EMULATION=y | ||
| 143 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y | 154 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y |
| 144 | CONFIG_ARCH_FLATMEM_ENABLE=y | 155 | CONFIG_ARCH_FLATMEM_ENABLE=y |
| 156 | CONFIG_ARCH_POPULATES_NODE_MAP=y | ||
| 145 | CONFIG_SELECT_MEMORY_MODEL=y | 157 | CONFIG_SELECT_MEMORY_MODEL=y |
| 146 | CONFIG_FLATMEM_MANUAL=y | 158 | CONFIG_FLATMEM_MANUAL=y |
| 147 | # CONFIG_DISCONTIGMEM_MANUAL is not set | 159 | # CONFIG_DISCONTIGMEM_MANUAL is not set |
| @@ -207,6 +219,7 @@ CONFIG_PACKET=y | |||
| 207 | CONFIG_UNIX=y | 219 | CONFIG_UNIX=y |
| 208 | CONFIG_XFRM=y | 220 | CONFIG_XFRM=y |
| 209 | # CONFIG_XFRM_USER is not set | 221 | # CONFIG_XFRM_USER is not set |
| 222 | # CONFIG_XFRM_SUB_POLICY is not set | ||
| 210 | # CONFIG_NET_KEY is not set | 223 | # CONFIG_NET_KEY is not set |
| 211 | CONFIG_INET=y | 224 | CONFIG_INET=y |
| 212 | CONFIG_IP_MULTICAST=y | 225 | CONFIG_IP_MULTICAST=y |
| @@ -228,10 +241,13 @@ CONFIG_SYN_COOKIES=y | |||
| 228 | # CONFIG_INET_TUNNEL is not set | 241 | # CONFIG_INET_TUNNEL is not set |
| 229 | CONFIG_INET_XFRM_MODE_TRANSPORT=y | 242 | CONFIG_INET_XFRM_MODE_TRANSPORT=y |
| 230 | CONFIG_INET_XFRM_MODE_TUNNEL=y | 243 | CONFIG_INET_XFRM_MODE_TUNNEL=y |
| 244 | CONFIG_INET_XFRM_MODE_BEET=y | ||
| 231 | CONFIG_INET_DIAG=y | 245 | CONFIG_INET_DIAG=y |
| 232 | CONFIG_INET_TCP_DIAG=y | 246 | CONFIG_INET_TCP_DIAG=y |
| 233 | # CONFIG_TCP_CONG_ADVANCED is not set | 247 | # CONFIG_TCP_CONG_ADVANCED is not set |
| 234 | CONFIG_TCP_CONG_BIC=y | 248 | CONFIG_TCP_CONG_CUBIC=y |
| 249 | CONFIG_DEFAULT_TCP_CONG="cubic" | ||
| 250 | # CONFIG_TCP_MD5SIG is not set | ||
| 235 | # CONFIG_IPV6 is not set | 251 | # CONFIG_IPV6 is not set |
| 236 | # CONFIG_INET6_XFRM_TUNNEL is not set | 252 | # CONFIG_INET6_XFRM_TUNNEL is not set |
| 237 | # CONFIG_INET6_TUNNEL is not set | 253 | # CONFIG_INET6_TUNNEL is not set |
| @@ -331,6 +347,12 @@ CONFIG_BLK_DEV_INITRD=y | |||
| 331 | # CONFIG_ATA_OVER_ETH is not set | 347 | # CONFIG_ATA_OVER_ETH is not set |
| 332 | 348 | ||
| 333 | # | 349 | # |
| 350 | # Misc devices | ||
| 351 | # | ||
| 352 | # CONFIG_SGI_IOC4 is not set | ||
| 353 | # CONFIG_TIFM_CORE is not set | ||
| 354 | |||
| 355 | # | ||
| 334 | # ATA/ATAPI/MFM/RLL support | 356 | # ATA/ATAPI/MFM/RLL support |
| 335 | # | 357 | # |
| 336 | # CONFIG_IDE is not set | 358 | # CONFIG_IDE is not set |
| @@ -340,6 +362,8 @@ CONFIG_BLK_DEV_INITRD=y | |||
| 340 | # | 362 | # |
| 341 | # CONFIG_RAID_ATTRS is not set | 363 | # CONFIG_RAID_ATTRS is not set |
| 342 | CONFIG_SCSI=y | 364 | CONFIG_SCSI=y |
| 365 | # CONFIG_SCSI_TGT is not set | ||
| 366 | # CONFIG_SCSI_NETLINK is not set | ||
| 343 | CONFIG_SCSI_PROC_FS=y | 367 | CONFIG_SCSI_PROC_FS=y |
| 344 | 368 | ||
| 345 | # | 369 | # |
| @@ -358,14 +382,16 @@ CONFIG_SCSI_PROC_FS=y | |||
| 358 | # CONFIG_SCSI_MULTI_LUN is not set | 382 | # CONFIG_SCSI_MULTI_LUN is not set |
| 359 | # CONFIG_SCSI_CONSTANTS is not set | 383 | # CONFIG_SCSI_CONSTANTS is not set |
| 360 | # CONFIG_SCSI_LOGGING is not set | 384 | # CONFIG_SCSI_LOGGING is not set |
| 385 | # CONFIG_SCSI_SCAN_ASYNC is not set | ||
| 361 | 386 | ||
| 362 | # | 387 | # |
| 363 | # SCSI Transport Attributes | 388 | # SCSI Transports |
| 364 | # | 389 | # |
| 365 | # CONFIG_SCSI_SPI_ATTRS is not set | 390 | # CONFIG_SCSI_SPI_ATTRS is not set |
| 366 | # CONFIG_SCSI_FC_ATTRS is not set | 391 | # CONFIG_SCSI_FC_ATTRS is not set |
| 367 | # CONFIG_SCSI_ISCSI_ATTRS is not set | 392 | # CONFIG_SCSI_ISCSI_ATTRS is not set |
| 368 | # CONFIG_SCSI_SAS_ATTRS is not set | 393 | # CONFIG_SCSI_SAS_ATTRS is not set |
| 394 | # CONFIG_SCSI_SAS_LIBSAS is not set | ||
| 369 | 395 | ||
| 370 | # | 396 | # |
| 371 | # SCSI low-level drivers | 397 | # SCSI low-level drivers |
| @@ -378,11 +404,12 @@ CONFIG_SCSI_PROC_FS=y | |||
| 378 | # CONFIG_SCSI_AIC7XXX is not set | 404 | # CONFIG_SCSI_AIC7XXX is not set |
| 379 | # CONFIG_SCSI_AIC7XXX_OLD is not set | 405 | # CONFIG_SCSI_AIC7XXX_OLD is not set |
| 380 | # CONFIG_SCSI_AIC79XX is not set | 406 | # CONFIG_SCSI_AIC79XX is not set |
| 407 | # CONFIG_SCSI_AIC94XX is not set | ||
| 381 | # CONFIG_SCSI_DPT_I2O is not set | 408 | # CONFIG_SCSI_DPT_I2O is not set |
| 409 | # CONFIG_SCSI_ARCMSR is not set | ||
| 382 | # CONFIG_MEGARAID_NEWGEN is not set | 410 | # CONFIG_MEGARAID_NEWGEN is not set |
| 383 | # CONFIG_MEGARAID_LEGACY is not set | 411 | # CONFIG_MEGARAID_LEGACY is not set |
| 384 | # CONFIG_MEGARAID_SAS is not set | 412 | # CONFIG_MEGARAID_SAS is not set |
| 385 | # CONFIG_SCSI_SATA is not set | ||
| 386 | # CONFIG_SCSI_HPTIOP is not set | 413 | # CONFIG_SCSI_HPTIOP is not set |
| 387 | # CONFIG_SCSI_BUSLOGIC is not set | 414 | # CONFIG_SCSI_BUSLOGIC is not set |
| 388 | # CONFIG_SCSI_DMX3191D is not set | 415 | # CONFIG_SCSI_DMX3191D is not set |
| @@ -392,15 +419,22 @@ CONFIG_SCSI_PROC_FS=y | |||
| 392 | # CONFIG_SCSI_IPS is not set | 419 | # CONFIG_SCSI_IPS is not set |
| 393 | # CONFIG_SCSI_INITIO is not set | 420 | # CONFIG_SCSI_INITIO is not set |
| 394 | # CONFIG_SCSI_INIA100 is not set | 421 | # CONFIG_SCSI_INIA100 is not set |
| 422 | # CONFIG_SCSI_STEX is not set | ||
| 395 | # CONFIG_SCSI_SYM53C8XX_2 is not set | 423 | # CONFIG_SCSI_SYM53C8XX_2 is not set |
| 396 | # CONFIG_SCSI_IPR is not set | ||
| 397 | # CONFIG_SCSI_QLOGIC_1280 is not set | 424 | # CONFIG_SCSI_QLOGIC_1280 is not set |
| 398 | # CONFIG_SCSI_QLA_FC is not set | 425 | # CONFIG_SCSI_QLA_FC is not set |
| 426 | # CONFIG_SCSI_QLA_ISCSI is not set | ||
| 399 | # CONFIG_SCSI_LPFC is not set | 427 | # CONFIG_SCSI_LPFC is not set |
| 400 | # CONFIG_SCSI_DC395x is not set | 428 | # CONFIG_SCSI_DC395x is not set |
| 401 | # CONFIG_SCSI_DC390T is not set | 429 | # CONFIG_SCSI_DC390T is not set |
| 402 | # CONFIG_SCSI_NSP32 is not set | 430 | # CONFIG_SCSI_NSP32 is not set |
| 403 | # CONFIG_SCSI_DEBUG is not set | 431 | # CONFIG_SCSI_DEBUG is not set |
| 432 | # CONFIG_SCSI_SRP is not set | ||
| 433 | |||
| 434 | # | ||
| 435 | # Serial ATA (prod) and Parallel ATA (experimental) drivers | ||
| 436 | # | ||
| 437 | # CONFIG_ATA is not set | ||
| 404 | 438 | ||
| 405 | # | 439 | # |
| 406 | # Multi-device support (RAID and LVM) | 440 | # Multi-device support (RAID and LVM) |
| @@ -428,6 +462,7 @@ CONFIG_SCSI_PROC_FS=y | |||
| 428 | # | 462 | # |
| 429 | # Macintosh device drivers | 463 | # Macintosh device drivers |
| 430 | # | 464 | # |
| 465 | # CONFIG_MAC_EMUMOUSEBTN is not set | ||
| 431 | # CONFIG_WINDFARM is not set | 466 | # CONFIG_WINDFARM is not set |
| 432 | 467 | ||
| 433 | # | 468 | # |
| @@ -488,6 +523,7 @@ CONFIG_UCC_GETH=y | |||
| 488 | # CONFIG_UGETH_MAGIC_PACKET is not set | 523 | # CONFIG_UGETH_MAGIC_PACKET is not set |
| 489 | # CONFIG_UGETH_FILTERING is not set | 524 | # CONFIG_UGETH_FILTERING is not set |
| 490 | # CONFIG_UGETH_TX_ON_DEMOND is not set | 525 | # CONFIG_UGETH_TX_ON_DEMOND is not set |
| 526 | # CONFIG_QLA3XXX is not set | ||
| 491 | 527 | ||
| 492 | # | 528 | # |
| 493 | # Ethernet (10000 Mbit) | 529 | # Ethernet (10000 Mbit) |
| @@ -496,6 +532,7 @@ CONFIG_UCC_GETH=y | |||
| 496 | # CONFIG_IXGB is not set | 532 | # CONFIG_IXGB is not set |
| 497 | # CONFIG_S2IO is not set | 533 | # CONFIG_S2IO is not set |
| 498 | # CONFIG_MYRI10GE is not set | 534 | # CONFIG_MYRI10GE is not set |
| 535 | # CONFIG_NETXEN_NIC is not set | ||
| 499 | 536 | ||
| 500 | # | 537 | # |
| 501 | # Token Ring devices | 538 | # Token Ring devices |
| @@ -535,6 +572,7 @@ CONFIG_UCC_GETH=y | |||
| 535 | # Input device support | 572 | # Input device support |
| 536 | # | 573 | # |
| 537 | CONFIG_INPUT=y | 574 | CONFIG_INPUT=y |
| 575 | # CONFIG_INPUT_FF_MEMLESS is not set | ||
| 538 | 576 | ||
| 539 | # | 577 | # |
| 540 | # Userland interfaces | 578 | # Userland interfaces |
| @@ -579,6 +617,7 @@ CONFIG_SERIAL_8250_RUNTIME_UARTS=4 | |||
| 579 | # | 617 | # |
| 580 | # Non-8250 serial port support | 618 | # Non-8250 serial port support |
| 581 | # | 619 | # |
| 620 | # CONFIG_SERIAL_UARTLITE is not set | ||
| 582 | CONFIG_SERIAL_CORE=y | 621 | CONFIG_SERIAL_CORE=y |
| 583 | CONFIG_SERIAL_CORE_CONSOLE=y | 622 | CONFIG_SERIAL_CORE_CONSOLE=y |
| 584 | # CONFIG_SERIAL_JSM is not set | 623 | # CONFIG_SERIAL_JSM is not set |
| @@ -615,10 +654,6 @@ CONFIG_GEN_RTC=y | |||
| 615 | # CONFIG_DTLK is not set | 654 | # CONFIG_DTLK is not set |
| 616 | # CONFIG_R3964 is not set | 655 | # CONFIG_R3964 is not set |
| 617 | # CONFIG_APPLICOM is not set | 656 | # CONFIG_APPLICOM is not set |
| 618 | |||
| 619 | # | ||
| 620 | # Ftape, the floppy tape device driver | ||
| 621 | # | ||
| 622 | # CONFIG_AGP is not set | 657 | # CONFIG_AGP is not set |
| 623 | # CONFIG_DRM is not set | 658 | # CONFIG_DRM is not set |
| 624 | # CONFIG_RAW_DRIVER is not set | 659 | # CONFIG_RAW_DRIVER is not set |
| @@ -627,7 +662,6 @@ CONFIG_GEN_RTC=y | |||
| 627 | # TPM devices | 662 | # TPM devices |
| 628 | # | 663 | # |
| 629 | # CONFIG_TCG_TPM is not set | 664 | # CONFIG_TCG_TPM is not set |
| 630 | # CONFIG_TELCLOCK is not set | ||
| 631 | 665 | ||
| 632 | # | 666 | # |
| 633 | # I2C support | 667 | # I2C support |
| @@ -693,6 +727,7 @@ CONFIG_I2C_MPC=y | |||
| 693 | # | 727 | # |
| 694 | # Dallas's 1-wire bus | 728 | # Dallas's 1-wire bus |
| 695 | # | 729 | # |
| 730 | # CONFIG_W1 is not set | ||
| 696 | 731 | ||
| 697 | # | 732 | # |
| 698 | # Hardware Monitoring support | 733 | # Hardware Monitoring support |
| @@ -726,29 +761,27 @@ CONFIG_HWMON=y | |||
| 726 | # CONFIG_SENSORS_LM92 is not set | 761 | # CONFIG_SENSORS_LM92 is not set |
| 727 | # CONFIG_SENSORS_MAX1619 is not set | 762 | # CONFIG_SENSORS_MAX1619 is not set |
| 728 | # CONFIG_SENSORS_PC87360 is not set | 763 | # CONFIG_SENSORS_PC87360 is not set |
| 764 | # CONFIG_SENSORS_PC87427 is not set | ||
| 729 | # CONFIG_SENSORS_SIS5595 is not set | 765 | # CONFIG_SENSORS_SIS5595 is not set |
| 730 | # CONFIG_SENSORS_SMSC47M1 is not set | 766 | # CONFIG_SENSORS_SMSC47M1 is not set |
| 731 | # CONFIG_SENSORS_SMSC47M192 is not set | 767 | # CONFIG_SENSORS_SMSC47M192 is not set |
| 732 | # CONFIG_SENSORS_SMSC47B397 is not set | 768 | # CONFIG_SENSORS_SMSC47B397 is not set |
| 733 | # CONFIG_SENSORS_VIA686A is not set | 769 | # CONFIG_SENSORS_VIA686A is not set |
| 770 | # CONFIG_SENSORS_VT1211 is not set | ||
| 734 | # CONFIG_SENSORS_VT8231 is not set | 771 | # CONFIG_SENSORS_VT8231 is not set |
| 735 | # CONFIG_SENSORS_W83781D is not set | 772 | # CONFIG_SENSORS_W83781D is not set |
| 736 | # CONFIG_SENSORS_W83791D is not set | 773 | # CONFIG_SENSORS_W83791D is not set |
| 737 | # CONFIG_SENSORS_W83792D is not set | 774 | # CONFIG_SENSORS_W83792D is not set |
| 775 | # CONFIG_SENSORS_W83793 is not set | ||
| 738 | # CONFIG_SENSORS_W83L785TS is not set | 776 | # CONFIG_SENSORS_W83L785TS is not set |
| 739 | # CONFIG_SENSORS_W83627HF is not set | 777 | # CONFIG_SENSORS_W83627HF is not set |
| 740 | # CONFIG_SENSORS_W83627EHF is not set | 778 | # CONFIG_SENSORS_W83627EHF is not set |
| 741 | # CONFIG_HWMON_DEBUG_CHIP is not set | 779 | # CONFIG_HWMON_DEBUG_CHIP is not set |
| 742 | 780 | ||
| 743 | # | 781 | # |
| 744 | # Misc devices | ||
| 745 | # | ||
| 746 | |||
| 747 | # | ||
| 748 | # Multimedia devices | 782 | # Multimedia devices |
| 749 | # | 783 | # |
| 750 | # CONFIG_VIDEO_DEV is not set | 784 | # CONFIG_VIDEO_DEV is not set |
| 751 | CONFIG_VIDEO_V4L2=y | ||
| 752 | 785 | ||
| 753 | # | 786 | # |
| 754 | # Digital Video Broadcasting Devices | 787 | # Digital Video Broadcasting Devices |
| @@ -760,6 +793,7 @@ CONFIG_VIDEO_V4L2=y | |||
| 760 | # | 793 | # |
| 761 | CONFIG_FIRMWARE_EDID=y | 794 | CONFIG_FIRMWARE_EDID=y |
| 762 | # CONFIG_FB is not set | 795 | # CONFIG_FB is not set |
| 796 | # CONFIG_FB_IBM_GXT4500 is not set | ||
| 763 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set | 797 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set |
| 764 | 798 | ||
| 765 | # | 799 | # |
| @@ -768,6 +802,11 @@ CONFIG_FIRMWARE_EDID=y | |||
| 768 | # CONFIG_SOUND is not set | 802 | # CONFIG_SOUND is not set |
| 769 | 803 | ||
| 770 | # | 804 | # |
| 805 | # HID Devices | ||
| 806 | # | ||
| 807 | CONFIG_HID=y | ||
| 808 | |||
| 809 | # | ||
| 771 | # USB support | 810 | # USB support |
| 772 | # | 811 | # |
| 773 | CONFIG_USB_ARCH_HAS_HCD=y | 812 | CONFIG_USB_ARCH_HAS_HCD=y |
| @@ -830,6 +869,10 @@ CONFIG_USB_ARCH_HAS_EHCI=y | |||
| 830 | # | 869 | # |
| 831 | 870 | ||
| 832 | # | 871 | # |
| 872 | # Virtualization | ||
| 873 | # | ||
| 874 | |||
| 875 | # | ||
| 833 | # File systems | 876 | # File systems |
| 834 | # | 877 | # |
| 835 | CONFIG_EXT2_FS=y | 878 | CONFIG_EXT2_FS=y |
| @@ -839,6 +882,7 @@ CONFIG_EXT3_FS=y | |||
| 839 | CONFIG_EXT3_FS_XATTR=y | 882 | CONFIG_EXT3_FS_XATTR=y |
| 840 | # CONFIG_EXT3_FS_POSIX_ACL is not set | 883 | # CONFIG_EXT3_FS_POSIX_ACL is not set |
| 841 | # CONFIG_EXT3_FS_SECURITY is not set | 884 | # CONFIG_EXT3_FS_SECURITY is not set |
| 885 | # CONFIG_EXT4DEV_FS is not set | ||
| 842 | CONFIG_JBD=y | 886 | CONFIG_JBD=y |
| 843 | # CONFIG_JBD_DEBUG is not set | 887 | # CONFIG_JBD_DEBUG is not set |
| 844 | CONFIG_FS_MBCACHE=y | 888 | CONFIG_FS_MBCACHE=y |
| @@ -846,6 +890,7 @@ CONFIG_FS_MBCACHE=y | |||
| 846 | # CONFIG_JFS_FS is not set | 890 | # CONFIG_JFS_FS is not set |
| 847 | # CONFIG_FS_POSIX_ACL is not set | 891 | # CONFIG_FS_POSIX_ACL is not set |
| 848 | # CONFIG_XFS_FS is not set | 892 | # CONFIG_XFS_FS is not set |
| 893 | # CONFIG_GFS2_FS is not set | ||
| 849 | # CONFIG_OCFS2_FS is not set | 894 | # CONFIG_OCFS2_FS is not set |
| 850 | # CONFIG_MINIX_FS is not set | 895 | # CONFIG_MINIX_FS is not set |
| 851 | # CONFIG_ROMFS_FS is not set | 896 | # CONFIG_ROMFS_FS is not set |
| @@ -875,8 +920,10 @@ CONFIG_DNOTIFY=y | |||
| 875 | # | 920 | # |
| 876 | CONFIG_PROC_FS=y | 921 | CONFIG_PROC_FS=y |
| 877 | CONFIG_PROC_KCORE=y | 922 | CONFIG_PROC_KCORE=y |
| 923 | CONFIG_PROC_SYSCTL=y | ||
| 878 | CONFIG_SYSFS=y | 924 | CONFIG_SYSFS=y |
| 879 | CONFIG_TMPFS=y | 925 | CONFIG_TMPFS=y |
| 926 | # CONFIG_TMPFS_POSIX_ACL is not set | ||
| 880 | # CONFIG_HUGETLB_PAGE is not set | 927 | # CONFIG_HUGETLB_PAGE is not set |
| 881 | CONFIG_RAMFS=y | 928 | CONFIG_RAMFS=y |
| 882 | # CONFIG_CONFIGFS_FS is not set | 929 | # CONFIG_CONFIGFS_FS is not set |
| @@ -945,20 +992,27 @@ CONFIG_PARTITION_ADVANCED=y | |||
| 945 | # CONFIG_NLS is not set | 992 | # CONFIG_NLS is not set |
| 946 | 993 | ||
| 947 | # | 994 | # |
| 995 | # Distributed Lock Manager | ||
| 996 | # | ||
| 997 | # CONFIG_DLM is not set | ||
| 998 | |||
| 999 | # | ||
| 948 | # QE Options | 1000 | # QE Options |
| 949 | # | 1001 | # |
| 950 | # CONFIG_UCC_SLOW is not set | 1002 | CONFIG_UCC_SLOW=y |
| 951 | CONFIG_UCC_FAST=y | 1003 | CONFIG_UCC_FAST=y |
| 952 | CONFIG_UCC=y | 1004 | CONFIG_UCC=y |
| 953 | 1005 | ||
| 954 | # | 1006 | # |
| 955 | # Library routines | 1007 | # Library routines |
| 956 | # | 1008 | # |
| 1009 | CONFIG_BITREVERSE=y | ||
| 957 | # CONFIG_CRC_CCITT is not set | 1010 | # CONFIG_CRC_CCITT is not set |
| 958 | # CONFIG_CRC16 is not set | 1011 | # CONFIG_CRC16 is not set |
| 959 | CONFIG_CRC32=y | 1012 | CONFIG_CRC32=y |
| 960 | # CONFIG_LIBCRC32C is not set | 1013 | # CONFIG_LIBCRC32C is not set |
| 961 | CONFIG_PLIST=y | 1014 | CONFIG_PLIST=y |
| 1015 | CONFIG_IOMAP_COPY=y | ||
| 962 | 1016 | ||
| 963 | # | 1017 | # |
| 964 | # Instrumentation Support | 1018 | # Instrumentation Support |
| @@ -969,11 +1023,14 @@ CONFIG_PLIST=y | |||
| 969 | # Kernel hacking | 1023 | # Kernel hacking |
| 970 | # | 1024 | # |
| 971 | # CONFIG_PRINTK_TIME is not set | 1025 | # CONFIG_PRINTK_TIME is not set |
| 1026 | CONFIG_ENABLE_MUST_CHECK=y | ||
| 972 | # CONFIG_MAGIC_SYSRQ is not set | 1027 | # CONFIG_MAGIC_SYSRQ is not set |
| 973 | # CONFIG_UNUSED_SYMBOLS is not set | 1028 | # CONFIG_UNUSED_SYMBOLS is not set |
| 1029 | # CONFIG_DEBUG_FS is not set | ||
| 1030 | # CONFIG_HEADERS_CHECK is not set | ||
| 974 | # CONFIG_DEBUG_KERNEL is not set | 1031 | # CONFIG_DEBUG_KERNEL is not set |
| 975 | CONFIG_LOG_BUF_SHIFT=14 | 1032 | CONFIG_LOG_BUF_SHIFT=14 |
| 976 | # CONFIG_DEBUG_FS is not set | 1033 | # CONFIG_DEBUG_BUGVERBOSE is not set |
| 977 | # CONFIG_BOOTX_TEXT is not set | 1034 | # CONFIG_BOOTX_TEXT is not set |
| 978 | # CONFIG_SERIAL_TEXT_DEBUG is not set | 1035 | # CONFIG_SERIAL_TEXT_DEBUG is not set |
| 979 | # CONFIG_PPC_EARLY_DEBUG is not set | 1036 | # CONFIG_PPC_EARLY_DEBUG is not set |
| @@ -988,7 +1045,11 @@ CONFIG_LOG_BUF_SHIFT=14 | |||
| 988 | # Cryptographic options | 1045 | # Cryptographic options |
| 989 | # | 1046 | # |
| 990 | CONFIG_CRYPTO=y | 1047 | CONFIG_CRYPTO=y |
| 1048 | CONFIG_CRYPTO_ALGAPI=y | ||
| 1049 | CONFIG_CRYPTO_BLKCIPHER=y | ||
| 1050 | CONFIG_CRYPTO_MANAGER=y | ||
| 991 | # CONFIG_CRYPTO_HMAC is not set | 1051 | # CONFIG_CRYPTO_HMAC is not set |
| 1052 | # CONFIG_CRYPTO_XCBC is not set | ||
| 992 | # CONFIG_CRYPTO_NULL is not set | 1053 | # CONFIG_CRYPTO_NULL is not set |
| 993 | # CONFIG_CRYPTO_MD4 is not set | 1054 | # CONFIG_CRYPTO_MD4 is not set |
| 994 | CONFIG_CRYPTO_MD5=y | 1055 | CONFIG_CRYPTO_MD5=y |
| @@ -997,6 +1058,10 @@ CONFIG_CRYPTO_MD5=y | |||
| 997 | # CONFIG_CRYPTO_SHA512 is not set | 1058 | # CONFIG_CRYPTO_SHA512 is not set |
| 998 | # CONFIG_CRYPTO_WP512 is not set | 1059 | # CONFIG_CRYPTO_WP512 is not set |
| 999 | # CONFIG_CRYPTO_TGR192 is not set | 1060 | # CONFIG_CRYPTO_TGR192 is not set |
| 1061 | # CONFIG_CRYPTO_GF128MUL is not set | ||
| 1062 | CONFIG_CRYPTO_ECB=m | ||
| 1063 | CONFIG_CRYPTO_CBC=y | ||
| 1064 | # CONFIG_CRYPTO_LRW is not set | ||
| 1000 | CONFIG_CRYPTO_DES=y | 1065 | CONFIG_CRYPTO_DES=y |
| 1001 | # CONFIG_CRYPTO_BLOWFISH is not set | 1066 | # CONFIG_CRYPTO_BLOWFISH is not set |
| 1002 | # CONFIG_CRYPTO_TWOFISH is not set | 1067 | # CONFIG_CRYPTO_TWOFISH is not set |
diff --git a/arch/powerpc/configs/mpc8540_ads_defconfig b/arch/powerpc/configs/mpc8540_ads_defconfig index 67e7d0b5793d..17120c472304 100644 --- a/arch/powerpc/configs/mpc8540_ads_defconfig +++ b/arch/powerpc/configs/mpc8540_ads_defconfig | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.18-rc6 | 3 | # Linux kernel version: 2.6.20-rc5 |
| 4 | # Sun Sep 10 10:29:23 2006 | 4 | # Mon Jan 22 22:25:24 2007 |
| 5 | # | 5 | # |
| 6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
| 7 | CONFIG_PPC32=y | 7 | CONFIG_PPC32=y |
| @@ -10,6 +10,7 @@ CONFIG_MMU=y | |||
| 10 | CONFIG_GENERIC_HARDIRQS=y | 10 | CONFIG_GENERIC_HARDIRQS=y |
| 11 | CONFIG_IRQ_PER_CPU=y | 11 | CONFIG_IRQ_PER_CPU=y |
| 12 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 12 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
| 13 | CONFIG_ARCH_HAS_ILOG2_U32=y | ||
| 13 | CONFIG_GENERIC_HWEIGHT=y | 14 | CONFIG_GENERIC_HWEIGHT=y |
| 14 | CONFIG_GENERIC_CALIBRATE_DELAY=y | 15 | CONFIG_GENERIC_CALIBRATE_DELAY=y |
| 15 | CONFIG_GENERIC_FIND_NEXT_BIT=y | 16 | CONFIG_GENERIC_FIND_NEXT_BIT=y |
| @@ -21,13 +22,14 @@ CONFIG_ARCH_MAY_HAVE_PC_FDC=y | |||
| 21 | CONFIG_PPC_OF=y | 22 | CONFIG_PPC_OF=y |
| 22 | CONFIG_PPC_UDBG_16550=y | 23 | CONFIG_PPC_UDBG_16550=y |
| 23 | # CONFIG_GENERIC_TBSYNC is not set | 24 | # CONFIG_GENERIC_TBSYNC is not set |
| 25 | CONFIG_AUDIT_ARCH=y | ||
| 26 | CONFIG_GENERIC_BUG=y | ||
| 24 | CONFIG_DEFAULT_UIMAGE=y | 27 | CONFIG_DEFAULT_UIMAGE=y |
| 25 | 28 | ||
| 26 | # | 29 | # |
| 27 | # Processor support | 30 | # Processor support |
| 28 | # | 31 | # |
| 29 | # CONFIG_CLASSIC32 is not set | 32 | # CONFIG_CLASSIC32 is not set |
| 30 | # CONFIG_PPC_52xx is not set | ||
| 31 | # CONFIG_PPC_82xx is not set | 33 | # CONFIG_PPC_82xx is not set |
| 32 | # CONFIG_PPC_83xx is not set | 34 | # CONFIG_PPC_83xx is not set |
| 33 | CONFIG_PPC_85xx=y | 35 | CONFIG_PPC_85xx=y |
| @@ -38,6 +40,8 @@ CONFIG_PPC_85xx=y | |||
| 38 | # CONFIG_E200 is not set | 40 | # CONFIG_E200 is not set |
| 39 | CONFIG_85xx=y | 41 | CONFIG_85xx=y |
| 40 | CONFIG_E500=y | 42 | CONFIG_E500=y |
| 43 | # CONFIG_PPC_DCR_NATIVE is not set | ||
| 44 | # CONFIG_PPC_DCR_MMIO is not set | ||
| 41 | CONFIG_BOOKE=y | 45 | CONFIG_BOOKE=y |
| 42 | CONFIG_FSL_BOOKE=y | 46 | CONFIG_FSL_BOOKE=y |
| 43 | # CONFIG_PHYS_64BIT is not set | 47 | # CONFIG_PHYS_64BIT is not set |
| @@ -58,16 +62,20 @@ CONFIG_LOCALVERSION="" | |||
| 58 | CONFIG_LOCALVERSION_AUTO=y | 62 | CONFIG_LOCALVERSION_AUTO=y |
| 59 | CONFIG_SWAP=y | 63 | CONFIG_SWAP=y |
| 60 | CONFIG_SYSVIPC=y | 64 | CONFIG_SYSVIPC=y |
| 65 | # CONFIG_IPC_NS is not set | ||
| 61 | # CONFIG_POSIX_MQUEUE is not set | 66 | # CONFIG_POSIX_MQUEUE is not set |
| 62 | # CONFIG_BSD_PROCESS_ACCT is not set | 67 | # CONFIG_BSD_PROCESS_ACCT is not set |
| 63 | # CONFIG_TASKSTATS is not set | 68 | # CONFIG_TASKSTATS is not set |
| 64 | CONFIG_SYSCTL=y | 69 | # CONFIG_UTS_NS is not set |
| 65 | # CONFIG_AUDIT is not set | 70 | # CONFIG_AUDIT is not set |
| 66 | # CONFIG_IKCONFIG is not set | 71 | # CONFIG_IKCONFIG is not set |
| 72 | CONFIG_SYSFS_DEPRECATED=y | ||
| 67 | # CONFIG_RELAY is not set | 73 | # CONFIG_RELAY is not set |
| 68 | CONFIG_INITRAMFS_SOURCE="" | 74 | CONFIG_INITRAMFS_SOURCE="" |
| 69 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | 75 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set |
| 76 | CONFIG_SYSCTL=y | ||
| 70 | CONFIG_EMBEDDED=y | 77 | CONFIG_EMBEDDED=y |
| 78 | CONFIG_SYSCTL_SYSCALL=y | ||
| 71 | CONFIG_KALLSYMS=y | 79 | CONFIG_KALLSYMS=y |
| 72 | # CONFIG_KALLSYMS_ALL is not set | 80 | # CONFIG_KALLSYMS_ALL is not set |
| 73 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | 81 | # CONFIG_KALLSYMS_EXTRA_PASS is not set |
| @@ -76,12 +84,12 @@ CONFIG_PRINTK=y | |||
| 76 | CONFIG_BUG=y | 84 | CONFIG_BUG=y |
| 77 | CONFIG_ELF_CORE=y | 85 | CONFIG_ELF_CORE=y |
| 78 | CONFIG_BASE_FULL=y | 86 | CONFIG_BASE_FULL=y |
| 79 | CONFIG_RT_MUTEXES=y | ||
| 80 | CONFIG_FUTEX=y | 87 | CONFIG_FUTEX=y |
| 81 | CONFIG_EPOLL=y | 88 | CONFIG_EPOLL=y |
| 82 | CONFIG_SHMEM=y | 89 | CONFIG_SHMEM=y |
| 83 | CONFIG_SLAB=y | 90 | CONFIG_SLAB=y |
| 84 | CONFIG_VM_EVENT_COUNTERS=y | 91 | CONFIG_VM_EVENT_COUNTERS=y |
| 92 | CONFIG_RT_MUTEXES=y | ||
| 85 | # CONFIG_TINY_SHMEM is not set | 93 | # CONFIG_TINY_SHMEM is not set |
| 86 | CONFIG_BASE_SMALL=0 | 94 | CONFIG_BASE_SMALL=0 |
| 87 | # CONFIG_SLOB is not set | 95 | # CONFIG_SLOB is not set |
| @@ -94,6 +102,7 @@ CONFIG_BASE_SMALL=0 | |||
| 94 | # | 102 | # |
| 95 | # Block layer | 103 | # Block layer |
| 96 | # | 104 | # |
| 105 | CONFIG_BLOCK=y | ||
| 97 | # CONFIG_LBD is not set | 106 | # CONFIG_LBD is not set |
| 98 | # CONFIG_BLK_DEV_IO_TRACE is not set | 107 | # CONFIG_BLK_DEV_IO_TRACE is not set |
| 99 | # CONFIG_LSF is not set | 108 | # CONFIG_LSF is not set |
| @@ -116,6 +125,7 @@ CONFIG_DEFAULT_IOSCHED="anticipatory" | |||
| 116 | # Platform support | 125 | # Platform support |
| 117 | # | 126 | # |
| 118 | CONFIG_MPC8540_ADS=y | 127 | CONFIG_MPC8540_ADS=y |
| 128 | # CONFIG_MPC8560_ADS is not set | ||
| 119 | # CONFIG_MPC85xx_CDS is not set | 129 | # CONFIG_MPC85xx_CDS is not set |
| 120 | CONFIG_MPC8540=y | 130 | CONFIG_MPC8540=y |
| 121 | CONFIG_PPC_INDIRECT_PCI_BE=y | 131 | CONFIG_PPC_INDIRECT_PCI_BE=y |
| @@ -127,6 +137,7 @@ CONFIG_MPIC=y | |||
| 127 | # CONFIG_HIGHMEM is not set | 137 | # CONFIG_HIGHMEM is not set |
| 128 | # CONFIG_HZ_100 is not set | 138 | # CONFIG_HZ_100 is not set |
| 129 | CONFIG_HZ_250=y | 139 | CONFIG_HZ_250=y |
| 140 | # CONFIG_HZ_300 is not set | ||
| 130 | # CONFIG_HZ_1000 is not set | 141 | # CONFIG_HZ_1000 is not set |
| 131 | CONFIG_HZ=250 | 142 | CONFIG_HZ=250 |
| 132 | CONFIG_PREEMPT_NONE=y | 143 | CONFIG_PREEMPT_NONE=y |
| @@ -137,6 +148,7 @@ CONFIG_BINFMT_MISC=y | |||
| 137 | CONFIG_MATH_EMULATION=y | 148 | CONFIG_MATH_EMULATION=y |
| 138 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y | 149 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y |
| 139 | CONFIG_ARCH_FLATMEM_ENABLE=y | 150 | CONFIG_ARCH_FLATMEM_ENABLE=y |
| 151 | CONFIG_ARCH_POPULATES_NODE_MAP=y | ||
| 140 | CONFIG_SELECT_MEMORY_MODEL=y | 152 | CONFIG_SELECT_MEMORY_MODEL=y |
| 141 | CONFIG_FLATMEM_MANUAL=y | 153 | CONFIG_FLATMEM_MANUAL=y |
| 142 | # CONFIG_DISCONTIGMEM_MANUAL is not set | 154 | # CONFIG_DISCONTIGMEM_MANUAL is not set |
| @@ -199,6 +211,7 @@ CONFIG_PACKET=y | |||
| 199 | CONFIG_UNIX=y | 211 | CONFIG_UNIX=y |
| 200 | CONFIG_XFRM=y | 212 | CONFIG_XFRM=y |
| 201 | CONFIG_XFRM_USER=y | 213 | CONFIG_XFRM_USER=y |
| 214 | # CONFIG_XFRM_SUB_POLICY is not set | ||
| 202 | # CONFIG_NET_KEY is not set | 215 | # CONFIG_NET_KEY is not set |
| 203 | CONFIG_INET=y | 216 | CONFIG_INET=y |
| 204 | CONFIG_IP_MULTICAST=y | 217 | CONFIG_IP_MULTICAST=y |
| @@ -220,10 +233,13 @@ CONFIG_SYN_COOKIES=y | |||
| 220 | # CONFIG_INET_TUNNEL is not set | 233 | # CONFIG_INET_TUNNEL is not set |
| 221 | CONFIG_INET_XFRM_MODE_TRANSPORT=y | 234 | CONFIG_INET_XFRM_MODE_TRANSPORT=y |
| 222 | CONFIG_INET_XFRM_MODE_TUNNEL=y | 235 | CONFIG_INET_XFRM_MODE_TUNNEL=y |
| 236 | CONFIG_INET_XFRM_MODE_BEET=y | ||
| 223 | CONFIG_INET_DIAG=y | 237 | CONFIG_INET_DIAG=y |
| 224 | CONFIG_INET_TCP_DIAG=y | 238 | CONFIG_INET_TCP_DIAG=y |
| 225 | # CONFIG_TCP_CONG_ADVANCED is not set | 239 | # CONFIG_TCP_CONG_ADVANCED is not set |
| 226 | CONFIG_TCP_CONG_BIC=y | 240 | CONFIG_TCP_CONG_CUBIC=y |
| 241 | CONFIG_DEFAULT_TCP_CONG="cubic" | ||
| 242 | # CONFIG_TCP_MD5SIG is not set | ||
| 227 | # CONFIG_IPV6 is not set | 243 | # CONFIG_IPV6 is not set |
| 228 | # CONFIG_INET6_XFRM_TUNNEL is not set | 244 | # CONFIG_INET6_XFRM_TUNNEL is not set |
| 229 | # CONFIG_INET6_TUNNEL is not set | 245 | # CONFIG_INET6_TUNNEL is not set |
| @@ -253,7 +269,6 @@ CONFIG_TCP_CONG_BIC=y | |||
| 253 | # CONFIG_ATALK is not set | 269 | # CONFIG_ATALK is not set |
| 254 | # CONFIG_X25 is not set | 270 | # CONFIG_X25 is not set |
| 255 | # CONFIG_LAPB is not set | 271 | # CONFIG_LAPB is not set |
| 256 | # CONFIG_NET_DIVERT is not set | ||
| 257 | # CONFIG_ECONET is not set | 272 | # CONFIG_ECONET is not set |
| 258 | # CONFIG_WAN_ROUTER is not set | 273 | # CONFIG_WAN_ROUTER is not set |
| 259 | 274 | ||
| @@ -320,6 +335,11 @@ CONFIG_BLK_DEV_INITRD=y | |||
| 320 | # CONFIG_ATA_OVER_ETH is not set | 335 | # CONFIG_ATA_OVER_ETH is not set |
| 321 | 336 | ||
| 322 | # | 337 | # |
| 338 | # Misc devices | ||
| 339 | # | ||
| 340 | # CONFIG_TIFM_CORE is not set | ||
| 341 | |||
| 342 | # | ||
| 323 | # ATA/ATAPI/MFM/RLL support | 343 | # ATA/ATAPI/MFM/RLL support |
| 324 | # | 344 | # |
| 325 | # CONFIG_IDE is not set | 345 | # CONFIG_IDE is not set |
| @@ -329,6 +349,12 @@ CONFIG_BLK_DEV_INITRD=y | |||
| 329 | # | 349 | # |
| 330 | # CONFIG_RAID_ATTRS is not set | 350 | # CONFIG_RAID_ATTRS is not set |
| 331 | # CONFIG_SCSI is not set | 351 | # CONFIG_SCSI is not set |
| 352 | # CONFIG_SCSI_NETLINK is not set | ||
| 353 | |||
| 354 | # | ||
| 355 | # Serial ATA (prod) and Parallel ATA (experimental) drivers | ||
| 356 | # | ||
| 357 | # CONFIG_ATA is not set | ||
| 332 | 358 | ||
| 333 | # | 359 | # |
| 334 | # Multi-device support (RAID and LVM) | 360 | # Multi-device support (RAID and LVM) |
| @@ -351,6 +377,7 @@ CONFIG_BLK_DEV_INITRD=y | |||
| 351 | # | 377 | # |
| 352 | # Macintosh device drivers | 378 | # Macintosh device drivers |
| 353 | # | 379 | # |
| 380 | # CONFIG_MAC_EMUMOUSEBTN is not set | ||
| 354 | # CONFIG_WINDFARM is not set | 381 | # CONFIG_WINDFARM is not set |
| 355 | 382 | ||
| 356 | # | 383 | # |
| @@ -377,6 +404,7 @@ CONFIG_PHYLIB=y | |||
| 377 | # CONFIG_CICADA_PHY is not set | 404 | # CONFIG_CICADA_PHY is not set |
| 378 | # CONFIG_VITESSE_PHY is not set | 405 | # CONFIG_VITESSE_PHY is not set |
| 379 | # CONFIG_SMSC_PHY is not set | 406 | # CONFIG_SMSC_PHY is not set |
| 407 | # CONFIG_BROADCOM_PHY is not set | ||
| 380 | # CONFIG_FIXED_PHY is not set | 408 | # CONFIG_FIXED_PHY is not set |
| 381 | 409 | ||
| 382 | # | 410 | # |
| @@ -429,6 +457,7 @@ CONFIG_GFAR_NAPI=y | |||
| 429 | # Input device support | 457 | # Input device support |
| 430 | # | 458 | # |
| 431 | CONFIG_INPUT=y | 459 | CONFIG_INPUT=y |
| 460 | # CONFIG_INPUT_FF_MEMLESS is not set | ||
| 432 | 461 | ||
| 433 | # | 462 | # |
| 434 | # Userland interfaces | 463 | # Userland interfaces |
| @@ -472,6 +501,7 @@ CONFIG_SERIAL_8250_RUNTIME_UARTS=4 | |||
| 472 | # | 501 | # |
| 473 | # Non-8250 serial port support | 502 | # Non-8250 serial port support |
| 474 | # | 503 | # |
| 504 | # CONFIG_SERIAL_UARTLITE is not set | ||
| 475 | CONFIG_SERIAL_CORE=y | 505 | CONFIG_SERIAL_CORE=y |
| 476 | CONFIG_SERIAL_CORE_CONSOLE=y | 506 | CONFIG_SERIAL_CORE_CONSOLE=y |
| 477 | CONFIG_UNIX98_PTYS=y | 507 | CONFIG_UNIX98_PTYS=y |
| @@ -493,17 +523,12 @@ CONFIG_GEN_RTC=y | |||
| 493 | # CONFIG_GEN_RTC_X is not set | 523 | # CONFIG_GEN_RTC_X is not set |
| 494 | # CONFIG_DTLK is not set | 524 | # CONFIG_DTLK is not set |
| 495 | # CONFIG_R3964 is not set | 525 | # CONFIG_R3964 is not set |
| 496 | |||
| 497 | # | ||
| 498 | # Ftape, the floppy tape device driver | ||
| 499 | # | ||
| 500 | # CONFIG_RAW_DRIVER is not set | 526 | # CONFIG_RAW_DRIVER is not set |
| 501 | 527 | ||
| 502 | # | 528 | # |
| 503 | # TPM devices | 529 | # TPM devices |
| 504 | # | 530 | # |
| 505 | # CONFIG_TCG_TPM is not set | 531 | # CONFIG_TCG_TPM is not set |
| 506 | # CONFIG_TELCLOCK is not set | ||
| 507 | 532 | ||
| 508 | # | 533 | # |
| 509 | # I2C support | 534 | # I2C support |
| @@ -519,6 +544,7 @@ CONFIG_GEN_RTC=y | |||
| 519 | # | 544 | # |
| 520 | # Dallas's 1-wire bus | 545 | # Dallas's 1-wire bus |
| 521 | # | 546 | # |
| 547 | # CONFIG_W1 is not set | ||
| 522 | 548 | ||
| 523 | # | 549 | # |
| 524 | # Hardware Monitoring support | 550 | # Hardware Monitoring support |
| @@ -527,17 +553,14 @@ CONFIG_HWMON=y | |||
| 527 | # CONFIG_HWMON_VID is not set | 553 | # CONFIG_HWMON_VID is not set |
| 528 | # CONFIG_SENSORS_ABITUGURU is not set | 554 | # CONFIG_SENSORS_ABITUGURU is not set |
| 529 | # CONFIG_SENSORS_F71805F is not set | 555 | # CONFIG_SENSORS_F71805F is not set |
| 556 | # CONFIG_SENSORS_PC87427 is not set | ||
| 557 | # CONFIG_SENSORS_VT1211 is not set | ||
| 530 | # CONFIG_HWMON_DEBUG_CHIP is not set | 558 | # CONFIG_HWMON_DEBUG_CHIP is not set |
| 531 | 559 | ||
| 532 | # | 560 | # |
| 533 | # Misc devices | ||
| 534 | # | ||
| 535 | |||
| 536 | # | ||
| 537 | # Multimedia devices | 561 | # Multimedia devices |
| 538 | # | 562 | # |
| 539 | # CONFIG_VIDEO_DEV is not set | 563 | # CONFIG_VIDEO_DEV is not set |
| 540 | CONFIG_VIDEO_V4L2=y | ||
| 541 | 564 | ||
| 542 | # | 565 | # |
| 543 | # Digital Video Broadcasting Devices | 566 | # Digital Video Broadcasting Devices |
| @@ -549,6 +572,7 @@ CONFIG_VIDEO_V4L2=y | |||
| 549 | # | 572 | # |
| 550 | CONFIG_FIRMWARE_EDID=y | 573 | CONFIG_FIRMWARE_EDID=y |
| 551 | # CONFIG_FB is not set | 574 | # CONFIG_FB is not set |
| 575 | # CONFIG_FB_IBM_GXT4500 is not set | ||
| 552 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set | 576 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set |
| 553 | 577 | ||
| 554 | # | 578 | # |
| @@ -557,6 +581,11 @@ CONFIG_FIRMWARE_EDID=y | |||
| 557 | # CONFIG_SOUND is not set | 581 | # CONFIG_SOUND is not set |
| 558 | 582 | ||
| 559 | # | 583 | # |
| 584 | # HID Devices | ||
| 585 | # | ||
| 586 | CONFIG_HID=y | ||
| 587 | |||
| 588 | # | ||
| 560 | # USB support | 589 | # USB support |
| 561 | # | 590 | # |
| 562 | # CONFIG_USB_ARCH_HAS_HCD is not set | 591 | # CONFIG_USB_ARCH_HAS_HCD is not set |
| @@ -617,6 +646,10 @@ CONFIG_FIRMWARE_EDID=y | |||
| 617 | # | 646 | # |
| 618 | 647 | ||
| 619 | # | 648 | # |
| 649 | # Virtualization | ||
| 650 | # | ||
| 651 | |||
| 652 | # | ||
| 620 | # File systems | 653 | # File systems |
| 621 | # | 654 | # |
| 622 | CONFIG_EXT2_FS=y | 655 | CONFIG_EXT2_FS=y |
| @@ -626,6 +659,7 @@ CONFIG_EXT3_FS=y | |||
| 626 | CONFIG_EXT3_FS_XATTR=y | 659 | CONFIG_EXT3_FS_XATTR=y |
| 627 | # CONFIG_EXT3_FS_POSIX_ACL is not set | 660 | # CONFIG_EXT3_FS_POSIX_ACL is not set |
| 628 | # CONFIG_EXT3_FS_SECURITY is not set | 661 | # CONFIG_EXT3_FS_SECURITY is not set |
| 662 | # CONFIG_EXT4DEV_FS is not set | ||
| 629 | CONFIG_JBD=y | 663 | CONFIG_JBD=y |
| 630 | # CONFIG_JBD_DEBUG is not set | 664 | # CONFIG_JBD_DEBUG is not set |
| 631 | CONFIG_FS_MBCACHE=y | 665 | CONFIG_FS_MBCACHE=y |
| @@ -633,6 +667,7 @@ CONFIG_FS_MBCACHE=y | |||
| 633 | # CONFIG_JFS_FS is not set | 667 | # CONFIG_JFS_FS is not set |
| 634 | # CONFIG_FS_POSIX_ACL is not set | 668 | # CONFIG_FS_POSIX_ACL is not set |
| 635 | # CONFIG_XFS_FS is not set | 669 | # CONFIG_XFS_FS is not set |
| 670 | # CONFIG_GFS2_FS is not set | ||
| 636 | # CONFIG_OCFS2_FS is not set | 671 | # CONFIG_OCFS2_FS is not set |
| 637 | # CONFIG_MINIX_FS is not set | 672 | # CONFIG_MINIX_FS is not set |
| 638 | # CONFIG_ROMFS_FS is not set | 673 | # CONFIG_ROMFS_FS is not set |
| @@ -662,8 +697,10 @@ CONFIG_DNOTIFY=y | |||
| 662 | # | 697 | # |
| 663 | CONFIG_PROC_FS=y | 698 | CONFIG_PROC_FS=y |
| 664 | CONFIG_PROC_KCORE=y | 699 | CONFIG_PROC_KCORE=y |
| 700 | CONFIG_PROC_SYSCTL=y | ||
| 665 | CONFIG_SYSFS=y | 701 | CONFIG_SYSFS=y |
| 666 | CONFIG_TMPFS=y | 702 | CONFIG_TMPFS=y |
| 703 | # CONFIG_TMPFS_POSIX_ACL is not set | ||
| 667 | # CONFIG_HUGETLB_PAGE is not set | 704 | # CONFIG_HUGETLB_PAGE is not set |
| 668 | CONFIG_RAMFS=y | 705 | CONFIG_RAMFS=y |
| 669 | # CONFIG_CONFIGFS_FS is not set | 706 | # CONFIG_CONFIGFS_FS is not set |
| @@ -729,13 +766,20 @@ CONFIG_PARTITION_ADVANCED=y | |||
| 729 | # CONFIG_NLS is not set | 766 | # CONFIG_NLS is not set |
| 730 | 767 | ||
| 731 | # | 768 | # |
| 769 | # Distributed Lock Manager | ||
| 770 | # | ||
| 771 | # CONFIG_DLM is not set | ||
| 772 | |||
| 773 | # | ||
| 732 | # Library routines | 774 | # Library routines |
| 733 | # | 775 | # |
| 776 | CONFIG_BITREVERSE=y | ||
| 734 | # CONFIG_CRC_CCITT is not set | 777 | # CONFIG_CRC_CCITT is not set |
| 735 | # CONFIG_CRC16 is not set | 778 | # CONFIG_CRC16 is not set |
| 736 | CONFIG_CRC32=y | 779 | CONFIG_CRC32=y |
| 737 | # CONFIG_LIBCRC32C is not set | 780 | # CONFIG_LIBCRC32C is not set |
| 738 | CONFIG_PLIST=y | 781 | CONFIG_PLIST=y |
| 782 | CONFIG_IOMAP_COPY=y | ||
| 739 | 783 | ||
| 740 | # | 784 | # |
| 741 | # Instrumentation Support | 785 | # Instrumentation Support |
| @@ -746,8 +790,11 @@ CONFIG_PLIST=y | |||
| 746 | # Kernel hacking | 790 | # Kernel hacking |
| 747 | # | 791 | # |
| 748 | # CONFIG_PRINTK_TIME is not set | 792 | # CONFIG_PRINTK_TIME is not set |
| 793 | CONFIG_ENABLE_MUST_CHECK=y | ||
| 749 | # CONFIG_MAGIC_SYSRQ is not set | 794 | # CONFIG_MAGIC_SYSRQ is not set |
| 750 | # CONFIG_UNUSED_SYMBOLS is not set | 795 | # CONFIG_UNUSED_SYMBOLS is not set |
| 796 | # CONFIG_DEBUG_FS is not set | ||
| 797 | # CONFIG_HEADERS_CHECK is not set | ||
| 751 | CONFIG_DEBUG_KERNEL=y | 798 | CONFIG_DEBUG_KERNEL=y |
| 752 | CONFIG_LOG_BUF_SHIFT=14 | 799 | CONFIG_LOG_BUF_SHIFT=14 |
| 753 | CONFIG_DETECT_SOFTLOCKUP=y | 800 | CONFIG_DETECT_SOFTLOCKUP=y |
| @@ -761,10 +808,10 @@ CONFIG_DEBUG_MUTEXES=y | |||
| 761 | # CONFIG_DEBUG_SPINLOCK_SLEEP is not set | 808 | # CONFIG_DEBUG_SPINLOCK_SLEEP is not set |
| 762 | # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set | 809 | # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set |
| 763 | # CONFIG_DEBUG_KOBJECT is not set | 810 | # CONFIG_DEBUG_KOBJECT is not set |
| 811 | # CONFIG_DEBUG_BUGVERBOSE is not set | ||
| 764 | # CONFIG_DEBUG_INFO is not set | 812 | # CONFIG_DEBUG_INFO is not set |
| 765 | # CONFIG_DEBUG_FS is not set | ||
| 766 | # CONFIG_DEBUG_VM is not set | 813 | # CONFIG_DEBUG_VM is not set |
| 767 | # CONFIG_UNWIND_INFO is not set | 814 | # CONFIG_DEBUG_LIST is not set |
| 768 | CONFIG_FORCED_INLINING=y | 815 | CONFIG_FORCED_INLINING=y |
| 769 | # CONFIG_RCU_TORTURE_TEST is not set | 816 | # CONFIG_RCU_TORTURE_TEST is not set |
| 770 | # CONFIG_DEBUGGER is not set | 817 | # CONFIG_DEBUGGER is not set |
| @@ -782,7 +829,3 @@ CONFIG_FORCED_INLINING=y | |||
| 782 | # Cryptographic options | 829 | # Cryptographic options |
| 783 | # | 830 | # |
| 784 | # CONFIG_CRYPTO is not set | 831 | # CONFIG_CRYPTO is not set |
| 785 | |||
| 786 | # | ||
| 787 | # Hardware crypto devices | ||
| 788 | # | ||
diff --git a/arch/powerpc/configs/mpc8560_ads_defconfig b/arch/powerpc/configs/mpc8560_ads_defconfig index ddc2a7b07ba0..ecaa267a853c 100644 --- a/arch/powerpc/configs/mpc8560_ads_defconfig +++ b/arch/powerpc/configs/mpc8560_ads_defconfig | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.18-rc4 | 3 | # Linux kernel version: 2.6.20-rc5 |
| 4 | # Fri Aug 11 16:45:05 2006 | 4 | # Mon Jan 22 22:25:53 2007 |
| 5 | # | 5 | # |
| 6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
| 7 | CONFIG_PPC32=y | 7 | CONFIG_PPC32=y |
| @@ -10,6 +10,7 @@ CONFIG_MMU=y | |||
| 10 | CONFIG_GENERIC_HARDIRQS=y | 10 | CONFIG_GENERIC_HARDIRQS=y |
| 11 | CONFIG_IRQ_PER_CPU=y | 11 | CONFIG_IRQ_PER_CPU=y |
| 12 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 12 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
| 13 | CONFIG_ARCH_HAS_ILOG2_U32=y | ||
| 13 | CONFIG_GENERIC_HWEIGHT=y | 14 | CONFIG_GENERIC_HWEIGHT=y |
| 14 | CONFIG_GENERIC_CALIBRATE_DELAY=y | 15 | CONFIG_GENERIC_CALIBRATE_DELAY=y |
| 15 | CONFIG_GENERIC_FIND_NEXT_BIT=y | 16 | CONFIG_GENERIC_FIND_NEXT_BIT=y |
| @@ -21,13 +22,14 @@ CONFIG_ARCH_MAY_HAVE_PC_FDC=y | |||
| 21 | CONFIG_PPC_OF=y | 22 | CONFIG_PPC_OF=y |
| 22 | # CONFIG_PPC_UDBG_16550 is not set | 23 | # CONFIG_PPC_UDBG_16550 is not set |
| 23 | # CONFIG_GENERIC_TBSYNC is not set | 24 | # CONFIG_GENERIC_TBSYNC is not set |
| 25 | CONFIG_AUDIT_ARCH=y | ||
| 26 | CONFIG_GENERIC_BUG=y | ||
| 24 | CONFIG_DEFAULT_UIMAGE=y | 27 | CONFIG_DEFAULT_UIMAGE=y |
| 25 | 28 | ||
| 26 | # | 29 | # |
| 27 | # Processor support | 30 | # Processor support |
| 28 | # | 31 | # |
| 29 | # CONFIG_CLASSIC32 is not set | 32 | # CONFIG_CLASSIC32 is not set |
| 30 | # CONFIG_PPC_52xx is not set | ||
| 31 | # CONFIG_PPC_82xx is not set | 33 | # CONFIG_PPC_82xx is not set |
| 32 | # CONFIG_PPC_83xx is not set | 34 | # CONFIG_PPC_83xx is not set |
| 33 | CONFIG_PPC_85xx=y | 35 | CONFIG_PPC_85xx=y |
| @@ -38,6 +40,8 @@ CONFIG_PPC_85xx=y | |||
| 38 | # CONFIG_E200 is not set | 40 | # CONFIG_E200 is not set |
| 39 | CONFIG_85xx=y | 41 | CONFIG_85xx=y |
| 40 | CONFIG_E500=y | 42 | CONFIG_E500=y |
| 43 | # CONFIG_PPC_DCR_NATIVE is not set | ||
| 44 | # CONFIG_PPC_DCR_MMIO is not set | ||
| 41 | CONFIG_BOOKE=y | 45 | CONFIG_BOOKE=y |
| 42 | CONFIG_FSL_BOOKE=y | 46 | CONFIG_FSL_BOOKE=y |
| 43 | # CONFIG_PHYS_64BIT is not set | 47 | # CONFIG_PHYS_64BIT is not set |
| @@ -58,16 +62,20 @@ CONFIG_LOCALVERSION="" | |||
| 58 | CONFIG_LOCALVERSION_AUTO=y | 62 | CONFIG_LOCALVERSION_AUTO=y |
| 59 | CONFIG_SWAP=y | 63 | CONFIG_SWAP=y |
| 60 | CONFIG_SYSVIPC=y | 64 | CONFIG_SYSVIPC=y |
| 65 | # CONFIG_IPC_NS is not set | ||
| 61 | # CONFIG_POSIX_MQUEUE is not set | 66 | # CONFIG_POSIX_MQUEUE is not set |
| 62 | # CONFIG_BSD_PROCESS_ACCT is not set | 67 | # CONFIG_BSD_PROCESS_ACCT is not set |
| 63 | # CONFIG_TASKSTATS is not set | 68 | # CONFIG_TASKSTATS is not set |
| 64 | CONFIG_SYSCTL=y | 69 | # CONFIG_UTS_NS is not set |
| 65 | # CONFIG_AUDIT is not set | 70 | # CONFIG_AUDIT is not set |
| 66 | # CONFIG_IKCONFIG is not set | 71 | # CONFIG_IKCONFIG is not set |
| 72 | CONFIG_SYSFS_DEPRECATED=y | ||
| 67 | # CONFIG_RELAY is not set | 73 | # CONFIG_RELAY is not set |
| 68 | CONFIG_INITRAMFS_SOURCE="" | 74 | CONFIG_INITRAMFS_SOURCE="" |
| 69 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | 75 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set |
| 76 | CONFIG_SYSCTL=y | ||
| 70 | CONFIG_EMBEDDED=y | 77 | CONFIG_EMBEDDED=y |
| 78 | CONFIG_SYSCTL_SYSCALL=y | ||
| 71 | CONFIG_KALLSYMS=y | 79 | CONFIG_KALLSYMS=y |
| 72 | # CONFIG_KALLSYMS_ALL is not set | 80 | # CONFIG_KALLSYMS_ALL is not set |
| 73 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | 81 | # CONFIG_KALLSYMS_EXTRA_PASS is not set |
| @@ -76,12 +84,12 @@ CONFIG_PRINTK=y | |||
| 76 | CONFIG_BUG=y | 84 | CONFIG_BUG=y |
| 77 | CONFIG_ELF_CORE=y | 85 | CONFIG_ELF_CORE=y |
| 78 | CONFIG_BASE_FULL=y | 86 | CONFIG_BASE_FULL=y |
| 79 | CONFIG_RT_MUTEXES=y | ||
| 80 | CONFIG_FUTEX=y | 87 | CONFIG_FUTEX=y |
| 81 | CONFIG_EPOLL=y | 88 | CONFIG_EPOLL=y |
| 82 | CONFIG_SHMEM=y | 89 | CONFIG_SHMEM=y |
| 83 | CONFIG_SLAB=y | 90 | CONFIG_SLAB=y |
| 84 | CONFIG_VM_EVENT_COUNTERS=y | 91 | CONFIG_VM_EVENT_COUNTERS=y |
| 92 | CONFIG_RT_MUTEXES=y | ||
| 85 | # CONFIG_TINY_SHMEM is not set | 93 | # CONFIG_TINY_SHMEM is not set |
| 86 | CONFIG_BASE_SMALL=0 | 94 | CONFIG_BASE_SMALL=0 |
| 87 | # CONFIG_SLOB is not set | 95 | # CONFIG_SLOB is not set |
| @@ -94,6 +102,7 @@ CONFIG_BASE_SMALL=0 | |||
| 94 | # | 102 | # |
| 95 | # Block layer | 103 | # Block layer |
| 96 | # | 104 | # |
| 105 | CONFIG_BLOCK=y | ||
| 97 | # CONFIG_LBD is not set | 106 | # CONFIG_LBD is not set |
| 98 | # CONFIG_BLK_DEV_IO_TRACE is not set | 107 | # CONFIG_BLK_DEV_IO_TRACE is not set |
| 99 | # CONFIG_LSF is not set | 108 | # CONFIG_LSF is not set |
| @@ -110,7 +119,6 @@ CONFIG_DEFAULT_AS=y | |||
| 110 | # CONFIG_DEFAULT_CFQ is not set | 119 | # CONFIG_DEFAULT_CFQ is not set |
| 111 | # CONFIG_DEFAULT_NOOP is not set | 120 | # CONFIG_DEFAULT_NOOP is not set |
| 112 | CONFIG_DEFAULT_IOSCHED="anticipatory" | 121 | CONFIG_DEFAULT_IOSCHED="anticipatory" |
| 113 | CONFIG_MPIC=y | ||
| 114 | CONFIG_CPM2=y | 122 | CONFIG_CPM2=y |
| 115 | # CONFIG_WANT_EARLY_SERIAL is not set | 123 | # CONFIG_WANT_EARLY_SERIAL is not set |
| 116 | 124 | ||
| @@ -122,6 +130,7 @@ CONFIG_MPC8560_ADS=y | |||
| 122 | # CONFIG_MPC85xx_CDS is not set | 130 | # CONFIG_MPC85xx_CDS is not set |
| 123 | CONFIG_MPC8560=y | 131 | CONFIG_MPC8560=y |
| 124 | CONFIG_PPC_INDIRECT_PCI_BE=y | 132 | CONFIG_PPC_INDIRECT_PCI_BE=y |
| 133 | CONFIG_MPIC=y | ||
| 125 | 134 | ||
| 126 | # | 135 | # |
| 127 | # Kernel options | 136 | # Kernel options |
| @@ -129,6 +138,7 @@ CONFIG_PPC_INDIRECT_PCI_BE=y | |||
| 129 | # CONFIG_HIGHMEM is not set | 138 | # CONFIG_HIGHMEM is not set |
| 130 | # CONFIG_HZ_100 is not set | 139 | # CONFIG_HZ_100 is not set |
| 131 | CONFIG_HZ_250=y | 140 | CONFIG_HZ_250=y |
| 141 | # CONFIG_HZ_300 is not set | ||
| 132 | # CONFIG_HZ_1000 is not set | 142 | # CONFIG_HZ_1000 is not set |
| 133 | CONFIG_HZ=250 | 143 | CONFIG_HZ=250 |
| 134 | CONFIG_PREEMPT_NONE=y | 144 | CONFIG_PREEMPT_NONE=y |
| @@ -140,6 +150,7 @@ CONFIG_BINFMT_MISC=y | |||
| 140 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y | 150 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y |
| 141 | # CONFIG_PC_KEYBOARD is not set | 151 | # CONFIG_PC_KEYBOARD is not set |
| 142 | CONFIG_ARCH_FLATMEM_ENABLE=y | 152 | CONFIG_ARCH_FLATMEM_ENABLE=y |
| 153 | CONFIG_ARCH_POPULATES_NODE_MAP=y | ||
| 143 | CONFIG_SELECT_MEMORY_MODEL=y | 154 | CONFIG_SELECT_MEMORY_MODEL=y |
| 144 | CONFIG_FLATMEM_MANUAL=y | 155 | CONFIG_FLATMEM_MANUAL=y |
| 145 | # CONFIG_DISCONTIGMEM_MANUAL is not set | 156 | # CONFIG_DISCONTIGMEM_MANUAL is not set |
| @@ -152,13 +163,13 @@ CONFIG_SPLIT_PTLOCK_CPUS=4 | |||
| 152 | # CONFIG_PROC_DEVICETREE is not set | 163 | # CONFIG_PROC_DEVICETREE is not set |
| 153 | # CONFIG_CMDLINE_BOOL is not set | 164 | # CONFIG_CMDLINE_BOOL is not set |
| 154 | # CONFIG_PM is not set | 165 | # CONFIG_PM is not set |
| 155 | # CONFIG_SOFTWARE_SUSPEND is not set | ||
| 156 | # CONFIG_SECCOMP is not set | 166 | # CONFIG_SECCOMP is not set |
| 157 | CONFIG_ISA_DMA_API=y | 167 | CONFIG_ISA_DMA_API=y |
| 158 | 168 | ||
| 159 | # | 169 | # |
| 160 | # Bus options | 170 | # Bus options |
| 161 | # | 171 | # |
| 172 | # CONFIG_MPIC_WEIRD is not set | ||
| 162 | # CONFIG_PPC_I8259 is not set | 173 | # CONFIG_PPC_I8259 is not set |
| 163 | CONFIG_PPC_INDIRECT_PCI=y | 174 | CONFIG_PPC_INDIRECT_PCI=y |
| 164 | CONFIG_FSL_SOC=y | 175 | CONFIG_FSL_SOC=y |
| @@ -205,6 +216,7 @@ CONFIG_PACKET=y | |||
| 205 | CONFIG_UNIX=y | 216 | CONFIG_UNIX=y |
| 206 | CONFIG_XFRM=y | 217 | CONFIG_XFRM=y |
| 207 | # CONFIG_XFRM_USER is not set | 218 | # CONFIG_XFRM_USER is not set |
| 219 | # CONFIG_XFRM_SUB_POLICY is not set | ||
| 208 | # CONFIG_NET_KEY is not set | 220 | # CONFIG_NET_KEY is not set |
| 209 | CONFIG_INET=y | 221 | CONFIG_INET=y |
| 210 | CONFIG_IP_MULTICAST=y | 222 | CONFIG_IP_MULTICAST=y |
| @@ -226,10 +238,13 @@ CONFIG_SYN_COOKIES=y | |||
| 226 | # CONFIG_INET_TUNNEL is not set | 238 | # CONFIG_INET_TUNNEL is not set |
| 227 | CONFIG_INET_XFRM_MODE_TRANSPORT=y | 239 | CONFIG_INET_XFRM_MODE_TRANSPORT=y |
| 228 | CONFIG_INET_XFRM_MODE_TUNNEL=y | 240 | CONFIG_INET_XFRM_MODE_TUNNEL=y |
| 241 | CONFIG_INET_XFRM_MODE_BEET=y | ||
| 229 | CONFIG_INET_DIAG=y | 242 | CONFIG_INET_DIAG=y |
| 230 | CONFIG_INET_TCP_DIAG=y | 243 | CONFIG_INET_TCP_DIAG=y |
| 231 | # CONFIG_TCP_CONG_ADVANCED is not set | 244 | # CONFIG_TCP_CONG_ADVANCED is not set |
| 232 | CONFIG_TCP_CONG_BIC=y | 245 | CONFIG_TCP_CONG_CUBIC=y |
| 246 | CONFIG_DEFAULT_TCP_CONG="cubic" | ||
| 247 | # CONFIG_TCP_MD5SIG is not set | ||
| 233 | # CONFIG_IPV6 is not set | 248 | # CONFIG_IPV6 is not set |
| 234 | # CONFIG_INET6_XFRM_TUNNEL is not set | 249 | # CONFIG_INET6_XFRM_TUNNEL is not set |
| 235 | # CONFIG_INET6_TUNNEL is not set | 250 | # CONFIG_INET6_TUNNEL is not set |
| @@ -259,7 +274,6 @@ CONFIG_TCP_CONG_BIC=y | |||
| 259 | # CONFIG_ATALK is not set | 274 | # CONFIG_ATALK is not set |
| 260 | # CONFIG_X25 is not set | 275 | # CONFIG_X25 is not set |
| 261 | # CONFIG_LAPB is not set | 276 | # CONFIG_LAPB is not set |
| 262 | # CONFIG_NET_DIVERT is not set | ||
| 263 | # CONFIG_ECONET is not set | 277 | # CONFIG_ECONET is not set |
| 264 | # CONFIG_WAN_ROUTER is not set | 278 | # CONFIG_WAN_ROUTER is not set |
| 265 | 279 | ||
| @@ -331,6 +345,12 @@ CONFIG_BLK_DEV_INITRD=y | |||
| 331 | # CONFIG_ATA_OVER_ETH is not set | 345 | # CONFIG_ATA_OVER_ETH is not set |
| 332 | 346 | ||
| 333 | # | 347 | # |
| 348 | # Misc devices | ||
| 349 | # | ||
| 350 | # CONFIG_SGI_IOC4 is not set | ||
| 351 | # CONFIG_TIFM_CORE is not set | ||
| 352 | |||
| 353 | # | ||
| 334 | # ATA/ATAPI/MFM/RLL support | 354 | # ATA/ATAPI/MFM/RLL support |
| 335 | # | 355 | # |
| 336 | # CONFIG_IDE is not set | 356 | # CONFIG_IDE is not set |
| @@ -340,6 +360,12 @@ CONFIG_BLK_DEV_INITRD=y | |||
| 340 | # | 360 | # |
| 341 | # CONFIG_RAID_ATTRS is not set | 361 | # CONFIG_RAID_ATTRS is not set |
| 342 | # CONFIG_SCSI is not set | 362 | # CONFIG_SCSI is not set |
| 363 | # CONFIG_SCSI_NETLINK is not set | ||
| 364 | |||
| 365 | # | ||
| 366 | # Serial ATA (prod) and Parallel ATA (experimental) drivers | ||
| 367 | # | ||
| 368 | # CONFIG_ATA is not set | ||
| 343 | 369 | ||
| 344 | # | 370 | # |
| 345 | # Multi-device support (RAID and LVM) | 371 | # Multi-device support (RAID and LVM) |
| @@ -364,6 +390,7 @@ CONFIG_BLK_DEV_INITRD=y | |||
| 364 | # | 390 | # |
| 365 | # Macintosh device drivers | 391 | # Macintosh device drivers |
| 366 | # | 392 | # |
| 393 | # CONFIG_MAC_EMUMOUSEBTN is not set | ||
| 367 | # CONFIG_WINDFARM is not set | 394 | # CONFIG_WINDFARM is not set |
| 368 | 395 | ||
| 369 | # | 396 | # |
| @@ -395,6 +422,7 @@ CONFIG_DAVICOM_PHY=y | |||
| 395 | # CONFIG_CICADA_PHY is not set | 422 | # CONFIG_CICADA_PHY is not set |
| 396 | # CONFIG_VITESSE_PHY is not set | 423 | # CONFIG_VITESSE_PHY is not set |
| 397 | # CONFIG_SMSC_PHY is not set | 424 | # CONFIG_SMSC_PHY is not set |
| 425 | # CONFIG_BROADCOM_PHY is not set | ||
| 398 | # CONFIG_FIXED_PHY is not set | 426 | # CONFIG_FIXED_PHY is not set |
| 399 | 427 | ||
| 400 | # | 428 | # |
| @@ -437,6 +465,7 @@ CONFIG_E1000_NAPI=y | |||
| 437 | # CONFIG_BNX2 is not set | 465 | # CONFIG_BNX2 is not set |
| 438 | CONFIG_GIANFAR=y | 466 | CONFIG_GIANFAR=y |
| 439 | CONFIG_GFAR_NAPI=y | 467 | CONFIG_GFAR_NAPI=y |
| 468 | # CONFIG_QLA3XXX is not set | ||
| 440 | 469 | ||
| 441 | # | 470 | # |
| 442 | # Ethernet (10000 Mbit) | 471 | # Ethernet (10000 Mbit) |
| @@ -445,6 +474,7 @@ CONFIG_GFAR_NAPI=y | |||
| 445 | # CONFIG_IXGB is not set | 474 | # CONFIG_IXGB is not set |
| 446 | # CONFIG_S2IO is not set | 475 | # CONFIG_S2IO is not set |
| 447 | # CONFIG_MYRI10GE is not set | 476 | # CONFIG_MYRI10GE is not set |
| 477 | # CONFIG_NETXEN_NIC is not set | ||
| 448 | 478 | ||
| 449 | # | 479 | # |
| 450 | # Token Ring devices | 480 | # Token Ring devices |
| @@ -483,6 +513,7 @@ CONFIG_GFAR_NAPI=y | |||
| 483 | # Input device support | 513 | # Input device support |
| 484 | # | 514 | # |
| 485 | CONFIG_INPUT=y | 515 | CONFIG_INPUT=y |
| 516 | # CONFIG_INPUT_FF_MEMLESS is not set | ||
| 486 | 517 | ||
| 487 | # | 518 | # |
| 488 | # Userland interfaces | 519 | # Userland interfaces |
| @@ -522,6 +553,7 @@ CONFIG_INPUT=y | |||
| 522 | # | 553 | # |
| 523 | # Non-8250 serial port support | 554 | # Non-8250 serial port support |
| 524 | # | 555 | # |
| 556 | # CONFIG_SERIAL_UARTLITE is not set | ||
| 525 | CONFIG_SERIAL_CORE=y | 557 | CONFIG_SERIAL_CORE=y |
| 526 | CONFIG_SERIAL_CORE_CONSOLE=y | 558 | CONFIG_SERIAL_CORE_CONSOLE=y |
| 527 | CONFIG_SERIAL_CPM=y | 559 | CONFIG_SERIAL_CPM=y |
| @@ -536,7 +568,6 @@ CONFIG_SERIAL_CPM_SCC2=y | |||
| 536 | CONFIG_UNIX98_PTYS=y | 568 | CONFIG_UNIX98_PTYS=y |
| 537 | CONFIG_LEGACY_PTYS=y | 569 | CONFIG_LEGACY_PTYS=y |
| 538 | CONFIG_LEGACY_PTY_COUNT=256 | 570 | CONFIG_LEGACY_PTY_COUNT=256 |
| 539 | # CONFIG_BRIQ_PANEL is not set | ||
| 540 | 571 | ||
| 541 | # | 572 | # |
| 542 | # IPMI | 573 | # IPMI |
| @@ -554,10 +585,6 @@ CONFIG_GEN_RTC=y | |||
| 554 | # CONFIG_DTLK is not set | 585 | # CONFIG_DTLK is not set |
| 555 | # CONFIG_R3964 is not set | 586 | # CONFIG_R3964 is not set |
| 556 | # CONFIG_APPLICOM is not set | 587 | # CONFIG_APPLICOM is not set |
| 557 | |||
| 558 | # | ||
| 559 | # Ftape, the floppy tape device driver | ||
| 560 | # | ||
| 561 | # CONFIG_AGP is not set | 588 | # CONFIG_AGP is not set |
| 562 | # CONFIG_DRM is not set | 589 | # CONFIG_DRM is not set |
| 563 | # CONFIG_RAW_DRIVER is not set | 590 | # CONFIG_RAW_DRIVER is not set |
| @@ -566,7 +593,6 @@ CONFIG_GEN_RTC=y | |||
| 566 | # TPM devices | 593 | # TPM devices |
| 567 | # | 594 | # |
| 568 | # CONFIG_TCG_TPM is not set | 595 | # CONFIG_TCG_TPM is not set |
| 569 | # CONFIG_TELCLOCK is not set | ||
| 570 | 596 | ||
| 571 | # | 597 | # |
| 572 | # I2C support | 598 | # I2C support |
| @@ -582,6 +608,7 @@ CONFIG_GEN_RTC=y | |||
| 582 | # | 608 | # |
| 583 | # Dallas's 1-wire bus | 609 | # Dallas's 1-wire bus |
| 584 | # | 610 | # |
| 611 | # CONFIG_W1 is not set | ||
| 585 | 612 | ||
| 586 | # | 613 | # |
| 587 | # Hardware Monitoring support | 614 | # Hardware Monitoring support |
| @@ -590,17 +617,14 @@ CONFIG_HWMON=y | |||
| 590 | # CONFIG_HWMON_VID is not set | 617 | # CONFIG_HWMON_VID is not set |
| 591 | # CONFIG_SENSORS_ABITUGURU is not set | 618 | # CONFIG_SENSORS_ABITUGURU is not set |
| 592 | # CONFIG_SENSORS_F71805F is not set | 619 | # CONFIG_SENSORS_F71805F is not set |
| 620 | # CONFIG_SENSORS_PC87427 is not set | ||
| 621 | # CONFIG_SENSORS_VT1211 is not set | ||
| 593 | # CONFIG_HWMON_DEBUG_CHIP is not set | 622 | # CONFIG_HWMON_DEBUG_CHIP is not set |
| 594 | 623 | ||
| 595 | # | 624 | # |
| 596 | # Misc devices | ||
| 597 | # | ||
| 598 | |||
| 599 | # | ||
| 600 | # Multimedia devices | 625 | # Multimedia devices |
| 601 | # | 626 | # |
| 602 | # CONFIG_VIDEO_DEV is not set | 627 | # CONFIG_VIDEO_DEV is not set |
| 603 | CONFIG_VIDEO_V4L2=y | ||
| 604 | 628 | ||
| 605 | # | 629 | # |
| 606 | # Digital Video Broadcasting Devices | 630 | # Digital Video Broadcasting Devices |
| @@ -612,6 +636,7 @@ CONFIG_VIDEO_V4L2=y | |||
| 612 | # | 636 | # |
| 613 | CONFIG_FIRMWARE_EDID=y | 637 | CONFIG_FIRMWARE_EDID=y |
| 614 | # CONFIG_FB is not set | 638 | # CONFIG_FB is not set |
| 639 | # CONFIG_FB_IBM_GXT4500 is not set | ||
| 615 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set | 640 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set |
| 616 | 641 | ||
| 617 | # | 642 | # |
| @@ -620,6 +645,11 @@ CONFIG_FIRMWARE_EDID=y | |||
| 620 | # CONFIG_SOUND is not set | 645 | # CONFIG_SOUND is not set |
| 621 | 646 | ||
| 622 | # | 647 | # |
| 648 | # HID Devices | ||
| 649 | # | ||
| 650 | CONFIG_HID=y | ||
| 651 | |||
| 652 | # | ||
| 623 | # USB support | 653 | # USB support |
| 624 | # | 654 | # |
| 625 | CONFIG_USB_ARCH_HAS_HCD=y | 655 | CONFIG_USB_ARCH_HAS_HCD=y |
| @@ -682,6 +712,10 @@ CONFIG_USB_ARCH_HAS_EHCI=y | |||
| 682 | # | 712 | # |
| 683 | 713 | ||
| 684 | # | 714 | # |
| 715 | # Virtualization | ||
| 716 | # | ||
| 717 | |||
| 718 | # | ||
| 685 | # File systems | 719 | # File systems |
| 686 | # | 720 | # |
| 687 | CONFIG_EXT2_FS=y | 721 | CONFIG_EXT2_FS=y |
| @@ -691,6 +725,7 @@ CONFIG_EXT3_FS=y | |||
| 691 | CONFIG_EXT3_FS_XATTR=y | 725 | CONFIG_EXT3_FS_XATTR=y |
| 692 | # CONFIG_EXT3_FS_POSIX_ACL is not set | 726 | # CONFIG_EXT3_FS_POSIX_ACL is not set |
| 693 | # CONFIG_EXT3_FS_SECURITY is not set | 727 | # CONFIG_EXT3_FS_SECURITY is not set |
| 728 | # CONFIG_EXT4DEV_FS is not set | ||
| 694 | CONFIG_JBD=y | 729 | CONFIG_JBD=y |
| 695 | # CONFIG_JBD_DEBUG is not set | 730 | # CONFIG_JBD_DEBUG is not set |
| 696 | CONFIG_FS_MBCACHE=y | 731 | CONFIG_FS_MBCACHE=y |
| @@ -698,6 +733,7 @@ CONFIG_FS_MBCACHE=y | |||
| 698 | # CONFIG_JFS_FS is not set | 733 | # CONFIG_JFS_FS is not set |
| 699 | # CONFIG_FS_POSIX_ACL is not set | 734 | # CONFIG_FS_POSIX_ACL is not set |
| 700 | # CONFIG_XFS_FS is not set | 735 | # CONFIG_XFS_FS is not set |
| 736 | # CONFIG_GFS2_FS is not set | ||
| 701 | # CONFIG_OCFS2_FS is not set | 737 | # CONFIG_OCFS2_FS is not set |
| 702 | # CONFIG_MINIX_FS is not set | 738 | # CONFIG_MINIX_FS is not set |
| 703 | # CONFIG_ROMFS_FS is not set | 739 | # CONFIG_ROMFS_FS is not set |
| @@ -727,8 +763,10 @@ CONFIG_DNOTIFY=y | |||
| 727 | # | 763 | # |
| 728 | CONFIG_PROC_FS=y | 764 | CONFIG_PROC_FS=y |
| 729 | CONFIG_PROC_KCORE=y | 765 | CONFIG_PROC_KCORE=y |
| 766 | CONFIG_PROC_SYSCTL=y | ||
| 730 | CONFIG_SYSFS=y | 767 | CONFIG_SYSFS=y |
| 731 | CONFIG_TMPFS=y | 768 | CONFIG_TMPFS=y |
| 769 | # CONFIG_TMPFS_POSIX_ACL is not set | ||
| 732 | # CONFIG_HUGETLB_PAGE is not set | 770 | # CONFIG_HUGETLB_PAGE is not set |
| 733 | CONFIG_RAMFS=y | 771 | CONFIG_RAMFS=y |
| 734 | # CONFIG_CONFIGFS_FS is not set | 772 | # CONFIG_CONFIGFS_FS is not set |
| @@ -794,13 +832,20 @@ CONFIG_PARTITION_ADVANCED=y | |||
| 794 | # CONFIG_NLS is not set | 832 | # CONFIG_NLS is not set |
| 795 | 833 | ||
| 796 | # | 834 | # |
| 835 | # Distributed Lock Manager | ||
| 836 | # | ||
| 837 | # CONFIG_DLM is not set | ||
| 838 | |||
| 839 | # | ||
| 797 | # Library routines | 840 | # Library routines |
| 798 | # | 841 | # |
| 842 | CONFIG_BITREVERSE=y | ||
| 799 | # CONFIG_CRC_CCITT is not set | 843 | # CONFIG_CRC_CCITT is not set |
| 800 | # CONFIG_CRC16 is not set | 844 | # CONFIG_CRC16 is not set |
| 801 | CONFIG_CRC32=y | 845 | CONFIG_CRC32=y |
| 802 | # CONFIG_LIBCRC32C is not set | 846 | # CONFIG_LIBCRC32C is not set |
| 803 | CONFIG_PLIST=y | 847 | CONFIG_PLIST=y |
| 848 | CONFIG_IOMAP_COPY=y | ||
| 804 | 849 | ||
| 805 | # | 850 | # |
| 806 | # Instrumentation Support | 851 | # Instrumentation Support |
| @@ -811,8 +856,11 @@ CONFIG_PLIST=y | |||
| 811 | # Kernel hacking | 856 | # Kernel hacking |
| 812 | # | 857 | # |
| 813 | # CONFIG_PRINTK_TIME is not set | 858 | # CONFIG_PRINTK_TIME is not set |
| 859 | CONFIG_ENABLE_MUST_CHECK=y | ||
| 814 | # CONFIG_MAGIC_SYSRQ is not set | 860 | # CONFIG_MAGIC_SYSRQ is not set |
| 815 | # CONFIG_UNUSED_SYMBOLS is not set | 861 | # CONFIG_UNUSED_SYMBOLS is not set |
| 862 | # CONFIG_DEBUG_FS is not set | ||
| 863 | # CONFIG_HEADERS_CHECK is not set | ||
| 816 | CONFIG_DEBUG_KERNEL=y | 864 | CONFIG_DEBUG_KERNEL=y |
| 817 | CONFIG_LOG_BUF_SHIFT=14 | 865 | CONFIG_LOG_BUF_SHIFT=14 |
| 818 | CONFIG_DETECT_SOFTLOCKUP=y | 866 | CONFIG_DETECT_SOFTLOCKUP=y |
| @@ -826,10 +874,10 @@ CONFIG_DEBUG_MUTEXES=y | |||
| 826 | # CONFIG_DEBUG_SPINLOCK_SLEEP is not set | 874 | # CONFIG_DEBUG_SPINLOCK_SLEEP is not set |
| 827 | # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set | 875 | # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set |
| 828 | # CONFIG_DEBUG_KOBJECT is not set | 876 | # CONFIG_DEBUG_KOBJECT is not set |
| 877 | # CONFIG_DEBUG_BUGVERBOSE is not set | ||
| 829 | # CONFIG_DEBUG_INFO is not set | 878 | # CONFIG_DEBUG_INFO is not set |
| 830 | # CONFIG_DEBUG_FS is not set | ||
| 831 | # CONFIG_DEBUG_VM is not set | 879 | # CONFIG_DEBUG_VM is not set |
| 832 | # CONFIG_UNWIND_INFO is not set | 880 | # CONFIG_DEBUG_LIST is not set |
| 833 | CONFIG_FORCED_INLINING=y | 881 | CONFIG_FORCED_INLINING=y |
| 834 | # CONFIG_RCU_TORTURE_TEST is not set | 882 | # CONFIG_RCU_TORTURE_TEST is not set |
| 835 | # CONFIG_DEBUGGER is not set | 883 | # CONFIG_DEBUGGER is not set |
| @@ -848,7 +896,3 @@ CONFIG_FORCED_INLINING=y | |||
| 848 | # Cryptographic options | 896 | # Cryptographic options |
| 849 | # | 897 | # |
| 850 | # CONFIG_CRYPTO is not set | 898 | # CONFIG_CRYPTO is not set |
| 851 | |||
| 852 | # | ||
| 853 | # Hardware crypto devices | ||
| 854 | # | ||
diff --git a/arch/powerpc/configs/mpc85xx_cds_defconfig b/arch/powerpc/configs/mpc85xx_cds_defconfig index 72edf9f66829..1f61bce33e32 100644 --- a/arch/powerpc/configs/mpc85xx_cds_defconfig +++ b/arch/powerpc/configs/mpc85xx_cds_defconfig | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.18-rc6 | 3 | # Linux kernel version: 2.6.20-rc5 |
| 4 | # Sun Sep 10 10:29:49 2006 | 4 | # Mon Jan 22 22:26:46 2007 |
| 5 | # | 5 | # |
| 6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
| 7 | CONFIG_PPC32=y | 7 | CONFIG_PPC32=y |
| @@ -10,6 +10,7 @@ CONFIG_MMU=y | |||
| 10 | CONFIG_GENERIC_HARDIRQS=y | 10 | CONFIG_GENERIC_HARDIRQS=y |
| 11 | CONFIG_IRQ_PER_CPU=y | 11 | CONFIG_IRQ_PER_CPU=y |
| 12 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 12 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
| 13 | CONFIG_ARCH_HAS_ILOG2_U32=y | ||
| 13 | CONFIG_GENERIC_HWEIGHT=y | 14 | CONFIG_GENERIC_HWEIGHT=y |
| 14 | CONFIG_GENERIC_CALIBRATE_DELAY=y | 15 | CONFIG_GENERIC_CALIBRATE_DELAY=y |
| 15 | CONFIG_GENERIC_FIND_NEXT_BIT=y | 16 | CONFIG_GENERIC_FIND_NEXT_BIT=y |
| @@ -21,13 +22,14 @@ CONFIG_ARCH_MAY_HAVE_PC_FDC=y | |||
| 21 | CONFIG_PPC_OF=y | 22 | CONFIG_PPC_OF=y |
| 22 | CONFIG_PPC_UDBG_16550=y | 23 | CONFIG_PPC_UDBG_16550=y |
| 23 | # CONFIG_GENERIC_TBSYNC is not set | 24 | # CONFIG_GENERIC_TBSYNC is not set |
| 25 | CONFIG_AUDIT_ARCH=y | ||
| 26 | CONFIG_GENERIC_BUG=y | ||
| 24 | CONFIG_DEFAULT_UIMAGE=y | 27 | CONFIG_DEFAULT_UIMAGE=y |
| 25 | 28 | ||
| 26 | # | 29 | # |
| 27 | # Processor support | 30 | # Processor support |
| 28 | # | 31 | # |
| 29 | # CONFIG_CLASSIC32 is not set | 32 | # CONFIG_CLASSIC32 is not set |
| 30 | # CONFIG_PPC_52xx is not set | ||
| 31 | # CONFIG_PPC_82xx is not set | 33 | # CONFIG_PPC_82xx is not set |
| 32 | # CONFIG_PPC_83xx is not set | 34 | # CONFIG_PPC_83xx is not set |
| 33 | CONFIG_PPC_85xx=y | 35 | CONFIG_PPC_85xx=y |
| @@ -38,6 +40,8 @@ CONFIG_PPC_85xx=y | |||
| 38 | # CONFIG_E200 is not set | 40 | # CONFIG_E200 is not set |
| 39 | CONFIG_85xx=y | 41 | CONFIG_85xx=y |
| 40 | CONFIG_E500=y | 42 | CONFIG_E500=y |
| 43 | # CONFIG_PPC_DCR_NATIVE is not set | ||
| 44 | # CONFIG_PPC_DCR_MMIO is not set | ||
| 41 | CONFIG_BOOKE=y | 45 | CONFIG_BOOKE=y |
| 42 | CONFIG_FSL_BOOKE=y | 46 | CONFIG_FSL_BOOKE=y |
| 43 | # CONFIG_PHYS_64BIT is not set | 47 | # CONFIG_PHYS_64BIT is not set |
| @@ -58,16 +62,20 @@ CONFIG_LOCALVERSION="" | |||
| 58 | CONFIG_LOCALVERSION_AUTO=y | 62 | CONFIG_LOCALVERSION_AUTO=y |
| 59 | CONFIG_SWAP=y | 63 | CONFIG_SWAP=y |
| 60 | CONFIG_SYSVIPC=y | 64 | CONFIG_SYSVIPC=y |
| 65 | # CONFIG_IPC_NS is not set | ||
| 61 | # CONFIG_POSIX_MQUEUE is not set | 66 | # CONFIG_POSIX_MQUEUE is not set |
| 62 | # CONFIG_BSD_PROCESS_ACCT is not set | 67 | # CONFIG_BSD_PROCESS_ACCT is not set |
| 63 | # CONFIG_TASKSTATS is not set | 68 | # CONFIG_TASKSTATS is not set |
| 64 | CONFIG_SYSCTL=y | 69 | # CONFIG_UTS_NS is not set |
| 65 | # CONFIG_AUDIT is not set | 70 | # CONFIG_AUDIT is not set |
| 66 | # CONFIG_IKCONFIG is not set | 71 | # CONFIG_IKCONFIG is not set |
| 72 | CONFIG_SYSFS_DEPRECATED=y | ||
| 67 | # CONFIG_RELAY is not set | 73 | # CONFIG_RELAY is not set |
| 68 | CONFIG_INITRAMFS_SOURCE="" | 74 | CONFIG_INITRAMFS_SOURCE="" |
| 69 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | 75 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set |
| 76 | CONFIG_SYSCTL=y | ||
| 70 | CONFIG_EMBEDDED=y | 77 | CONFIG_EMBEDDED=y |
| 78 | CONFIG_SYSCTL_SYSCALL=y | ||
| 71 | CONFIG_KALLSYMS=y | 79 | CONFIG_KALLSYMS=y |
| 72 | # CONFIG_KALLSYMS_ALL is not set | 80 | # CONFIG_KALLSYMS_ALL is not set |
| 73 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | 81 | # CONFIG_KALLSYMS_EXTRA_PASS is not set |
| @@ -76,12 +84,12 @@ CONFIG_PRINTK=y | |||
| 76 | CONFIG_BUG=y | 84 | CONFIG_BUG=y |
| 77 | CONFIG_ELF_CORE=y | 85 | CONFIG_ELF_CORE=y |
| 78 | CONFIG_BASE_FULL=y | 86 | CONFIG_BASE_FULL=y |
| 79 | CONFIG_RT_MUTEXES=y | ||
| 80 | CONFIG_FUTEX=y | 87 | CONFIG_FUTEX=y |
| 81 | CONFIG_EPOLL=y | 88 | CONFIG_EPOLL=y |
| 82 | CONFIG_SHMEM=y | 89 | CONFIG_SHMEM=y |
| 83 | CONFIG_SLAB=y | 90 | CONFIG_SLAB=y |
| 84 | CONFIG_VM_EVENT_COUNTERS=y | 91 | CONFIG_VM_EVENT_COUNTERS=y |
| 92 | CONFIG_RT_MUTEXES=y | ||
| 85 | # CONFIG_TINY_SHMEM is not set | 93 | # CONFIG_TINY_SHMEM is not set |
| 86 | CONFIG_BASE_SMALL=0 | 94 | CONFIG_BASE_SMALL=0 |
| 87 | # CONFIG_SLOB is not set | 95 | # CONFIG_SLOB is not set |
| @@ -94,6 +102,7 @@ CONFIG_BASE_SMALL=0 | |||
| 94 | # | 102 | # |
| 95 | # Block layer | 103 | # Block layer |
| 96 | # | 104 | # |
| 105 | CONFIG_BLOCK=y | ||
| 97 | # CONFIG_LBD is not set | 106 | # CONFIG_LBD is not set |
| 98 | # CONFIG_BLK_DEV_IO_TRACE is not set | 107 | # CONFIG_BLK_DEV_IO_TRACE is not set |
| 99 | # CONFIG_LSF is not set | 108 | # CONFIG_LSF is not set |
| @@ -116,6 +125,7 @@ CONFIG_DEFAULT_IOSCHED="anticipatory" | |||
| 116 | # Platform support | 125 | # Platform support |
| 117 | # | 126 | # |
| 118 | # CONFIG_MPC8540_ADS is not set | 127 | # CONFIG_MPC8540_ADS is not set |
| 128 | # CONFIG_MPC8560_ADS is not set | ||
| 119 | CONFIG_MPC85xx_CDS=y | 129 | CONFIG_MPC85xx_CDS=y |
| 120 | CONFIG_MPC8540=y | 130 | CONFIG_MPC8540=y |
| 121 | CONFIG_PPC_INDIRECT_PCI_BE=y | 131 | CONFIG_PPC_INDIRECT_PCI_BE=y |
| @@ -127,6 +137,7 @@ CONFIG_MPIC=y | |||
| 127 | # CONFIG_HIGHMEM is not set | 137 | # CONFIG_HIGHMEM is not set |
| 128 | # CONFIG_HZ_100 is not set | 138 | # CONFIG_HZ_100 is not set |
| 129 | CONFIG_HZ_250=y | 139 | CONFIG_HZ_250=y |
| 140 | # CONFIG_HZ_300 is not set | ||
| 130 | # CONFIG_HZ_1000 is not set | 141 | # CONFIG_HZ_1000 is not set |
| 131 | CONFIG_HZ=250 | 142 | CONFIG_HZ=250 |
| 132 | CONFIG_PREEMPT_NONE=y | 143 | CONFIG_PREEMPT_NONE=y |
| @@ -137,6 +148,7 @@ CONFIG_BINFMT_MISC=y | |||
| 137 | CONFIG_MATH_EMULATION=y | 148 | CONFIG_MATH_EMULATION=y |
| 138 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y | 149 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y |
| 139 | CONFIG_ARCH_FLATMEM_ENABLE=y | 150 | CONFIG_ARCH_FLATMEM_ENABLE=y |
| 151 | CONFIG_ARCH_POPULATES_NODE_MAP=y | ||
| 140 | CONFIG_SELECT_MEMORY_MODEL=y | 152 | CONFIG_SELECT_MEMORY_MODEL=y |
| 141 | CONFIG_FLATMEM_MANUAL=y | 153 | CONFIG_FLATMEM_MANUAL=y |
| 142 | # CONFIG_DISCONTIGMEM_MANUAL is not set | 154 | # CONFIG_DISCONTIGMEM_MANUAL is not set |
| @@ -202,6 +214,7 @@ CONFIG_PACKET=y | |||
| 202 | CONFIG_UNIX=y | 214 | CONFIG_UNIX=y |
| 203 | CONFIG_XFRM=y | 215 | CONFIG_XFRM=y |
| 204 | CONFIG_XFRM_USER=y | 216 | CONFIG_XFRM_USER=y |
| 217 | # CONFIG_XFRM_SUB_POLICY is not set | ||
| 205 | # CONFIG_NET_KEY is not set | 218 | # CONFIG_NET_KEY is not set |
| 206 | CONFIG_INET=y | 219 | CONFIG_INET=y |
| 207 | CONFIG_IP_MULTICAST=y | 220 | CONFIG_IP_MULTICAST=y |
| @@ -223,10 +236,13 @@ CONFIG_SYN_COOKIES=y | |||
| 223 | # CONFIG_INET_TUNNEL is not set | 236 | # CONFIG_INET_TUNNEL is not set |
| 224 | CONFIG_INET_XFRM_MODE_TRANSPORT=y | 237 | CONFIG_INET_XFRM_MODE_TRANSPORT=y |
| 225 | CONFIG_INET_XFRM_MODE_TUNNEL=y | 238 | CONFIG_INET_XFRM_MODE_TUNNEL=y |
| 239 | CONFIG_INET_XFRM_MODE_BEET=y | ||
| 226 | CONFIG_INET_DIAG=y | 240 | CONFIG_INET_DIAG=y |
| 227 | CONFIG_INET_TCP_DIAG=y | 241 | CONFIG_INET_TCP_DIAG=y |
| 228 | # CONFIG_TCP_CONG_ADVANCED is not set | 242 | # CONFIG_TCP_CONG_ADVANCED is not set |
| 229 | CONFIG_TCP_CONG_BIC=y | 243 | CONFIG_TCP_CONG_CUBIC=y |
| 244 | CONFIG_DEFAULT_TCP_CONG="cubic" | ||
| 245 | # CONFIG_TCP_MD5SIG is not set | ||
| 230 | # CONFIG_IPV6 is not set | 246 | # CONFIG_IPV6 is not set |
| 231 | # CONFIG_INET6_XFRM_TUNNEL is not set | 247 | # CONFIG_INET6_XFRM_TUNNEL is not set |
| 232 | # CONFIG_INET6_TUNNEL is not set | 248 | # CONFIG_INET6_TUNNEL is not set |
| @@ -256,7 +272,6 @@ CONFIG_TCP_CONG_BIC=y | |||
| 256 | # CONFIG_ATALK is not set | 272 | # CONFIG_ATALK is not set |
| 257 | # CONFIG_X25 is not set | 273 | # CONFIG_X25 is not set |
| 258 | # CONFIG_LAPB is not set | 274 | # CONFIG_LAPB is not set |
| 259 | # CONFIG_NET_DIVERT is not set | ||
| 260 | # CONFIG_ECONET is not set | 275 | # CONFIG_ECONET is not set |
| 261 | # CONFIG_WAN_ROUTER is not set | 276 | # CONFIG_WAN_ROUTER is not set |
| 262 | 277 | ||
| @@ -328,9 +343,16 @@ CONFIG_BLK_DEV_INITRD=y | |||
| 328 | # CONFIG_ATA_OVER_ETH is not set | 343 | # CONFIG_ATA_OVER_ETH is not set |
| 329 | 344 | ||
| 330 | # | 345 | # |
| 346 | # Misc devices | ||
| 347 | # | ||
| 348 | # CONFIG_SGI_IOC4 is not set | ||
| 349 | # CONFIG_TIFM_CORE is not set | ||
| 350 | |||
| 351 | # | ||
| 331 | # ATA/ATAPI/MFM/RLL support | 352 | # ATA/ATAPI/MFM/RLL support |
| 332 | # | 353 | # |
| 333 | CONFIG_IDE=y | 354 | CONFIG_IDE=y |
| 355 | CONFIG_IDE_MAX_HWIFS=4 | ||
| 334 | CONFIG_BLK_DEV_IDE=y | 356 | CONFIG_BLK_DEV_IDE=y |
| 335 | 357 | ||
| 336 | # | 358 | # |
| @@ -353,7 +375,6 @@ CONFIG_IDEPCI_SHARE_IRQ=y | |||
| 353 | # CONFIG_BLK_DEV_OFFBOARD is not set | 375 | # CONFIG_BLK_DEV_OFFBOARD is not set |
| 354 | CONFIG_BLK_DEV_GENERIC=y | 376 | CONFIG_BLK_DEV_GENERIC=y |
| 355 | # CONFIG_BLK_DEV_OPTI621 is not set | 377 | # CONFIG_BLK_DEV_OPTI621 is not set |
| 356 | # CONFIG_BLK_DEV_SL82C105 is not set | ||
| 357 | CONFIG_BLK_DEV_IDEDMA_PCI=y | 378 | CONFIG_BLK_DEV_IDEDMA_PCI=y |
| 358 | # CONFIG_BLK_DEV_IDEDMA_FORCED is not set | 379 | # CONFIG_BLK_DEV_IDEDMA_FORCED is not set |
| 359 | # CONFIG_IDEDMA_PCI_AUTO is not set | 380 | # CONFIG_IDEDMA_PCI_AUTO is not set |
| @@ -367,6 +388,7 @@ CONFIG_BLK_DEV_IDEDMA_PCI=y | |||
| 367 | # CONFIG_BLK_DEV_CS5530 is not set | 388 | # CONFIG_BLK_DEV_CS5530 is not set |
| 368 | # CONFIG_BLK_DEV_HPT34X is not set | 389 | # CONFIG_BLK_DEV_HPT34X is not set |
| 369 | # CONFIG_BLK_DEV_HPT366 is not set | 390 | # CONFIG_BLK_DEV_HPT366 is not set |
| 391 | # CONFIG_BLK_DEV_JMICRON is not set | ||
| 370 | # CONFIG_BLK_DEV_SC1200 is not set | 392 | # CONFIG_BLK_DEV_SC1200 is not set |
| 371 | # CONFIG_BLK_DEV_PIIX is not set | 393 | # CONFIG_BLK_DEV_PIIX is not set |
| 372 | # CONFIG_BLK_DEV_IT821X is not set | 394 | # CONFIG_BLK_DEV_IT821X is not set |
| @@ -375,6 +397,7 @@ CONFIG_BLK_DEV_IDEDMA_PCI=y | |||
| 375 | # CONFIG_BLK_DEV_PDC202XX_NEW is not set | 397 | # CONFIG_BLK_DEV_PDC202XX_NEW is not set |
| 376 | # CONFIG_BLK_DEV_SVWKS is not set | 398 | # CONFIG_BLK_DEV_SVWKS is not set |
| 377 | # CONFIG_BLK_DEV_SIIMAGE is not set | 399 | # CONFIG_BLK_DEV_SIIMAGE is not set |
| 400 | # CONFIG_BLK_DEV_SL82C105 is not set | ||
| 378 | # CONFIG_BLK_DEV_SLC90E66 is not set | 401 | # CONFIG_BLK_DEV_SLC90E66 is not set |
| 379 | # CONFIG_BLK_DEV_TRM290 is not set | 402 | # CONFIG_BLK_DEV_TRM290 is not set |
| 380 | CONFIG_BLK_DEV_VIA82CXXX=y | 403 | CONFIG_BLK_DEV_VIA82CXXX=y |
| @@ -389,6 +412,12 @@ CONFIG_BLK_DEV_IDEDMA=y | |||
| 389 | # | 412 | # |
| 390 | # CONFIG_RAID_ATTRS is not set | 413 | # CONFIG_RAID_ATTRS is not set |
| 391 | # CONFIG_SCSI is not set | 414 | # CONFIG_SCSI is not set |
| 415 | # CONFIG_SCSI_NETLINK is not set | ||
| 416 | |||
| 417 | # | ||
| 418 | # Serial ATA (prod) and Parallel ATA (experimental) drivers | ||
| 419 | # | ||
| 420 | # CONFIG_ATA is not set | ||
| 392 | 421 | ||
| 393 | # | 422 | # |
| 394 | # Multi-device support (RAID and LVM) | 423 | # Multi-device support (RAID and LVM) |
| @@ -413,6 +442,7 @@ CONFIG_BLK_DEV_IDEDMA=y | |||
| 413 | # | 442 | # |
| 414 | # Macintosh device drivers | 443 | # Macintosh device drivers |
| 415 | # | 444 | # |
| 445 | # CONFIG_MAC_EMUMOUSEBTN is not set | ||
| 416 | # CONFIG_WINDFARM is not set | 446 | # CONFIG_WINDFARM is not set |
| 417 | 447 | ||
| 418 | # | 448 | # |
| @@ -444,6 +474,7 @@ CONFIG_PHYLIB=y | |||
| 444 | # CONFIG_CICADA_PHY is not set | 474 | # CONFIG_CICADA_PHY is not set |
| 445 | # CONFIG_VITESSE_PHY is not set | 475 | # CONFIG_VITESSE_PHY is not set |
| 446 | # CONFIG_SMSC_PHY is not set | 476 | # CONFIG_SMSC_PHY is not set |
| 477 | # CONFIG_BROADCOM_PHY is not set | ||
| 447 | # CONFIG_FIXED_PHY is not set | 478 | # CONFIG_FIXED_PHY is not set |
| 448 | 479 | ||
| 449 | # | 480 | # |
| @@ -483,6 +514,7 @@ CONFIG_E1000_NAPI=y | |||
| 483 | # CONFIG_BNX2 is not set | 514 | # CONFIG_BNX2 is not set |
| 484 | CONFIG_GIANFAR=y | 515 | CONFIG_GIANFAR=y |
| 485 | CONFIG_GFAR_NAPI=y | 516 | CONFIG_GFAR_NAPI=y |
| 517 | # CONFIG_QLA3XXX is not set | ||
| 486 | 518 | ||
| 487 | # | 519 | # |
| 488 | # Ethernet (10000 Mbit) | 520 | # Ethernet (10000 Mbit) |
| @@ -491,6 +523,7 @@ CONFIG_GFAR_NAPI=y | |||
| 491 | # CONFIG_IXGB is not set | 523 | # CONFIG_IXGB is not set |
| 492 | # CONFIG_S2IO is not set | 524 | # CONFIG_S2IO is not set |
| 493 | # CONFIG_MYRI10GE is not set | 525 | # CONFIG_MYRI10GE is not set |
| 526 | # CONFIG_NETXEN_NIC is not set | ||
| 494 | 527 | ||
| 495 | # | 528 | # |
| 496 | # Token Ring devices | 529 | # Token Ring devices |
| @@ -529,6 +562,7 @@ CONFIG_GFAR_NAPI=y | |||
| 529 | # Input device support | 562 | # Input device support |
| 530 | # | 563 | # |
| 531 | CONFIG_INPUT=y | 564 | CONFIG_INPUT=y |
| 565 | # CONFIG_INPUT_FF_MEMLESS is not set | ||
| 532 | 566 | ||
| 533 | # | 567 | # |
| 534 | # Userland interfaces | 568 | # Userland interfaces |
| @@ -573,6 +607,7 @@ CONFIG_SERIAL_8250_RUNTIME_UARTS=4 | |||
| 573 | # | 607 | # |
| 574 | # Non-8250 serial port support | 608 | # Non-8250 serial port support |
| 575 | # | 609 | # |
| 610 | # CONFIG_SERIAL_UARTLITE is not set | ||
| 576 | CONFIG_SERIAL_CORE=y | 611 | CONFIG_SERIAL_CORE=y |
| 577 | CONFIG_SERIAL_CORE_CONSOLE=y | 612 | CONFIG_SERIAL_CORE_CONSOLE=y |
| 578 | # CONFIG_SERIAL_JSM is not set | 613 | # CONFIG_SERIAL_JSM is not set |
| @@ -596,10 +631,6 @@ CONFIG_GEN_RTC=y | |||
| 596 | # CONFIG_DTLK is not set | 631 | # CONFIG_DTLK is not set |
| 597 | # CONFIG_R3964 is not set | 632 | # CONFIG_R3964 is not set |
| 598 | # CONFIG_APPLICOM is not set | 633 | # CONFIG_APPLICOM is not set |
| 599 | |||
| 600 | # | ||
| 601 | # Ftape, the floppy tape device driver | ||
| 602 | # | ||
| 603 | # CONFIG_AGP is not set | 634 | # CONFIG_AGP is not set |
| 604 | # CONFIG_DRM is not set | 635 | # CONFIG_DRM is not set |
| 605 | # CONFIG_RAW_DRIVER is not set | 636 | # CONFIG_RAW_DRIVER is not set |
| @@ -608,7 +639,6 @@ CONFIG_GEN_RTC=y | |||
| 608 | # TPM devices | 639 | # TPM devices |
| 609 | # | 640 | # |
| 610 | # CONFIG_TCG_TPM is not set | 641 | # CONFIG_TCG_TPM is not set |
| 611 | # CONFIG_TELCLOCK is not set | ||
| 612 | 642 | ||
| 613 | # | 643 | # |
| 614 | # I2C support | 644 | # I2C support |
| @@ -624,6 +654,7 @@ CONFIG_GEN_RTC=y | |||
| 624 | # | 654 | # |
| 625 | # Dallas's 1-wire bus | 655 | # Dallas's 1-wire bus |
| 626 | # | 656 | # |
| 657 | # CONFIG_W1 is not set | ||
| 627 | 658 | ||
| 628 | # | 659 | # |
| 629 | # Hardware Monitoring support | 660 | # Hardware Monitoring support |
| @@ -632,17 +663,14 @@ CONFIG_HWMON=y | |||
| 632 | # CONFIG_HWMON_VID is not set | 663 | # CONFIG_HWMON_VID is not set |
| 633 | # CONFIG_SENSORS_ABITUGURU is not set | 664 | # CONFIG_SENSORS_ABITUGURU is not set |
| 634 | # CONFIG_SENSORS_F71805F is not set | 665 | # CONFIG_SENSORS_F71805F is not set |
| 666 | # CONFIG_SENSORS_PC87427 is not set | ||
| 667 | # CONFIG_SENSORS_VT1211 is not set | ||
| 635 | # CONFIG_HWMON_DEBUG_CHIP is not set | 668 | # CONFIG_HWMON_DEBUG_CHIP is not set |
| 636 | 669 | ||
| 637 | # | 670 | # |
| 638 | # Misc devices | ||
| 639 | # | ||
| 640 | |||
| 641 | # | ||
| 642 | # Multimedia devices | 671 | # Multimedia devices |
| 643 | # | 672 | # |
| 644 | # CONFIG_VIDEO_DEV is not set | 673 | # CONFIG_VIDEO_DEV is not set |
| 645 | CONFIG_VIDEO_V4L2=y | ||
| 646 | 674 | ||
| 647 | # | 675 | # |
| 648 | # Digital Video Broadcasting Devices | 676 | # Digital Video Broadcasting Devices |
| @@ -654,6 +682,7 @@ CONFIG_VIDEO_V4L2=y | |||
| 654 | # | 682 | # |
| 655 | CONFIG_FIRMWARE_EDID=y | 683 | CONFIG_FIRMWARE_EDID=y |
| 656 | # CONFIG_FB is not set | 684 | # CONFIG_FB is not set |
| 685 | # CONFIG_FB_IBM_GXT4500 is not set | ||
| 657 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set | 686 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set |
| 658 | 687 | ||
| 659 | # | 688 | # |
| @@ -662,6 +691,11 @@ CONFIG_FIRMWARE_EDID=y | |||
| 662 | # CONFIG_SOUND is not set | 691 | # CONFIG_SOUND is not set |
| 663 | 692 | ||
| 664 | # | 693 | # |
| 694 | # HID Devices | ||
| 695 | # | ||
| 696 | CONFIG_HID=y | ||
| 697 | |||
| 698 | # | ||
| 665 | # USB support | 699 | # USB support |
| 666 | # | 700 | # |
| 667 | CONFIG_USB_ARCH_HAS_HCD=y | 701 | CONFIG_USB_ARCH_HAS_HCD=y |
| @@ -724,6 +758,10 @@ CONFIG_USB_ARCH_HAS_EHCI=y | |||
| 724 | # | 758 | # |
| 725 | 759 | ||
| 726 | # | 760 | # |
| 761 | # Virtualization | ||
| 762 | # | ||
| 763 | |||
| 764 | # | ||
| 727 | # File systems | 765 | # File systems |
| 728 | # | 766 | # |
| 729 | CONFIG_EXT2_FS=y | 767 | CONFIG_EXT2_FS=y |
| @@ -733,6 +771,7 @@ CONFIG_EXT3_FS=y | |||
| 733 | CONFIG_EXT3_FS_XATTR=y | 771 | CONFIG_EXT3_FS_XATTR=y |
| 734 | # CONFIG_EXT3_FS_POSIX_ACL is not set | 772 | # CONFIG_EXT3_FS_POSIX_ACL is not set |
| 735 | # CONFIG_EXT3_FS_SECURITY is not set | 773 | # CONFIG_EXT3_FS_SECURITY is not set |
| 774 | # CONFIG_EXT4DEV_FS is not set | ||
| 736 | CONFIG_JBD=y | 775 | CONFIG_JBD=y |
| 737 | # CONFIG_JBD_DEBUG is not set | 776 | # CONFIG_JBD_DEBUG is not set |
| 738 | CONFIG_FS_MBCACHE=y | 777 | CONFIG_FS_MBCACHE=y |
| @@ -740,6 +779,7 @@ CONFIG_FS_MBCACHE=y | |||
| 740 | # CONFIG_JFS_FS is not set | 779 | # CONFIG_JFS_FS is not set |
| 741 | # CONFIG_FS_POSIX_ACL is not set | 780 | # CONFIG_FS_POSIX_ACL is not set |
| 742 | # CONFIG_XFS_FS is not set | 781 | # CONFIG_XFS_FS is not set |
| 782 | # CONFIG_GFS2_FS is not set | ||
| 743 | # CONFIG_OCFS2_FS is not set | 783 | # CONFIG_OCFS2_FS is not set |
| 744 | # CONFIG_MINIX_FS is not set | 784 | # CONFIG_MINIX_FS is not set |
| 745 | # CONFIG_ROMFS_FS is not set | 785 | # CONFIG_ROMFS_FS is not set |
| @@ -769,8 +809,10 @@ CONFIG_DNOTIFY=y | |||
| 769 | # | 809 | # |
| 770 | CONFIG_PROC_FS=y | 810 | CONFIG_PROC_FS=y |
| 771 | CONFIG_PROC_KCORE=y | 811 | CONFIG_PROC_KCORE=y |
| 812 | CONFIG_PROC_SYSCTL=y | ||
| 772 | CONFIG_SYSFS=y | 813 | CONFIG_SYSFS=y |
| 773 | CONFIG_TMPFS=y | 814 | CONFIG_TMPFS=y |
| 815 | # CONFIG_TMPFS_POSIX_ACL is not set | ||
| 774 | # CONFIG_HUGETLB_PAGE is not set | 816 | # CONFIG_HUGETLB_PAGE is not set |
| 775 | CONFIG_RAMFS=y | 817 | CONFIG_RAMFS=y |
| 776 | # CONFIG_CONFIGFS_FS is not set | 818 | # CONFIG_CONFIGFS_FS is not set |
| @@ -836,13 +878,20 @@ CONFIG_PARTITION_ADVANCED=y | |||
| 836 | # CONFIG_NLS is not set | 878 | # CONFIG_NLS is not set |
| 837 | 879 | ||
| 838 | # | 880 | # |
| 881 | # Distributed Lock Manager | ||
| 882 | # | ||
| 883 | # CONFIG_DLM is not set | ||
| 884 | |||
| 885 | # | ||
| 839 | # Library routines | 886 | # Library routines |
| 840 | # | 887 | # |
| 888 | CONFIG_BITREVERSE=y | ||
| 841 | # CONFIG_CRC_CCITT is not set | 889 | # CONFIG_CRC_CCITT is not set |
| 842 | # CONFIG_CRC16 is not set | 890 | # CONFIG_CRC16 is not set |
| 843 | CONFIG_CRC32=y | 891 | CONFIG_CRC32=y |
| 844 | # CONFIG_LIBCRC32C is not set | 892 | # CONFIG_LIBCRC32C is not set |
| 845 | CONFIG_PLIST=y | 893 | CONFIG_PLIST=y |
| 894 | CONFIG_IOMAP_COPY=y | ||
| 846 | 895 | ||
| 847 | # | 896 | # |
| 848 | # Instrumentation Support | 897 | # Instrumentation Support |
| @@ -853,8 +902,11 @@ CONFIG_PLIST=y | |||
| 853 | # Kernel hacking | 902 | # Kernel hacking |
| 854 | # | 903 | # |
| 855 | # CONFIG_PRINTK_TIME is not set | 904 | # CONFIG_PRINTK_TIME is not set |
| 905 | CONFIG_ENABLE_MUST_CHECK=y | ||
| 856 | # CONFIG_MAGIC_SYSRQ is not set | 906 | # CONFIG_MAGIC_SYSRQ is not set |
| 857 | # CONFIG_UNUSED_SYMBOLS is not set | 907 | # CONFIG_UNUSED_SYMBOLS is not set |
| 908 | # CONFIG_DEBUG_FS is not set | ||
| 909 | # CONFIG_HEADERS_CHECK is not set | ||
| 858 | CONFIG_DEBUG_KERNEL=y | 910 | CONFIG_DEBUG_KERNEL=y |
| 859 | CONFIG_LOG_BUF_SHIFT=14 | 911 | CONFIG_LOG_BUF_SHIFT=14 |
| 860 | CONFIG_DETECT_SOFTLOCKUP=y | 912 | CONFIG_DETECT_SOFTLOCKUP=y |
| @@ -868,10 +920,10 @@ CONFIG_DEBUG_MUTEXES=y | |||
| 868 | # CONFIG_DEBUG_SPINLOCK_SLEEP is not set | 920 | # CONFIG_DEBUG_SPINLOCK_SLEEP is not set |
| 869 | # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set | 921 | # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set |
| 870 | # CONFIG_DEBUG_KOBJECT is not set | 922 | # CONFIG_DEBUG_KOBJECT is not set |
| 923 | # CONFIG_DEBUG_BUGVERBOSE is not set | ||
| 871 | # CONFIG_DEBUG_INFO is not set | 924 | # CONFIG_DEBUG_INFO is not set |
| 872 | # CONFIG_DEBUG_FS is not set | ||
| 873 | # CONFIG_DEBUG_VM is not set | 925 | # CONFIG_DEBUG_VM is not set |
| 874 | # CONFIG_UNWIND_INFO is not set | 926 | # CONFIG_DEBUG_LIST is not set |
| 875 | CONFIG_FORCED_INLINING=y | 927 | CONFIG_FORCED_INLINING=y |
| 876 | # CONFIG_RCU_TORTURE_TEST is not set | 928 | # CONFIG_RCU_TORTURE_TEST is not set |
| 877 | # CONFIG_DEBUGGER is not set | 929 | # CONFIG_DEBUGGER is not set |
| @@ -889,7 +941,3 @@ CONFIG_FORCED_INLINING=y | |||
| 889 | # Cryptographic options | 941 | # Cryptographic options |
| 890 | # | 942 | # |
| 891 | # CONFIG_CRYPTO is not set | 943 | # CONFIG_CRYPTO is not set |
| 892 | |||
| 893 | # | ||
| 894 | # Hardware crypto devices | ||
| 895 | # | ||
diff --git a/arch/powerpc/configs/mpc8641_hpcn_defconfig b/arch/powerpc/configs/mpc8641_hpcn_defconfig index 92a527fccf83..53fcd6932f5b 100644 --- a/arch/powerpc/configs/mpc8641_hpcn_defconfig +++ b/arch/powerpc/configs/mpc8641_hpcn_defconfig | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.18-rc6 | 3 | # Linux kernel version: 2.6.20-rc5 |
| 4 | # Sun Sep 10 10:30:15 2006 | 4 | # Mon Jan 22 22:27:14 2007 |
| 5 | # | 5 | # |
| 6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
| 7 | CONFIG_PPC32=y | 7 | CONFIG_PPC32=y |
| @@ -10,6 +10,7 @@ CONFIG_MMU=y | |||
| 10 | CONFIG_GENERIC_HARDIRQS=y | 10 | CONFIG_GENERIC_HARDIRQS=y |
| 11 | CONFIG_IRQ_PER_CPU=y | 11 | CONFIG_IRQ_PER_CPU=y |
| 12 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 12 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
| 13 | CONFIG_ARCH_HAS_ILOG2_U32=y | ||
| 13 | CONFIG_GENERIC_HWEIGHT=y | 14 | CONFIG_GENERIC_HWEIGHT=y |
| 14 | CONFIG_GENERIC_CALIBRATE_DELAY=y | 15 | CONFIG_GENERIC_CALIBRATE_DELAY=y |
| 15 | CONFIG_GENERIC_FIND_NEXT_BIT=y | 16 | CONFIG_GENERIC_FIND_NEXT_BIT=y |
| @@ -21,13 +22,14 @@ CONFIG_ARCH_MAY_HAVE_PC_FDC=y | |||
| 21 | CONFIG_PPC_OF=y | 22 | CONFIG_PPC_OF=y |
| 22 | CONFIG_PPC_UDBG_16550=y | 23 | CONFIG_PPC_UDBG_16550=y |
| 23 | CONFIG_GENERIC_TBSYNC=y | 24 | CONFIG_GENERIC_TBSYNC=y |
| 25 | CONFIG_AUDIT_ARCH=y | ||
| 26 | CONFIG_GENERIC_BUG=y | ||
| 24 | # CONFIG_DEFAULT_UIMAGE is not set | 27 | # CONFIG_DEFAULT_UIMAGE is not set |
| 25 | 28 | ||
| 26 | # | 29 | # |
| 27 | # Processor support | 30 | # Processor support |
| 28 | # | 31 | # |
| 29 | # CONFIG_CLASSIC32 is not set | 32 | # CONFIG_CLASSIC32 is not set |
| 30 | # CONFIG_PPC_52xx is not set | ||
| 31 | # CONFIG_PPC_82xx is not set | 33 | # CONFIG_PPC_82xx is not set |
| 32 | # CONFIG_PPC_83xx is not set | 34 | # CONFIG_PPC_83xx is not set |
| 33 | # CONFIG_PPC_85xx is not set | 35 | # CONFIG_PPC_85xx is not set |
| @@ -38,6 +40,8 @@ CONFIG_PPC_86xx=y | |||
| 38 | # CONFIG_E200 is not set | 40 | # CONFIG_E200 is not set |
| 39 | CONFIG_6xx=y | 41 | CONFIG_6xx=y |
| 40 | CONFIG_PPC_FPU=y | 42 | CONFIG_PPC_FPU=y |
| 43 | # CONFIG_PPC_DCR_NATIVE is not set | ||
| 44 | # CONFIG_PPC_DCR_MMIO is not set | ||
| 41 | CONFIG_ALTIVEC=y | 45 | CONFIG_ALTIVEC=y |
| 42 | CONFIG_PPC_STD_MMU=y | 46 | CONFIG_PPC_STD_MMU=y |
| 43 | CONFIG_PPC_STD_MMU_32=y | 47 | CONFIG_PPC_STD_MMU_32=y |
| @@ -62,15 +66,18 @@ CONFIG_LOCALVERSION="" | |||
| 62 | # CONFIG_POSIX_MQUEUE is not set | 66 | # CONFIG_POSIX_MQUEUE is not set |
| 63 | # CONFIG_BSD_PROCESS_ACCT is not set | 67 | # CONFIG_BSD_PROCESS_ACCT is not set |
| 64 | # CONFIG_TASKSTATS is not set | 68 | # CONFIG_TASKSTATS is not set |
| 65 | CONFIG_SYSCTL=y | 69 | # CONFIG_UTS_NS is not set |
| 66 | # CONFIG_AUDIT is not set | 70 | # CONFIG_AUDIT is not set |
| 67 | CONFIG_IKCONFIG=y | 71 | CONFIG_IKCONFIG=y |
| 68 | CONFIG_IKCONFIG_PROC=y | 72 | CONFIG_IKCONFIG_PROC=y |
| 69 | # CONFIG_CPUSETS is not set | 73 | # CONFIG_CPUSETS is not set |
| 74 | CONFIG_SYSFS_DEPRECATED=y | ||
| 70 | # CONFIG_RELAY is not set | 75 | # CONFIG_RELAY is not set |
| 71 | CONFIG_INITRAMFS_SOURCE="" | 76 | CONFIG_INITRAMFS_SOURCE="" |
| 72 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | 77 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set |
| 78 | CONFIG_SYSCTL=y | ||
| 73 | CONFIG_EMBEDDED=y | 79 | CONFIG_EMBEDDED=y |
| 80 | CONFIG_SYSCTL_SYSCALL=y | ||
| 74 | CONFIG_KALLSYMS=y | 81 | CONFIG_KALLSYMS=y |
| 75 | # CONFIG_KALLSYMS_ALL is not set | 82 | # CONFIG_KALLSYMS_ALL is not set |
| 76 | CONFIG_KALLSYMS_EXTRA_PASS=y | 83 | CONFIG_KALLSYMS_EXTRA_PASS=y |
| @@ -79,15 +86,15 @@ CONFIG_PRINTK=y | |||
| 79 | CONFIG_BUG=y | 86 | CONFIG_BUG=y |
| 80 | # CONFIG_ELF_CORE is not set | 87 | # CONFIG_ELF_CORE is not set |
| 81 | CONFIG_BASE_FULL=y | 88 | CONFIG_BASE_FULL=y |
| 82 | CONFIG_RT_MUTEXES=y | ||
| 83 | CONFIG_FUTEX=y | 89 | CONFIG_FUTEX=y |
| 84 | CONFIG_EPOLL=y | 90 | CONFIG_EPOLL=y |
| 85 | CONFIG_SHMEM=y | 91 | CONFIG_SHMEM=y |
| 86 | # CONFIG_SLAB is not set | 92 | CONFIG_SLAB=y |
| 87 | CONFIG_VM_EVENT_COUNTERS=y | 93 | CONFIG_VM_EVENT_COUNTERS=y |
| 94 | CONFIG_RT_MUTEXES=y | ||
| 88 | # CONFIG_TINY_SHMEM is not set | 95 | # CONFIG_TINY_SHMEM is not set |
| 89 | CONFIG_BASE_SMALL=0 | 96 | CONFIG_BASE_SMALL=0 |
| 90 | CONFIG_SLOB=y | 97 | # CONFIG_SLOB is not set |
| 91 | 98 | ||
| 92 | # | 99 | # |
| 93 | # Loadable module support | 100 | # Loadable module support |
| @@ -97,6 +104,7 @@ CONFIG_SLOB=y | |||
| 97 | # | 104 | # |
| 98 | # Block layer | 105 | # Block layer |
| 99 | # | 106 | # |
| 107 | CONFIG_BLOCK=y | ||
| 100 | # CONFIG_LBD is not set | 108 | # CONFIG_LBD is not set |
| 101 | # CONFIG_BLK_DEV_IO_TRACE is not set | 109 | # CONFIG_BLK_DEV_IO_TRACE is not set |
| 102 | # CONFIG_LSF is not set | 110 | # CONFIG_LSF is not set |
| @@ -129,6 +137,7 @@ CONFIG_MPC8641=y | |||
| 129 | CONFIG_HIGHMEM=y | 137 | CONFIG_HIGHMEM=y |
| 130 | # CONFIG_HZ_100 is not set | 138 | # CONFIG_HZ_100 is not set |
| 131 | # CONFIG_HZ_250 is not set | 139 | # CONFIG_HZ_250 is not set |
| 140 | # CONFIG_HZ_300 is not set | ||
| 132 | CONFIG_HZ_1000=y | 141 | CONFIG_HZ_1000=y |
| 133 | CONFIG_HZ=1000 | 142 | CONFIG_HZ=1000 |
| 134 | CONFIG_PREEMPT_NONE=y | 143 | CONFIG_PREEMPT_NONE=y |
| @@ -140,6 +149,7 @@ CONFIG_BINFMT_ELF=y | |||
| 140 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y | 149 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y |
| 141 | # CONFIG_IRQ_ALL_CPUS is not set | 150 | # CONFIG_IRQ_ALL_CPUS is not set |
| 142 | CONFIG_ARCH_FLATMEM_ENABLE=y | 151 | CONFIG_ARCH_FLATMEM_ENABLE=y |
| 152 | CONFIG_ARCH_POPULATES_NODE_MAP=y | ||
| 143 | CONFIG_SELECT_MEMORY_MODEL=y | 153 | CONFIG_SELECT_MEMORY_MODEL=y |
| 144 | CONFIG_FLATMEM_MANUAL=y | 154 | CONFIG_FLATMEM_MANUAL=y |
| 145 | # CONFIG_DISCONTIGMEM_MANUAL is not set | 155 | # CONFIG_DISCONTIGMEM_MANUAL is not set |
| @@ -206,6 +216,7 @@ CONFIG_PACKET=y | |||
| 206 | CONFIG_UNIX=y | 216 | CONFIG_UNIX=y |
| 207 | CONFIG_XFRM=y | 217 | CONFIG_XFRM=y |
| 208 | CONFIG_XFRM_USER=y | 218 | CONFIG_XFRM_USER=y |
| 219 | # CONFIG_XFRM_SUB_POLICY is not set | ||
| 209 | # CONFIG_NET_KEY is not set | 220 | # CONFIG_NET_KEY is not set |
| 210 | CONFIG_INET=y | 221 | CONFIG_INET=y |
| 211 | # CONFIG_IP_MULTICAST is not set | 222 | # CONFIG_IP_MULTICAST is not set |
| @@ -226,21 +237,29 @@ CONFIG_IP_PNP_RARP=y | |||
| 226 | # CONFIG_INET_TUNNEL is not set | 237 | # CONFIG_INET_TUNNEL is not set |
| 227 | CONFIG_INET_XFRM_MODE_TRANSPORT=y | 238 | CONFIG_INET_XFRM_MODE_TRANSPORT=y |
| 228 | CONFIG_INET_XFRM_MODE_TUNNEL=y | 239 | CONFIG_INET_XFRM_MODE_TUNNEL=y |
| 240 | CONFIG_INET_XFRM_MODE_BEET=y | ||
| 229 | CONFIG_INET_DIAG=y | 241 | CONFIG_INET_DIAG=y |
| 230 | CONFIG_INET_TCP_DIAG=y | 242 | CONFIG_INET_TCP_DIAG=y |
| 231 | # CONFIG_TCP_CONG_ADVANCED is not set | 243 | # CONFIG_TCP_CONG_ADVANCED is not set |
| 232 | CONFIG_TCP_CONG_BIC=y | 244 | CONFIG_TCP_CONG_CUBIC=y |
| 245 | CONFIG_DEFAULT_TCP_CONG="cubic" | ||
| 246 | # CONFIG_TCP_MD5SIG is not set | ||
| 233 | CONFIG_IPV6=y | 247 | CONFIG_IPV6=y |
| 234 | # CONFIG_IPV6_PRIVACY is not set | 248 | # CONFIG_IPV6_PRIVACY is not set |
| 235 | # CONFIG_IPV6_ROUTER_PREF is not set | 249 | # CONFIG_IPV6_ROUTER_PREF is not set |
| 236 | # CONFIG_INET6_AH is not set | 250 | # CONFIG_INET6_AH is not set |
| 237 | # CONFIG_INET6_ESP is not set | 251 | # CONFIG_INET6_ESP is not set |
| 238 | # CONFIG_INET6_IPCOMP is not set | 252 | # CONFIG_INET6_IPCOMP is not set |
| 253 | # CONFIG_IPV6_MIP6 is not set | ||
| 239 | # CONFIG_INET6_XFRM_TUNNEL is not set | 254 | # CONFIG_INET6_XFRM_TUNNEL is not set |
| 240 | # CONFIG_INET6_TUNNEL is not set | 255 | # CONFIG_INET6_TUNNEL is not set |
| 241 | CONFIG_INET6_XFRM_MODE_TRANSPORT=y | 256 | CONFIG_INET6_XFRM_MODE_TRANSPORT=y |
| 242 | CONFIG_INET6_XFRM_MODE_TUNNEL=y | 257 | CONFIG_INET6_XFRM_MODE_TUNNEL=y |
| 258 | CONFIG_INET6_XFRM_MODE_BEET=y | ||
| 259 | # CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set | ||
| 260 | CONFIG_IPV6_SIT=y | ||
| 243 | # CONFIG_IPV6_TUNNEL is not set | 261 | # CONFIG_IPV6_TUNNEL is not set |
| 262 | # CONFIG_IPV6_MULTIPLE_TABLES is not set | ||
| 244 | # CONFIG_NETWORK_SECMARK is not set | 263 | # CONFIG_NETWORK_SECMARK is not set |
| 245 | # CONFIG_NETFILTER is not set | 264 | # CONFIG_NETFILTER is not set |
| 246 | 265 | ||
| @@ -267,7 +286,6 @@ CONFIG_INET6_XFRM_MODE_TUNNEL=y | |||
| 267 | # CONFIG_ATALK is not set | 286 | # CONFIG_ATALK is not set |
| 268 | # CONFIG_X25 is not set | 287 | # CONFIG_X25 is not set |
| 269 | # CONFIG_LAPB is not set | 288 | # CONFIG_LAPB is not set |
| 270 | # CONFIG_NET_DIVERT is not set | ||
| 271 | # CONFIG_ECONET is not set | 289 | # CONFIG_ECONET is not set |
| 272 | # CONFIG_WAN_ROUTER is not set | 290 | # CONFIG_WAN_ROUTER is not set |
| 273 | 291 | ||
| @@ -339,6 +357,12 @@ CONFIG_BLK_DEV_INITRD=y | |||
| 339 | # CONFIG_ATA_OVER_ETH is not set | 357 | # CONFIG_ATA_OVER_ETH is not set |
| 340 | 358 | ||
| 341 | # | 359 | # |
| 360 | # Misc devices | ||
| 361 | # | ||
| 362 | # CONFIG_SGI_IOC4 is not set | ||
| 363 | # CONFIG_TIFM_CORE is not set | ||
| 364 | |||
| 365 | # | ||
| 342 | # ATA/ATAPI/MFM/RLL support | 366 | # ATA/ATAPI/MFM/RLL support |
| 343 | # | 367 | # |
| 344 | # CONFIG_IDE is not set | 368 | # CONFIG_IDE is not set |
| @@ -348,6 +372,12 @@ CONFIG_BLK_DEV_INITRD=y | |||
| 348 | # | 372 | # |
| 349 | # CONFIG_RAID_ATTRS is not set | 373 | # CONFIG_RAID_ATTRS is not set |
| 350 | # CONFIG_SCSI is not set | 374 | # CONFIG_SCSI is not set |
| 375 | # CONFIG_SCSI_NETLINK is not set | ||
| 376 | |||
| 377 | # | ||
| 378 | # Serial ATA (prod) and Parallel ATA (experimental) drivers | ||
| 379 | # | ||
| 380 | # CONFIG_ATA is not set | ||
| 351 | 381 | ||
| 352 | # | 382 | # |
| 353 | # Multi-device support (RAID and LVM) | 383 | # Multi-device support (RAID and LVM) |
| @@ -372,6 +402,7 @@ CONFIG_BLK_DEV_INITRD=y | |||
| 372 | # | 402 | # |
| 373 | # Macintosh device drivers | 403 | # Macintosh device drivers |
| 374 | # | 404 | # |
| 405 | # CONFIG_MAC_EMUMOUSEBTN is not set | ||
| 375 | # CONFIG_WINDFARM is not set | 406 | # CONFIG_WINDFARM is not set |
| 376 | 407 | ||
| 377 | # | 408 | # |
| @@ -403,6 +434,7 @@ CONFIG_PHYLIB=y | |||
| 403 | # CONFIG_CICADA_PHY is not set | 434 | # CONFIG_CICADA_PHY is not set |
| 404 | CONFIG_VITESSE_PHY=y | 435 | CONFIG_VITESSE_PHY=y |
| 405 | # CONFIG_SMSC_PHY is not set | 436 | # CONFIG_SMSC_PHY is not set |
| 437 | # CONFIG_BROADCOM_PHY is not set | ||
| 406 | # CONFIG_FIXED_PHY is not set | 438 | # CONFIG_FIXED_PHY is not set |
| 407 | 439 | ||
| 408 | # | 440 | # |
| @@ -440,6 +472,7 @@ CONFIG_MII=y | |||
| 440 | # CONFIG_BNX2 is not set | 472 | # CONFIG_BNX2 is not set |
| 441 | CONFIG_GIANFAR=y | 473 | CONFIG_GIANFAR=y |
| 442 | # CONFIG_GFAR_NAPI is not set | 474 | # CONFIG_GFAR_NAPI is not set |
| 475 | # CONFIG_QLA3XXX is not set | ||
| 443 | 476 | ||
| 444 | # | 477 | # |
| 445 | # Ethernet (10000 Mbit) | 478 | # Ethernet (10000 Mbit) |
| @@ -448,6 +481,7 @@ CONFIG_GIANFAR=y | |||
| 448 | # CONFIG_IXGB is not set | 481 | # CONFIG_IXGB is not set |
| 449 | # CONFIG_S2IO is not set | 482 | # CONFIG_S2IO is not set |
| 450 | # CONFIG_MYRI10GE is not set | 483 | # CONFIG_MYRI10GE is not set |
| 484 | # CONFIG_NETXEN_NIC is not set | ||
| 451 | 485 | ||
| 452 | # | 486 | # |
| 453 | # Token Ring devices | 487 | # Token Ring devices |
| @@ -486,6 +520,7 @@ CONFIG_GIANFAR=y | |||
| 486 | # Input device support | 520 | # Input device support |
| 487 | # | 521 | # |
| 488 | CONFIG_INPUT=y | 522 | CONFIG_INPUT=y |
| 523 | # CONFIG_INPUT_FF_MEMLESS is not set | ||
| 489 | 524 | ||
| 490 | # | 525 | # |
| 491 | # Userland interfaces | 526 | # Userland interfaces |
| @@ -542,6 +577,7 @@ CONFIG_SERIAL_8250_RSA=y | |||
| 542 | # | 577 | # |
| 543 | # Non-8250 serial port support | 578 | # Non-8250 serial port support |
| 544 | # | 579 | # |
| 580 | # CONFIG_SERIAL_UARTLITE is not set | ||
| 545 | CONFIG_SERIAL_CORE=y | 581 | CONFIG_SERIAL_CORE=y |
| 546 | CONFIG_SERIAL_CORE_CONSOLE=y | 582 | CONFIG_SERIAL_CORE_CONSOLE=y |
| 547 | # CONFIG_SERIAL_JSM is not set | 583 | # CONFIG_SERIAL_JSM is not set |
| @@ -563,10 +599,6 @@ CONFIG_UNIX98_PTYS=y | |||
| 563 | # CONFIG_DTLK is not set | 599 | # CONFIG_DTLK is not set |
| 564 | # CONFIG_R3964 is not set | 600 | # CONFIG_R3964 is not set |
| 565 | # CONFIG_APPLICOM is not set | 601 | # CONFIG_APPLICOM is not set |
| 566 | |||
| 567 | # | ||
| 568 | # Ftape, the floppy tape device driver | ||
| 569 | # | ||
| 570 | # CONFIG_AGP is not set | 602 | # CONFIG_AGP is not set |
| 571 | # CONFIG_DRM is not set | 603 | # CONFIG_DRM is not set |
| 572 | # CONFIG_RAW_DRIVER is not set | 604 | # CONFIG_RAW_DRIVER is not set |
| @@ -575,7 +607,6 @@ CONFIG_UNIX98_PTYS=y | |||
| 575 | # TPM devices | 607 | # TPM devices |
| 576 | # | 608 | # |
| 577 | # CONFIG_TCG_TPM is not set | 609 | # CONFIG_TCG_TPM is not set |
| 578 | # CONFIG_TELCLOCK is not set | ||
| 579 | 610 | ||
| 580 | # | 611 | # |
| 581 | # I2C support | 612 | # I2C support |
| @@ -640,6 +671,7 @@ CONFIG_SENSORS_EEPROM=y | |||
| 640 | # | 671 | # |
| 641 | # Dallas's 1-wire bus | 672 | # Dallas's 1-wire bus |
| 642 | # | 673 | # |
| 674 | # CONFIG_W1 is not set | ||
| 643 | 675 | ||
| 644 | # | 676 | # |
| 645 | # Hardware Monitoring support | 677 | # Hardware Monitoring support |
| @@ -648,14 +680,9 @@ CONFIG_SENSORS_EEPROM=y | |||
| 648 | # CONFIG_HWMON_VID is not set | 680 | # CONFIG_HWMON_VID is not set |
| 649 | 681 | ||
| 650 | # | 682 | # |
| 651 | # Misc devices | ||
| 652 | # | ||
| 653 | |||
| 654 | # | ||
| 655 | # Multimedia devices | 683 | # Multimedia devices |
| 656 | # | 684 | # |
| 657 | # CONFIG_VIDEO_DEV is not set | 685 | # CONFIG_VIDEO_DEV is not set |
| 658 | CONFIG_VIDEO_V4L2=y | ||
| 659 | 686 | ||
| 660 | # | 687 | # |
| 661 | # Digital Video Broadcasting Devices | 688 | # Digital Video Broadcasting Devices |
| @@ -667,6 +694,7 @@ CONFIG_VIDEO_V4L2=y | |||
| 667 | # | 694 | # |
| 668 | CONFIG_FIRMWARE_EDID=y | 695 | CONFIG_FIRMWARE_EDID=y |
| 669 | # CONFIG_FB is not set | 696 | # CONFIG_FB is not set |
| 697 | # CONFIG_FB_IBM_GXT4500 is not set | ||
| 670 | 698 | ||
| 671 | # | 699 | # |
| 672 | # Console display driver support | 700 | # Console display driver support |
| @@ -682,6 +710,11 @@ CONFIG_DUMMY_CONSOLE=y | |||
| 682 | # CONFIG_SOUND is not set | 710 | # CONFIG_SOUND is not set |
| 683 | 711 | ||
| 684 | # | 712 | # |
| 713 | # HID Devices | ||
| 714 | # | ||
| 715 | CONFIG_HID=y | ||
| 716 | |||
| 717 | # | ||
| 685 | # USB support | 718 | # USB support |
| 686 | # | 719 | # |
| 687 | CONFIG_USB_ARCH_HAS_HCD=y | 720 | CONFIG_USB_ARCH_HAS_HCD=y |
| @@ -744,6 +777,10 @@ CONFIG_USB_ARCH_HAS_EHCI=y | |||
| 744 | # | 777 | # |
| 745 | 778 | ||
| 746 | # | 779 | # |
| 780 | # Virtualization | ||
| 781 | # | ||
| 782 | |||
| 783 | # | ||
| 747 | # File systems | 784 | # File systems |
| 748 | # | 785 | # |
| 749 | CONFIG_EXT2_FS=y | 786 | CONFIG_EXT2_FS=y |
| @@ -753,6 +790,7 @@ CONFIG_EXT3_FS=y | |||
| 753 | CONFIG_EXT3_FS_XATTR=y | 790 | CONFIG_EXT3_FS_XATTR=y |
| 754 | # CONFIG_EXT3_FS_POSIX_ACL is not set | 791 | # CONFIG_EXT3_FS_POSIX_ACL is not set |
| 755 | # CONFIG_EXT3_FS_SECURITY is not set | 792 | # CONFIG_EXT3_FS_SECURITY is not set |
| 793 | # CONFIG_EXT4DEV_FS is not set | ||
| 756 | CONFIG_JBD=y | 794 | CONFIG_JBD=y |
| 757 | # CONFIG_JBD_DEBUG is not set | 795 | # CONFIG_JBD_DEBUG is not set |
| 758 | CONFIG_FS_MBCACHE=y | 796 | CONFIG_FS_MBCACHE=y |
| @@ -760,6 +798,7 @@ CONFIG_FS_MBCACHE=y | |||
| 760 | # CONFIG_JFS_FS is not set | 798 | # CONFIG_JFS_FS is not set |
| 761 | # CONFIG_FS_POSIX_ACL is not set | 799 | # CONFIG_FS_POSIX_ACL is not set |
| 762 | # CONFIG_XFS_FS is not set | 800 | # CONFIG_XFS_FS is not set |
| 801 | # CONFIG_GFS2_FS is not set | ||
| 763 | # CONFIG_OCFS2_FS is not set | 802 | # CONFIG_OCFS2_FS is not set |
| 764 | # CONFIG_MINIX_FS is not set | 803 | # CONFIG_MINIX_FS is not set |
| 765 | # CONFIG_ROMFS_FS is not set | 804 | # CONFIG_ROMFS_FS is not set |
| @@ -788,8 +827,10 @@ CONFIG_FS_MBCACHE=y | |||
| 788 | # | 827 | # |
| 789 | CONFIG_PROC_FS=y | 828 | CONFIG_PROC_FS=y |
| 790 | CONFIG_PROC_KCORE=y | 829 | CONFIG_PROC_KCORE=y |
| 830 | CONFIG_PROC_SYSCTL=y | ||
| 791 | CONFIG_SYSFS=y | 831 | CONFIG_SYSFS=y |
| 792 | CONFIG_TMPFS=y | 832 | CONFIG_TMPFS=y |
| 833 | # CONFIG_TMPFS_POSIX_ACL is not set | ||
| 793 | # CONFIG_HUGETLB_PAGE is not set | 834 | # CONFIG_HUGETLB_PAGE is not set |
| 794 | CONFIG_RAMFS=y | 835 | CONFIG_RAMFS=y |
| 795 | # CONFIG_CONFIGFS_FS is not set | 836 | # CONFIG_CONFIGFS_FS is not set |
| @@ -904,13 +945,20 @@ CONFIG_NLS_DEFAULT="iso8859-1" | |||
| 904 | # CONFIG_NLS_UTF8 is not set | 945 | # CONFIG_NLS_UTF8 is not set |
| 905 | 946 | ||
| 906 | # | 947 | # |
| 948 | # Distributed Lock Manager | ||
| 949 | # | ||
| 950 | # CONFIG_DLM is not set | ||
| 951 | |||
| 952 | # | ||
| 907 | # Library routines | 953 | # Library routines |
| 908 | # | 954 | # |
| 955 | CONFIG_BITREVERSE=y | ||
| 909 | # CONFIG_CRC_CCITT is not set | 956 | # CONFIG_CRC_CCITT is not set |
| 910 | # CONFIG_CRC16 is not set | 957 | # CONFIG_CRC16 is not set |
| 911 | CONFIG_CRC32=y | 958 | CONFIG_CRC32=y |
| 912 | # CONFIG_LIBCRC32C is not set | 959 | # CONFIG_LIBCRC32C is not set |
| 913 | CONFIG_PLIST=y | 960 | CONFIG_PLIST=y |
| 961 | CONFIG_IOMAP_COPY=y | ||
| 914 | 962 | ||
| 915 | # | 963 | # |
| 916 | # Instrumentation Support | 964 | # Instrumentation Support |
| @@ -921,12 +969,16 @@ CONFIG_PLIST=y | |||
| 921 | # Kernel hacking | 969 | # Kernel hacking |
| 922 | # | 970 | # |
| 923 | # CONFIG_PRINTK_TIME is not set | 971 | # CONFIG_PRINTK_TIME is not set |
| 972 | CONFIG_ENABLE_MUST_CHECK=y | ||
| 924 | # CONFIG_MAGIC_SYSRQ is not set | 973 | # CONFIG_MAGIC_SYSRQ is not set |
| 925 | # CONFIG_UNUSED_SYMBOLS is not set | 974 | # CONFIG_UNUSED_SYMBOLS is not set |
| 975 | # CONFIG_DEBUG_FS is not set | ||
| 976 | # CONFIG_HEADERS_CHECK is not set | ||
| 926 | CONFIG_DEBUG_KERNEL=y | 977 | CONFIG_DEBUG_KERNEL=y |
| 927 | CONFIG_LOG_BUF_SHIFT=14 | 978 | CONFIG_LOG_BUF_SHIFT=14 |
| 928 | CONFIG_DETECT_SOFTLOCKUP=y | 979 | CONFIG_DETECT_SOFTLOCKUP=y |
| 929 | # CONFIG_SCHEDSTATS is not set | 980 | # CONFIG_SCHEDSTATS is not set |
| 981 | # CONFIG_DEBUG_SLAB is not set | ||
| 930 | # CONFIG_DEBUG_RT_MUTEXES is not set | 982 | # CONFIG_DEBUG_RT_MUTEXES is not set |
| 931 | # CONFIG_RT_MUTEX_TESTER is not set | 983 | # CONFIG_RT_MUTEX_TESTER is not set |
| 932 | # CONFIG_DEBUG_SPINLOCK is not set | 984 | # CONFIG_DEBUG_SPINLOCK is not set |
| @@ -936,10 +988,10 @@ CONFIG_DETECT_SOFTLOCKUP=y | |||
| 936 | # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set | 988 | # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set |
| 937 | # CONFIG_DEBUG_KOBJECT is not set | 989 | # CONFIG_DEBUG_KOBJECT is not set |
| 938 | # CONFIG_DEBUG_HIGHMEM is not set | 990 | # CONFIG_DEBUG_HIGHMEM is not set |
| 991 | # CONFIG_DEBUG_BUGVERBOSE is not set | ||
| 939 | # CONFIG_DEBUG_INFO is not set | 992 | # CONFIG_DEBUG_INFO is not set |
| 940 | # CONFIG_DEBUG_FS is not set | ||
| 941 | # CONFIG_DEBUG_VM is not set | 993 | # CONFIG_DEBUG_VM is not set |
| 942 | # CONFIG_UNWIND_INFO is not set | 994 | # CONFIG_DEBUG_LIST is not set |
| 943 | CONFIG_FORCED_INLINING=y | 995 | CONFIG_FORCED_INLINING=y |
| 944 | # CONFIG_RCU_TORTURE_TEST is not set | 996 | # CONFIG_RCU_TORTURE_TEST is not set |
| 945 | # CONFIG_DEBUGGER is not set | 997 | # CONFIG_DEBUGGER is not set |
| @@ -957,7 +1009,3 @@ CONFIG_FORCED_INLINING=y | |||
| 957 | # Cryptographic options | 1009 | # Cryptographic options |
| 958 | # | 1010 | # |
| 959 | # CONFIG_CRYPTO is not set | 1011 | # CONFIG_CRYPTO is not set |
| 960 | |||
| 961 | # | ||
| 962 | # Hardware crypto devices | ||
| 963 | # | ||
diff --git a/arch/powerpc/configs/pmac32_defconfig b/arch/powerpc/configs/pmac32_defconfig index 765c8bb90ddd..f611df480fd9 100644 --- a/arch/powerpc/configs/pmac32_defconfig +++ b/arch/powerpc/configs/pmac32_defconfig | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.18-rc6 | 3 | # Linux kernel version: 2.6.20-rc5 |
| 4 | # Sun Sep 10 10:30:23 2006 | 4 | # Mon Jan 22 22:28:56 2007 |
| 5 | # | 5 | # |
| 6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
| 7 | CONFIG_PPC32=y | 7 | CONFIG_PPC32=y |
| @@ -10,6 +10,7 @@ CONFIG_MMU=y | |||
| 10 | CONFIG_GENERIC_HARDIRQS=y | 10 | CONFIG_GENERIC_HARDIRQS=y |
| 11 | CONFIG_IRQ_PER_CPU=y | 11 | CONFIG_IRQ_PER_CPU=y |
| 12 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 12 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
| 13 | CONFIG_ARCH_HAS_ILOG2_U32=y | ||
| 13 | CONFIG_GENERIC_HWEIGHT=y | 14 | CONFIG_GENERIC_HWEIGHT=y |
| 14 | CONFIG_GENERIC_CALIBRATE_DELAY=y | 15 | CONFIG_GENERIC_CALIBRATE_DELAY=y |
| 15 | CONFIG_GENERIC_FIND_NEXT_BIT=y | 16 | CONFIG_GENERIC_FIND_NEXT_BIT=y |
| @@ -21,13 +22,14 @@ CONFIG_ARCH_MAY_HAVE_PC_FDC=y | |||
| 21 | CONFIG_PPC_OF=y | 22 | CONFIG_PPC_OF=y |
| 22 | # CONFIG_PPC_UDBG_16550 is not set | 23 | # CONFIG_PPC_UDBG_16550 is not set |
| 23 | # CONFIG_GENERIC_TBSYNC is not set | 24 | # CONFIG_GENERIC_TBSYNC is not set |
| 25 | CONFIG_AUDIT_ARCH=y | ||
| 26 | CONFIG_GENERIC_BUG=y | ||
| 24 | # CONFIG_DEFAULT_UIMAGE is not set | 27 | # CONFIG_DEFAULT_UIMAGE is not set |
| 25 | 28 | ||
| 26 | # | 29 | # |
| 27 | # Processor support | 30 | # Processor support |
| 28 | # | 31 | # |
| 29 | CONFIG_CLASSIC32=y | 32 | CONFIG_CLASSIC32=y |
| 30 | # CONFIG_PPC_52xx is not set | ||
| 31 | # CONFIG_PPC_82xx is not set | 33 | # CONFIG_PPC_82xx is not set |
| 32 | # CONFIG_PPC_83xx is not set | 34 | # CONFIG_PPC_83xx is not set |
| 33 | # CONFIG_PPC_85xx is not set | 35 | # CONFIG_PPC_85xx is not set |
| @@ -38,6 +40,8 @@ CONFIG_CLASSIC32=y | |||
| 38 | # CONFIG_E200 is not set | 40 | # CONFIG_E200 is not set |
| 39 | CONFIG_6xx=y | 41 | CONFIG_6xx=y |
| 40 | CONFIG_PPC_FPU=y | 42 | CONFIG_PPC_FPU=y |
| 43 | # CONFIG_PPC_DCR_NATIVE is not set | ||
| 44 | # CONFIG_PPC_DCR_MMIO is not set | ||
| 41 | CONFIG_ALTIVEC=y | 45 | CONFIG_ALTIVEC=y |
| 42 | CONFIG_PPC_STD_MMU=y | 46 | CONFIG_PPC_STD_MMU=y |
| 43 | CONFIG_PPC_STD_MMU_32=y | 47 | CONFIG_PPC_STD_MMU_32=y |
| @@ -58,17 +62,21 @@ CONFIG_LOCALVERSION="" | |||
| 58 | # CONFIG_LOCALVERSION_AUTO is not set | 62 | # CONFIG_LOCALVERSION_AUTO is not set |
| 59 | CONFIG_SWAP=y | 63 | CONFIG_SWAP=y |
| 60 | CONFIG_SYSVIPC=y | 64 | CONFIG_SYSVIPC=y |
| 65 | # CONFIG_IPC_NS is not set | ||
| 61 | CONFIG_POSIX_MQUEUE=y | 66 | CONFIG_POSIX_MQUEUE=y |
| 62 | # CONFIG_BSD_PROCESS_ACCT is not set | 67 | # CONFIG_BSD_PROCESS_ACCT is not set |
| 63 | # CONFIG_TASKSTATS is not set | 68 | # CONFIG_TASKSTATS is not set |
| 64 | CONFIG_SYSCTL=y | 69 | # CONFIG_UTS_NS is not set |
| 65 | # CONFIG_AUDIT is not set | 70 | # CONFIG_AUDIT is not set |
| 66 | CONFIG_IKCONFIG=y | 71 | CONFIG_IKCONFIG=y |
| 67 | CONFIG_IKCONFIG_PROC=y | 72 | CONFIG_IKCONFIG_PROC=y |
| 73 | CONFIG_SYSFS_DEPRECATED=y | ||
| 68 | # CONFIG_RELAY is not set | 74 | # CONFIG_RELAY is not set |
| 69 | CONFIG_INITRAMFS_SOURCE="" | 75 | CONFIG_INITRAMFS_SOURCE="" |
| 70 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | 76 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set |
| 77 | CONFIG_SYSCTL=y | ||
| 71 | # CONFIG_EMBEDDED is not set | 78 | # CONFIG_EMBEDDED is not set |
| 79 | CONFIG_SYSCTL_SYSCALL=y | ||
| 72 | CONFIG_KALLSYMS=y | 80 | CONFIG_KALLSYMS=y |
| 73 | # CONFIG_KALLSYMS_ALL is not set | 81 | # CONFIG_KALLSYMS_ALL is not set |
| 74 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | 82 | # CONFIG_KALLSYMS_EXTRA_PASS is not set |
| @@ -77,12 +85,12 @@ CONFIG_PRINTK=y | |||
| 77 | CONFIG_BUG=y | 85 | CONFIG_BUG=y |
| 78 | CONFIG_ELF_CORE=y | 86 | CONFIG_ELF_CORE=y |
| 79 | CONFIG_BASE_FULL=y | 87 | CONFIG_BASE_FULL=y |
| 80 | CONFIG_RT_MUTEXES=y | ||
| 81 | CONFIG_FUTEX=y | 88 | CONFIG_FUTEX=y |
| 82 | CONFIG_EPOLL=y | 89 | CONFIG_EPOLL=y |
| 83 | CONFIG_SHMEM=y | 90 | CONFIG_SHMEM=y |
| 84 | CONFIG_SLAB=y | 91 | CONFIG_SLAB=y |
| 85 | CONFIG_VM_EVENT_COUNTERS=y | 92 | CONFIG_VM_EVENT_COUNTERS=y |
| 93 | CONFIG_RT_MUTEXES=y | ||
| 86 | # CONFIG_TINY_SHMEM is not set | 94 | # CONFIG_TINY_SHMEM is not set |
| 87 | CONFIG_BASE_SMALL=0 | 95 | CONFIG_BASE_SMALL=0 |
| 88 | # CONFIG_SLOB is not set | 96 | # CONFIG_SLOB is not set |
| @@ -100,6 +108,7 @@ CONFIG_KMOD=y | |||
| 100 | # | 108 | # |
| 101 | # Block layer | 109 | # Block layer |
| 102 | # | 110 | # |
| 111 | CONFIG_BLOCK=y | ||
| 103 | CONFIG_LBD=y | 112 | CONFIG_LBD=y |
| 104 | # CONFIG_BLK_DEV_IO_TRACE is not set | 113 | # CONFIG_BLK_DEV_IO_TRACE is not set |
| 105 | CONFIG_LSF=y | 114 | CONFIG_LSF=y |
| @@ -121,18 +130,22 @@ CONFIG_DEFAULT_IOSCHED="anticipatory" | |||
| 121 | # Platform support | 130 | # Platform support |
| 122 | # | 131 | # |
| 123 | CONFIG_PPC_MULTIPLATFORM=y | 132 | CONFIG_PPC_MULTIPLATFORM=y |
| 124 | # CONFIG_PPC_ISERIES is not set | ||
| 125 | # CONFIG_EMBEDDED6xx is not set | 133 | # CONFIG_EMBEDDED6xx is not set |
| 126 | # CONFIG_APUS is not set | 134 | # CONFIG_APUS is not set |
| 127 | # CONFIG_PPC_CHRP is not set | 135 | # CONFIG_PPC_CHRP is not set |
| 136 | # CONFIG_PPC_MPC52xx is not set | ||
| 137 | # CONFIG_PPC_EFIKA is not set | ||
| 138 | # CONFIG_PPC_LITE5200 is not set | ||
| 128 | CONFIG_PPC_PMAC=y | 139 | CONFIG_PPC_PMAC=y |
| 129 | # CONFIG_PPC_CELL is not set | 140 | # CONFIG_PPC_CELL is not set |
| 130 | # CONFIG_PPC_CELL_NATIVE is not set | 141 | # CONFIG_PPC_CELL_NATIVE is not set |
| 131 | # CONFIG_UDBG_RTAS_CONSOLE is not set | 142 | CONFIG_PPC_NATIVE=y |
| 132 | # CONFIG_PPC_RTAS is not set | 143 | # CONFIG_PPC_RTAS is not set |
| 133 | # CONFIG_MMIO_NVRAM is not set | 144 | # CONFIG_MMIO_NVRAM is not set |
| 134 | CONFIG_PPC_MPC106=y | 145 | CONFIG_PPC_MPC106=y |
| 135 | # CONFIG_PPC_970_NAP is not set | 146 | # CONFIG_PPC_970_NAP is not set |
| 147 | # CONFIG_PPC_INDIRECT_IO is not set | ||
| 148 | # CONFIG_GENERIC_IOMAP is not set | ||
| 136 | CONFIG_CPU_FREQ=y | 149 | CONFIG_CPU_FREQ=y |
| 137 | CONFIG_CPU_FREQ_TABLE=y | 150 | CONFIG_CPU_FREQ_TABLE=y |
| 138 | # CONFIG_CPU_FREQ_DEBUG is not set | 151 | # CONFIG_CPU_FREQ_DEBUG is not set |
| @@ -157,6 +170,7 @@ CONFIG_MPIC=y | |||
| 157 | # CONFIG_HIGHMEM is not set | 170 | # CONFIG_HIGHMEM is not set |
| 158 | # CONFIG_HZ_100 is not set | 171 | # CONFIG_HZ_100 is not set |
| 159 | CONFIG_HZ_250=y | 172 | CONFIG_HZ_250=y |
| 173 | # CONFIG_HZ_300 is not set | ||
| 160 | # CONFIG_HZ_1000 is not set | 174 | # CONFIG_HZ_1000 is not set |
| 161 | CONFIG_HZ=250 | 175 | CONFIG_HZ=250 |
| 162 | CONFIG_PREEMPT_NONE=y | 176 | CONFIG_PREEMPT_NONE=y |
| @@ -167,6 +181,7 @@ CONFIG_BINFMT_MISC=m | |||
| 167 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y | 181 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y |
| 168 | # CONFIG_KEXEC is not set | 182 | # CONFIG_KEXEC is not set |
| 169 | CONFIG_ARCH_FLATMEM_ENABLE=y | 183 | CONFIG_ARCH_FLATMEM_ENABLE=y |
| 184 | CONFIG_ARCH_POPULATES_NODE_MAP=y | ||
| 170 | CONFIG_SELECT_MEMORY_MODEL=y | 185 | CONFIG_SELECT_MEMORY_MODEL=y |
| 171 | CONFIG_FLATMEM_MANUAL=y | 186 | CONFIG_FLATMEM_MANUAL=y |
| 172 | # CONFIG_DISCONTIGMEM_MANUAL is not set | 187 | # CONFIG_DISCONTIGMEM_MANUAL is not set |
| @@ -181,6 +196,8 @@ CONFIG_PROC_DEVICETREE=y | |||
| 181 | CONFIG_PM=y | 196 | CONFIG_PM=y |
| 182 | # CONFIG_PM_LEGACY is not set | 197 | # CONFIG_PM_LEGACY is not set |
| 183 | CONFIG_PM_DEBUG=y | 198 | CONFIG_PM_DEBUG=y |
| 199 | # CONFIG_DISABLE_CONSOLE_SUSPEND is not set | ||
| 200 | CONFIG_PM_SYSFS_DEPRECATED=y | ||
| 184 | CONFIG_SOFTWARE_SUSPEND=y | 201 | CONFIG_SOFTWARE_SUSPEND=y |
| 185 | CONFIG_PM_STD_PARTITION="" | 202 | CONFIG_PM_STD_PARTITION="" |
| 186 | CONFIG_SECCOMP=y | 203 | CONFIG_SECCOMP=y |
| @@ -254,6 +271,7 @@ CONFIG_PACKET=y | |||
| 254 | CONFIG_UNIX=y | 271 | CONFIG_UNIX=y |
| 255 | CONFIG_XFRM=y | 272 | CONFIG_XFRM=y |
| 256 | CONFIG_XFRM_USER=y | 273 | CONFIG_XFRM_USER=y |
| 274 | # CONFIG_XFRM_SUB_POLICY is not set | ||
| 257 | CONFIG_NET_KEY=y | 275 | CONFIG_NET_KEY=y |
| 258 | CONFIG_INET=y | 276 | CONFIG_INET=y |
| 259 | CONFIG_IP_MULTICAST=y | 277 | CONFIG_IP_MULTICAST=y |
| @@ -272,10 +290,13 @@ CONFIG_INET_ESP=y | |||
| 272 | # CONFIG_INET_TUNNEL is not set | 290 | # CONFIG_INET_TUNNEL is not set |
| 273 | # CONFIG_INET_XFRM_MODE_TRANSPORT is not set | 291 | # CONFIG_INET_XFRM_MODE_TRANSPORT is not set |
| 274 | # CONFIG_INET_XFRM_MODE_TUNNEL is not set | 292 | # CONFIG_INET_XFRM_MODE_TUNNEL is not set |
| 293 | CONFIG_INET_XFRM_MODE_BEET=y | ||
| 275 | CONFIG_INET_DIAG=y | 294 | CONFIG_INET_DIAG=y |
| 276 | CONFIG_INET_TCP_DIAG=y | 295 | CONFIG_INET_TCP_DIAG=y |
| 277 | # CONFIG_TCP_CONG_ADVANCED is not set | 296 | # CONFIG_TCP_CONG_ADVANCED is not set |
| 278 | CONFIG_TCP_CONG_BIC=y | 297 | CONFIG_TCP_CONG_CUBIC=y |
| 298 | CONFIG_DEFAULT_TCP_CONG="cubic" | ||
| 299 | # CONFIG_TCP_MD5SIG is not set | ||
| 279 | 300 | ||
| 280 | # | 301 | # |
| 281 | # IP: Virtual Server Configuration | 302 | # IP: Virtual Server Configuration |
| @@ -292,14 +313,33 @@ CONFIG_NETFILTER=y | |||
| 292 | # Core Netfilter Configuration | 313 | # Core Netfilter Configuration |
| 293 | # | 314 | # |
| 294 | # CONFIG_NETFILTER_NETLINK is not set | 315 | # CONFIG_NETFILTER_NETLINK is not set |
| 316 | CONFIG_NF_CONNTRACK_ENABLED=m | ||
| 317 | CONFIG_NF_CONNTRACK_SUPPORT=y | ||
| 318 | # CONFIG_IP_NF_CONNTRACK_SUPPORT is not set | ||
| 319 | CONFIG_NF_CONNTRACK=m | ||
| 320 | # CONFIG_NF_CT_ACCT is not set | ||
| 321 | # CONFIG_NF_CONNTRACK_MARK is not set | ||
| 322 | # CONFIG_NF_CONNTRACK_EVENTS is not set | ||
| 323 | # CONFIG_NF_CT_PROTO_SCTP is not set | ||
| 324 | # CONFIG_NF_CONNTRACK_AMANDA is not set | ||
| 325 | CONFIG_NF_CONNTRACK_FTP=m | ||
| 326 | # CONFIG_NF_CONNTRACK_H323 is not set | ||
| 327 | CONFIG_NF_CONNTRACK_IRC=m | ||
| 328 | # CONFIG_NF_CONNTRACK_NETBIOS_NS is not set | ||
| 329 | # CONFIG_NF_CONNTRACK_PPTP is not set | ||
| 330 | # CONFIG_NF_CONNTRACK_SIP is not set | ||
| 331 | CONFIG_NF_CONNTRACK_TFTP=m | ||
| 295 | CONFIG_NETFILTER_XTABLES=m | 332 | CONFIG_NETFILTER_XTABLES=m |
| 296 | CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m | 333 | CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m |
| 334 | # CONFIG_NETFILTER_XT_TARGET_DSCP is not set | ||
| 297 | CONFIG_NETFILTER_XT_TARGET_MARK=m | 335 | CONFIG_NETFILTER_XT_TARGET_MARK=m |
| 298 | CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m | 336 | CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m |
| 337 | CONFIG_NETFILTER_XT_TARGET_NFLOG=m | ||
| 299 | CONFIG_NETFILTER_XT_TARGET_NOTRACK=m | 338 | CONFIG_NETFILTER_XT_TARGET_NOTRACK=m |
| 300 | CONFIG_NETFILTER_XT_MATCH_COMMENT=m | 339 | CONFIG_NETFILTER_XT_MATCH_COMMENT=m |
| 301 | CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m | 340 | CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m |
| 302 | CONFIG_NETFILTER_XT_MATCH_DCCP=m | 341 | CONFIG_NETFILTER_XT_MATCH_DCCP=m |
| 342 | CONFIG_NETFILTER_XT_MATCH_DSCP=m | ||
| 303 | CONFIG_NETFILTER_XT_MATCH_ESP=m | 343 | CONFIG_NETFILTER_XT_MATCH_ESP=m |
| 304 | CONFIG_NETFILTER_XT_MATCH_HELPER=m | 344 | CONFIG_NETFILTER_XT_MATCH_HELPER=m |
| 305 | CONFIG_NETFILTER_XT_MATCH_LENGTH=m | 345 | CONFIG_NETFILTER_XT_MATCH_LENGTH=m |
| @@ -312,61 +352,49 @@ CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m | |||
| 312 | # CONFIG_NETFILTER_XT_MATCH_QUOTA is not set | 352 | # CONFIG_NETFILTER_XT_MATCH_QUOTA is not set |
| 313 | CONFIG_NETFILTER_XT_MATCH_REALM=m | 353 | CONFIG_NETFILTER_XT_MATCH_REALM=m |
| 314 | CONFIG_NETFILTER_XT_MATCH_SCTP=m | 354 | CONFIG_NETFILTER_XT_MATCH_SCTP=m |
| 315 | CONFIG_NETFILTER_XT_MATCH_STATE=m | 355 | # CONFIG_NETFILTER_XT_MATCH_STATE is not set |
| 316 | # CONFIG_NETFILTER_XT_MATCH_STATISTIC is not set | 356 | # CONFIG_NETFILTER_XT_MATCH_STATISTIC is not set |
| 317 | CONFIG_NETFILTER_XT_MATCH_STRING=m | 357 | CONFIG_NETFILTER_XT_MATCH_STRING=m |
| 318 | CONFIG_NETFILTER_XT_MATCH_TCPMSS=m | 358 | CONFIG_NETFILTER_XT_MATCH_TCPMSS=m |
| 359 | # CONFIG_NETFILTER_XT_MATCH_HASHLIMIT is not set | ||
| 319 | 360 | ||
| 320 | # | 361 | # |
| 321 | # IP: Netfilter Configuration | 362 | # IP: Netfilter Configuration |
| 322 | # | 363 | # |
| 323 | CONFIG_IP_NF_CONNTRACK=m | 364 | CONFIG_NF_CONNTRACK_IPV4=m |
| 324 | # CONFIG_IP_NF_CT_ACCT is not set | 365 | CONFIG_NF_CONNTRACK_PROC_COMPAT=y |
| 325 | # CONFIG_IP_NF_CONNTRACK_MARK is not set | ||
| 326 | # CONFIG_IP_NF_CONNTRACK_EVENTS is not set | ||
| 327 | # CONFIG_IP_NF_CT_PROTO_SCTP is not set | ||
| 328 | CONFIG_IP_NF_FTP=m | ||
| 329 | CONFIG_IP_NF_IRC=m | ||
| 330 | CONFIG_IP_NF_NETBIOS_NS=m | ||
| 331 | CONFIG_IP_NF_TFTP=m | ||
| 332 | CONFIG_IP_NF_AMANDA=m | ||
| 333 | CONFIG_IP_NF_PPTP=m | ||
| 334 | CONFIG_IP_NF_H323=m | ||
| 335 | # CONFIG_IP_NF_SIP is not set | ||
| 336 | # CONFIG_IP_NF_QUEUE is not set | 366 | # CONFIG_IP_NF_QUEUE is not set |
| 337 | CONFIG_IP_NF_IPTABLES=m | 367 | CONFIG_IP_NF_IPTABLES=m |
| 338 | CONFIG_IP_NF_MATCH_IPRANGE=m | 368 | CONFIG_IP_NF_MATCH_IPRANGE=m |
| 339 | CONFIG_IP_NF_MATCH_TOS=m | 369 | CONFIG_IP_NF_MATCH_TOS=m |
| 340 | CONFIG_IP_NF_MATCH_RECENT=m | 370 | CONFIG_IP_NF_MATCH_RECENT=m |
| 341 | CONFIG_IP_NF_MATCH_ECN=m | 371 | CONFIG_IP_NF_MATCH_ECN=m |
| 342 | CONFIG_IP_NF_MATCH_DSCP=m | ||
| 343 | CONFIG_IP_NF_MATCH_AH=m | 372 | CONFIG_IP_NF_MATCH_AH=m |
| 344 | CONFIG_IP_NF_MATCH_TTL=m | 373 | CONFIG_IP_NF_MATCH_TTL=m |
| 345 | CONFIG_IP_NF_MATCH_OWNER=m | 374 | CONFIG_IP_NF_MATCH_OWNER=m |
| 346 | CONFIG_IP_NF_MATCH_ADDRTYPE=m | 375 | CONFIG_IP_NF_MATCH_ADDRTYPE=m |
| 347 | CONFIG_IP_NF_MATCH_HASHLIMIT=m | ||
| 348 | CONFIG_IP_NF_FILTER=m | 376 | CONFIG_IP_NF_FILTER=m |
| 349 | CONFIG_IP_NF_TARGET_REJECT=m | 377 | CONFIG_IP_NF_TARGET_REJECT=m |
| 350 | CONFIG_IP_NF_TARGET_LOG=m | 378 | CONFIG_IP_NF_TARGET_LOG=m |
| 351 | CONFIG_IP_NF_TARGET_ULOG=m | 379 | CONFIG_IP_NF_TARGET_ULOG=m |
| 352 | CONFIG_IP_NF_TARGET_TCPMSS=m | 380 | CONFIG_IP_NF_TARGET_TCPMSS=m |
| 353 | CONFIG_IP_NF_NAT=m | 381 | CONFIG_NF_NAT=m |
| 354 | CONFIG_IP_NF_NAT_NEEDED=y | 382 | CONFIG_NF_NAT_NEEDED=y |
| 355 | CONFIG_IP_NF_TARGET_MASQUERADE=m | 383 | CONFIG_IP_NF_TARGET_MASQUERADE=m |
| 356 | CONFIG_IP_NF_TARGET_REDIRECT=m | 384 | CONFIG_IP_NF_TARGET_REDIRECT=m |
| 357 | CONFIG_IP_NF_TARGET_NETMAP=m | 385 | CONFIG_IP_NF_TARGET_NETMAP=m |
| 358 | CONFIG_IP_NF_TARGET_SAME=m | 386 | CONFIG_IP_NF_TARGET_SAME=m |
| 359 | CONFIG_IP_NF_NAT_SNMP_BASIC=m | 387 | # CONFIG_NF_NAT_SNMP_BASIC is not set |
| 360 | CONFIG_IP_NF_NAT_IRC=m | 388 | CONFIG_NF_NAT_FTP=m |
| 361 | CONFIG_IP_NF_NAT_FTP=m | 389 | CONFIG_NF_NAT_IRC=m |
| 362 | CONFIG_IP_NF_NAT_TFTP=m | 390 | CONFIG_NF_NAT_TFTP=m |
| 363 | CONFIG_IP_NF_NAT_AMANDA=m | 391 | # CONFIG_NF_NAT_AMANDA is not set |
| 364 | CONFIG_IP_NF_NAT_PPTP=m | 392 | # CONFIG_NF_NAT_PPTP is not set |
| 365 | CONFIG_IP_NF_NAT_H323=m | 393 | # CONFIG_NF_NAT_H323 is not set |
| 394 | # CONFIG_NF_NAT_SIP is not set | ||
| 366 | CONFIG_IP_NF_MANGLE=m | 395 | CONFIG_IP_NF_MANGLE=m |
| 367 | CONFIG_IP_NF_TARGET_TOS=m | 396 | CONFIG_IP_NF_TARGET_TOS=m |
| 368 | CONFIG_IP_NF_TARGET_ECN=m | 397 | CONFIG_IP_NF_TARGET_ECN=m |
| 369 | CONFIG_IP_NF_TARGET_DSCP=m | ||
| 370 | CONFIG_IP_NF_TARGET_TTL=m | 398 | CONFIG_IP_NF_TARGET_TTL=m |
| 371 | CONFIG_IP_NF_RAW=m | 399 | CONFIG_IP_NF_RAW=m |
| 372 | CONFIG_IP_NF_ARPTABLES=m | 400 | CONFIG_IP_NF_ARPTABLES=m |
| @@ -384,8 +412,11 @@ CONFIG_IP_DCCP_ACKVEC=y | |||
| 384 | # DCCP CCIDs Configuration (EXPERIMENTAL) | 412 | # DCCP CCIDs Configuration (EXPERIMENTAL) |
| 385 | # | 413 | # |
| 386 | CONFIG_IP_DCCP_CCID2=m | 414 | CONFIG_IP_DCCP_CCID2=m |
| 415 | # CONFIG_IP_DCCP_CCID2_DEBUG is not set | ||
| 387 | CONFIG_IP_DCCP_CCID3=m | 416 | CONFIG_IP_DCCP_CCID3=m |
| 388 | CONFIG_IP_DCCP_TFRC_LIB=m | 417 | CONFIG_IP_DCCP_TFRC_LIB=m |
| 418 | # CONFIG_IP_DCCP_CCID3_DEBUG is not set | ||
| 419 | CONFIG_IP_DCCP_CCID3_RTO=100 | ||
| 389 | 420 | ||
| 390 | # | 421 | # |
| 391 | # DCCP Kernel Hacking | 422 | # DCCP Kernel Hacking |
| @@ -410,7 +441,6 @@ CONFIG_IP_DCCP_TFRC_LIB=m | |||
| 410 | # CONFIG_ATALK is not set | 441 | # CONFIG_ATALK is not set |
| 411 | # CONFIG_X25 is not set | 442 | # CONFIG_X25 is not set |
| 412 | # CONFIG_LAPB is not set | 443 | # CONFIG_LAPB is not set |
| 413 | # CONFIG_NET_DIVERT is not set | ||
| 414 | # CONFIG_ECONET is not set | 444 | # CONFIG_ECONET is not set |
| 415 | # CONFIG_WAN_ROUTER is not set | 445 | # CONFIG_WAN_ROUTER is not set |
| 416 | 446 | ||
| @@ -567,6 +597,12 @@ CONFIG_BLK_DEV_INITRD=y | |||
| 567 | # CONFIG_ATA_OVER_ETH is not set | 597 | # CONFIG_ATA_OVER_ETH is not set |
| 568 | 598 | ||
| 569 | # | 599 | # |
| 600 | # Misc devices | ||
| 601 | # | ||
| 602 | # CONFIG_SGI_IOC4 is not set | ||
| 603 | # CONFIG_TIFM_CORE is not set | ||
| 604 | |||
| 605 | # | ||
| 570 | # ATA/ATAPI/MFM/RLL support | 606 | # ATA/ATAPI/MFM/RLL support |
| 571 | # | 607 | # |
| 572 | CONFIG_IDE=y | 608 | CONFIG_IDE=y |
| @@ -594,7 +630,6 @@ CONFIG_IDEPCI_SHARE_IRQ=y | |||
| 594 | # CONFIG_BLK_DEV_OFFBOARD is not set | 630 | # CONFIG_BLK_DEV_OFFBOARD is not set |
| 595 | CONFIG_BLK_DEV_GENERIC=y | 631 | CONFIG_BLK_DEV_GENERIC=y |
| 596 | # CONFIG_BLK_DEV_OPTI621 is not set | 632 | # CONFIG_BLK_DEV_OPTI621 is not set |
| 597 | CONFIG_BLK_DEV_SL82C105=y | ||
| 598 | CONFIG_BLK_DEV_IDEDMA_PCI=y | 633 | CONFIG_BLK_DEV_IDEDMA_PCI=y |
| 599 | # CONFIG_BLK_DEV_IDEDMA_FORCED is not set | 634 | # CONFIG_BLK_DEV_IDEDMA_FORCED is not set |
| 600 | CONFIG_IDEDMA_PCI_AUTO=y | 635 | CONFIG_IDEDMA_PCI_AUTO=y |
| @@ -609,6 +644,7 @@ CONFIG_IDEDMA_PCI_AUTO=y | |||
| 609 | # CONFIG_BLK_DEV_CS5530 is not set | 644 | # CONFIG_BLK_DEV_CS5530 is not set |
| 610 | # CONFIG_BLK_DEV_HPT34X is not set | 645 | # CONFIG_BLK_DEV_HPT34X is not set |
| 611 | # CONFIG_BLK_DEV_HPT366 is not set | 646 | # CONFIG_BLK_DEV_HPT366 is not set |
| 647 | # CONFIG_BLK_DEV_JMICRON is not set | ||
| 612 | # CONFIG_BLK_DEV_SC1200 is not set | 648 | # CONFIG_BLK_DEV_SC1200 is not set |
| 613 | # CONFIG_BLK_DEV_PIIX is not set | 649 | # CONFIG_BLK_DEV_PIIX is not set |
| 614 | # CONFIG_BLK_DEV_IT821X is not set | 650 | # CONFIG_BLK_DEV_IT821X is not set |
| @@ -617,6 +653,7 @@ CONFIG_IDEDMA_PCI_AUTO=y | |||
| 617 | CONFIG_BLK_DEV_PDC202XX_NEW=y | 653 | CONFIG_BLK_DEV_PDC202XX_NEW=y |
| 618 | # CONFIG_BLK_DEV_SVWKS is not set | 654 | # CONFIG_BLK_DEV_SVWKS is not set |
| 619 | # CONFIG_BLK_DEV_SIIMAGE is not set | 655 | # CONFIG_BLK_DEV_SIIMAGE is not set |
| 656 | CONFIG_BLK_DEV_SL82C105=y | ||
| 620 | # CONFIG_BLK_DEV_SLC90E66 is not set | 657 | # CONFIG_BLK_DEV_SLC90E66 is not set |
| 621 | # CONFIG_BLK_DEV_TRM290 is not set | 658 | # CONFIG_BLK_DEV_TRM290 is not set |
| 622 | # CONFIG_BLK_DEV_VIA82CXXX is not set | 659 | # CONFIG_BLK_DEV_VIA82CXXX is not set |
| @@ -634,6 +671,8 @@ CONFIG_IDEDMA_AUTO=y | |||
| 634 | # | 671 | # |
| 635 | # CONFIG_RAID_ATTRS is not set | 672 | # CONFIG_RAID_ATTRS is not set |
| 636 | CONFIG_SCSI=y | 673 | CONFIG_SCSI=y |
| 674 | # CONFIG_SCSI_TGT is not set | ||
| 675 | CONFIG_SCSI_NETLINK=y | ||
| 637 | CONFIG_SCSI_PROC_FS=y | 676 | CONFIG_SCSI_PROC_FS=y |
| 638 | 677 | ||
| 639 | # | 678 | # |
| @@ -653,14 +692,16 @@ CONFIG_CHR_DEV_SG=y | |||
| 653 | # CONFIG_SCSI_MULTI_LUN is not set | 692 | # CONFIG_SCSI_MULTI_LUN is not set |
| 654 | CONFIG_SCSI_CONSTANTS=y | 693 | CONFIG_SCSI_CONSTANTS=y |
| 655 | # CONFIG_SCSI_LOGGING is not set | 694 | # CONFIG_SCSI_LOGGING is not set |
| 695 | # CONFIG_SCSI_SCAN_ASYNC is not set | ||
| 656 | 696 | ||
| 657 | # | 697 | # |
| 658 | # SCSI Transport Attributes | 698 | # SCSI Transports |
| 659 | # | 699 | # |
| 660 | CONFIG_SCSI_SPI_ATTRS=y | 700 | CONFIG_SCSI_SPI_ATTRS=y |
| 661 | CONFIG_SCSI_FC_ATTRS=y | 701 | CONFIG_SCSI_FC_ATTRS=y |
| 662 | # CONFIG_SCSI_ISCSI_ATTRS is not set | 702 | # CONFIG_SCSI_ISCSI_ATTRS is not set |
| 663 | # CONFIG_SCSI_SAS_ATTRS is not set | 703 | # CONFIG_SCSI_SAS_ATTRS is not set |
| 704 | # CONFIG_SCSI_SAS_LIBSAS is not set | ||
| 664 | 705 | ||
| 665 | # | 706 | # |
| 666 | # SCSI low-level drivers | 707 | # SCSI low-level drivers |
| @@ -678,11 +719,12 @@ CONFIG_AIC7XXX_DEBUG_MASK=0 | |||
| 678 | CONFIG_AIC7XXX_REG_PRETTY_PRINT=y | 719 | CONFIG_AIC7XXX_REG_PRETTY_PRINT=y |
| 679 | CONFIG_SCSI_AIC7XXX_OLD=m | 720 | CONFIG_SCSI_AIC7XXX_OLD=m |
| 680 | # CONFIG_SCSI_AIC79XX is not set | 721 | # CONFIG_SCSI_AIC79XX is not set |
| 722 | # CONFIG_SCSI_AIC94XX is not set | ||
| 681 | # CONFIG_SCSI_DPT_I2O is not set | 723 | # CONFIG_SCSI_DPT_I2O is not set |
| 724 | # CONFIG_SCSI_ARCMSR is not set | ||
| 682 | # CONFIG_MEGARAID_NEWGEN is not set | 725 | # CONFIG_MEGARAID_NEWGEN is not set |
| 683 | # CONFIG_MEGARAID_LEGACY is not set | 726 | # CONFIG_MEGARAID_LEGACY is not set |
| 684 | # CONFIG_MEGARAID_SAS is not set | 727 | # CONFIG_MEGARAID_SAS is not set |
| 685 | # CONFIG_ATA is not set | ||
| 686 | # CONFIG_SCSI_HPTIOP is not set | 728 | # CONFIG_SCSI_HPTIOP is not set |
| 687 | # CONFIG_SCSI_BUSLOGIC is not set | 729 | # CONFIG_SCSI_BUSLOGIC is not set |
| 688 | # CONFIG_SCSI_DMX3191D is not set | 730 | # CONFIG_SCSI_DMX3191D is not set |
| @@ -692,14 +734,15 @@ CONFIG_SCSI_AIC7XXX_OLD=m | |||
| 692 | # CONFIG_SCSI_IPS is not set | 734 | # CONFIG_SCSI_IPS is not set |
| 693 | # CONFIG_SCSI_INITIO is not set | 735 | # CONFIG_SCSI_INITIO is not set |
| 694 | # CONFIG_SCSI_INIA100 is not set | 736 | # CONFIG_SCSI_INIA100 is not set |
| 737 | # CONFIG_SCSI_STEX is not set | ||
| 695 | CONFIG_SCSI_SYM53C8XX_2=y | 738 | CONFIG_SCSI_SYM53C8XX_2=y |
| 696 | CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=0 | 739 | CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=0 |
| 697 | CONFIG_SCSI_SYM53C8XX_DEFAULT_TAGS=16 | 740 | CONFIG_SCSI_SYM53C8XX_DEFAULT_TAGS=16 |
| 698 | CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64 | 741 | CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64 |
| 699 | CONFIG_SCSI_SYM53C8XX_MMIO=y | 742 | CONFIG_SCSI_SYM53C8XX_MMIO=y |
| 700 | # CONFIG_SCSI_IPR is not set | ||
| 701 | # CONFIG_SCSI_QLOGIC_1280 is not set | 743 | # CONFIG_SCSI_QLOGIC_1280 is not set |
| 702 | # CONFIG_SCSI_QLA_FC is not set | 744 | # CONFIG_SCSI_QLA_FC is not set |
| 745 | # CONFIG_SCSI_QLA_ISCSI is not set | ||
| 703 | # CONFIG_SCSI_LPFC is not set | 746 | # CONFIG_SCSI_LPFC is not set |
| 704 | # CONFIG_SCSI_DC395x is not set | 747 | # CONFIG_SCSI_DC395x is not set |
| 705 | # CONFIG_SCSI_DC390T is not set | 748 | # CONFIG_SCSI_DC390T is not set |
| @@ -709,6 +752,7 @@ CONFIG_SCSI_MESH=y | |||
| 709 | CONFIG_SCSI_MESH_SYNC_RATE=5 | 752 | CONFIG_SCSI_MESH_SYNC_RATE=5 |
| 710 | CONFIG_SCSI_MESH_RESET_DELAY_MS=4000 | 753 | CONFIG_SCSI_MESH_RESET_DELAY_MS=4000 |
| 711 | CONFIG_SCSI_MAC53C94=y | 754 | CONFIG_SCSI_MAC53C94=y |
| 755 | # CONFIG_SCSI_SRP is not set | ||
| 712 | 756 | ||
| 713 | # | 757 | # |
| 714 | # PCMCIA SCSI adapter support | 758 | # PCMCIA SCSI adapter support |
| @@ -720,6 +764,11 @@ CONFIG_SCSI_MAC53C94=y | |||
| 720 | # CONFIG_PCMCIA_SYM53C500 is not set | 764 | # CONFIG_PCMCIA_SYM53C500 is not set |
| 721 | 765 | ||
| 722 | # | 766 | # |
| 767 | # Serial ATA (prod) and Parallel ATA (experimental) drivers | ||
| 768 | # | ||
| 769 | # CONFIG_ATA is not set | ||
| 770 | |||
| 771 | # | ||
| 723 | # Multi-device support (RAID and LVM) | 772 | # Multi-device support (RAID and LVM) |
| 724 | # | 773 | # |
| 725 | CONFIG_MD=y | 774 | CONFIG_MD=y |
| @@ -732,6 +781,7 @@ CONFIG_MD_RAID10=m | |||
| 732 | CONFIG_MD_MULTIPATH=m | 781 | CONFIG_MD_MULTIPATH=m |
| 733 | CONFIG_MD_FAULTY=m | 782 | CONFIG_MD_FAULTY=m |
| 734 | CONFIG_BLK_DEV_DM=m | 783 | CONFIG_BLK_DEV_DM=m |
| 784 | # CONFIG_DM_DEBUG is not set | ||
| 735 | CONFIG_DM_CRYPT=m | 785 | CONFIG_DM_CRYPT=m |
| 736 | CONFIG_DM_SNAPSHOT=m | 786 | CONFIG_DM_SNAPSHOT=m |
| 737 | CONFIG_DM_MIRROR=m | 787 | CONFIG_DM_MIRROR=m |
| @@ -798,6 +848,7 @@ CONFIG_THERM_WINDTUNNEL=m | |||
| 798 | CONFIG_THERM_ADT746X=m | 848 | CONFIG_THERM_ADT746X=m |
| 799 | # CONFIG_WINDFARM is not set | 849 | # CONFIG_WINDFARM is not set |
| 800 | # CONFIG_ANSLCD is not set | 850 | # CONFIG_ANSLCD is not set |
| 851 | CONFIG_PMAC_RACKMETER=m | ||
| 801 | 852 | ||
| 802 | # | 853 | # |
| 803 | # Network device support | 854 | # Network device support |
| @@ -838,6 +889,7 @@ CONFIG_SUNGEM=y | |||
| 838 | # CONFIG_HP100 is not set | 889 | # CONFIG_HP100 is not set |
| 839 | CONFIG_NET_PCI=y | 890 | CONFIG_NET_PCI=y |
| 840 | CONFIG_PCNET32=y | 891 | CONFIG_PCNET32=y |
| 892 | # CONFIG_PCNET32_NAPI is not set | ||
| 841 | # CONFIG_AMD8111_ETH is not set | 893 | # CONFIG_AMD8111_ETH is not set |
| 842 | # CONFIG_ADAPTEC_STARFIRE is not set | 894 | # CONFIG_ADAPTEC_STARFIRE is not set |
| 843 | # CONFIG_B44 is not set | 895 | # CONFIG_B44 is not set |
| @@ -874,6 +926,7 @@ CONFIG_PCNET32=y | |||
| 874 | # CONFIG_TIGON3 is not set | 926 | # CONFIG_TIGON3 is not set |
| 875 | # CONFIG_BNX2 is not set | 927 | # CONFIG_BNX2 is not set |
| 876 | # CONFIG_MV643XX_ETH is not set | 928 | # CONFIG_MV643XX_ETH is not set |
| 929 | # CONFIG_QLA3XXX is not set | ||
| 877 | 930 | ||
| 878 | # | 931 | # |
| 879 | # Ethernet (10000 Mbit) | 932 | # Ethernet (10000 Mbit) |
| @@ -882,6 +935,7 @@ CONFIG_PCNET32=y | |||
| 882 | # CONFIG_IXGB is not set | 935 | # CONFIG_IXGB is not set |
| 883 | # CONFIG_S2IO is not set | 936 | # CONFIG_S2IO is not set |
| 884 | # CONFIG_MYRI10GE is not set | 937 | # CONFIG_MYRI10GE is not set |
| 938 | # CONFIG_NETXEN_NIC is not set | ||
| 885 | 939 | ||
| 886 | # | 940 | # |
| 887 | # Token Ring devices | 941 | # Token Ring devices |
| @@ -957,6 +1011,7 @@ CONFIG_PPP_BSDCOMP=m | |||
| 957 | # CONFIG_PPP_MPPE is not set | 1011 | # CONFIG_PPP_MPPE is not set |
| 958 | # CONFIG_PPPOE is not set | 1012 | # CONFIG_PPPOE is not set |
| 959 | # CONFIG_SLIP is not set | 1013 | # CONFIG_SLIP is not set |
| 1014 | CONFIG_SLHC=y | ||
| 960 | # CONFIG_NET_FC is not set | 1015 | # CONFIG_NET_FC is not set |
| 961 | # CONFIG_SHAPER is not set | 1016 | # CONFIG_SHAPER is not set |
| 962 | # CONFIG_NETCONSOLE is not set | 1017 | # CONFIG_NETCONSOLE is not set |
| @@ -977,6 +1032,7 @@ CONFIG_PPP_BSDCOMP=m | |||
| 977 | # Input device support | 1032 | # Input device support |
| 978 | # | 1033 | # |
| 979 | CONFIG_INPUT=y | 1034 | CONFIG_INPUT=y |
| 1035 | # CONFIG_INPUT_FF_MEMLESS is not set | ||
| 980 | 1036 | ||
| 981 | # | 1037 | # |
| 982 | # Userland interfaces | 1038 | # Userland interfaces |
| @@ -999,6 +1055,7 @@ CONFIG_INPUT_KEYBOARD=y | |||
| 999 | # CONFIG_KEYBOARD_LKKBD is not set | 1055 | # CONFIG_KEYBOARD_LKKBD is not set |
| 1000 | # CONFIG_KEYBOARD_XTKBD is not set | 1056 | # CONFIG_KEYBOARD_XTKBD is not set |
| 1001 | # CONFIG_KEYBOARD_NEWTON is not set | 1057 | # CONFIG_KEYBOARD_NEWTON is not set |
| 1058 | # CONFIG_KEYBOARD_STOWAWAY is not set | ||
| 1002 | CONFIG_INPUT_MOUSE=y | 1059 | CONFIG_INPUT_MOUSE=y |
| 1003 | # CONFIG_MOUSE_PS2 is not set | 1060 | # CONFIG_MOUSE_PS2 is not set |
| 1004 | # CONFIG_MOUSE_SERIAL is not set | 1061 | # CONFIG_MOUSE_SERIAL is not set |
| @@ -1039,6 +1096,7 @@ CONFIG_SERIAL_8250_RUNTIME_UARTS=4 | |||
| 1039 | # | 1096 | # |
| 1040 | # Non-8250 serial port support | 1097 | # Non-8250 serial port support |
| 1041 | # | 1098 | # |
| 1099 | # CONFIG_SERIAL_UARTLITE is not set | ||
| 1042 | CONFIG_SERIAL_CORE=m | 1100 | CONFIG_SERIAL_CORE=m |
| 1043 | CONFIG_SERIAL_PMACZILOG=m | 1101 | CONFIG_SERIAL_PMACZILOG=m |
| 1044 | # CONFIG_SERIAL_JSM is not set | 1102 | # CONFIG_SERIAL_JSM is not set |
| @@ -1062,13 +1120,7 @@ CONFIG_GEN_RTC=y | |||
| 1062 | # CONFIG_DTLK is not set | 1120 | # CONFIG_DTLK is not set |
| 1063 | # CONFIG_R3964 is not set | 1121 | # CONFIG_R3964 is not set |
| 1064 | # CONFIG_APPLICOM is not set | 1122 | # CONFIG_APPLICOM is not set |
| 1065 | |||
| 1066 | # | ||
| 1067 | # Ftape, the floppy tape device driver | ||
| 1068 | # | ||
| 1069 | CONFIG_AGP=m | 1123 | CONFIG_AGP=m |
| 1070 | # CONFIG_AGP_SIS is not set | ||
| 1071 | # CONFIG_AGP_VIA is not set | ||
| 1072 | CONFIG_AGP_UNINORTH=m | 1124 | CONFIG_AGP_UNINORTH=m |
| 1073 | CONFIG_DRM=m | 1125 | CONFIG_DRM=m |
| 1074 | # CONFIG_DRM_TDFX is not set | 1126 | # CONFIG_DRM_TDFX is not set |
| @@ -1091,7 +1143,6 @@ CONFIG_DRM_RADEON=m | |||
| 1091 | # TPM devices | 1143 | # TPM devices |
| 1092 | # | 1144 | # |
| 1093 | # CONFIG_TCG_TPM is not set | 1145 | # CONFIG_TCG_TPM is not set |
| 1094 | # CONFIG_TELCLOCK is not set | ||
| 1095 | 1146 | ||
| 1096 | # | 1147 | # |
| 1097 | # I2C support | 1148 | # I2C support |
| @@ -1167,14 +1218,9 @@ CONFIG_I2C_POWERMAC=y | |||
| 1167 | # CONFIG_HWMON_VID is not set | 1218 | # CONFIG_HWMON_VID is not set |
| 1168 | 1219 | ||
| 1169 | # | 1220 | # |
| 1170 | # Misc devices | ||
| 1171 | # | ||
| 1172 | |||
| 1173 | # | ||
| 1174 | # Multimedia devices | 1221 | # Multimedia devices |
| 1175 | # | 1222 | # |
| 1176 | # CONFIG_VIDEO_DEV is not set | 1223 | # CONFIG_VIDEO_DEV is not set |
| 1177 | CONFIG_VIDEO_V4L2=y | ||
| 1178 | 1224 | ||
| 1179 | # | 1225 | # |
| 1180 | # Digital Video Broadcasting Devices | 1226 | # Digital Video Broadcasting Devices |
| @@ -1187,6 +1233,7 @@ CONFIG_VIDEO_V4L2=y | |||
| 1187 | # | 1233 | # |
| 1188 | # CONFIG_FIRMWARE_EDID is not set | 1234 | # CONFIG_FIRMWARE_EDID is not set |
| 1189 | CONFIG_FB=y | 1235 | CONFIG_FB=y |
| 1236 | CONFIG_FB_DDC=y | ||
| 1190 | CONFIG_FB_CFB_FILLRECT=y | 1237 | CONFIG_FB_CFB_FILLRECT=y |
| 1191 | CONFIG_FB_CFB_COPYAREA=y | 1238 | CONFIG_FB_CFB_COPYAREA=y |
| 1192 | CONFIG_FB_CFB_IMAGEBLIT=y | 1239 | CONFIG_FB_CFB_IMAGEBLIT=y |
| @@ -1235,6 +1282,7 @@ CONFIG_FB_3DFX=y | |||
| 1235 | # CONFIG_FB_3DFX_ACCEL is not set | 1282 | # CONFIG_FB_3DFX_ACCEL is not set |
| 1236 | # CONFIG_FB_VOODOO1 is not set | 1283 | # CONFIG_FB_VOODOO1 is not set |
| 1237 | # CONFIG_FB_TRIDENT is not set | 1284 | # CONFIG_FB_TRIDENT is not set |
| 1285 | # CONFIG_FB_IBM_GXT4500 is not set | ||
| 1238 | # CONFIG_FB_VIRTUAL is not set | 1286 | # CONFIG_FB_VIRTUAL is not set |
| 1239 | 1287 | ||
| 1240 | # | 1288 | # |
| @@ -1393,6 +1441,11 @@ CONFIG_SND_USB_AUDIO=m | |||
| 1393 | # CONFIG_SOUND_PRIME is not set | 1441 | # CONFIG_SOUND_PRIME is not set |
| 1394 | 1442 | ||
| 1395 | # | 1443 | # |
| 1444 | # HID Devices | ||
| 1445 | # | ||
| 1446 | CONFIG_HID=y | ||
| 1447 | |||
| 1448 | # | ||
| 1396 | # USB support | 1449 | # USB support |
| 1397 | # | 1450 | # |
| 1398 | CONFIG_USB_ARCH_HAS_HCD=y | 1451 | CONFIG_USB_ARCH_HAS_HCD=y |
| @@ -1408,6 +1461,7 @@ CONFIG_USB_DEVICEFS=y | |||
| 1408 | # CONFIG_USB_BANDWIDTH is not set | 1461 | # CONFIG_USB_BANDWIDTH is not set |
| 1409 | CONFIG_USB_DYNAMIC_MINORS=y | 1462 | CONFIG_USB_DYNAMIC_MINORS=y |
| 1410 | # CONFIG_USB_SUSPEND is not set | 1463 | # CONFIG_USB_SUSPEND is not set |
| 1464 | # CONFIG_USB_MULTITHREAD_PROBE is not set | ||
| 1411 | # CONFIG_USB_OTG is not set | 1465 | # CONFIG_USB_OTG is not set |
| 1412 | 1466 | ||
| 1413 | # | 1467 | # |
| @@ -1448,13 +1502,13 @@ CONFIG_USB_STORAGE=m | |||
| 1448 | # CONFIG_USB_STORAGE_SDDR55 is not set | 1502 | # CONFIG_USB_STORAGE_SDDR55 is not set |
| 1449 | # CONFIG_USB_STORAGE_JUMPSHOT is not set | 1503 | # CONFIG_USB_STORAGE_JUMPSHOT is not set |
| 1450 | # CONFIG_USB_STORAGE_ALAUDA is not set | 1504 | # CONFIG_USB_STORAGE_ALAUDA is not set |
| 1505 | # CONFIG_USB_STORAGE_KARMA is not set | ||
| 1451 | # CONFIG_USB_LIBUSUAL is not set | 1506 | # CONFIG_USB_LIBUSUAL is not set |
| 1452 | 1507 | ||
| 1453 | # | 1508 | # |
| 1454 | # USB Input Devices | 1509 | # USB Input Devices |
| 1455 | # | 1510 | # |
| 1456 | CONFIG_USB_HID=y | 1511 | CONFIG_USB_HID=y |
| 1457 | CONFIG_USB_HIDINPUT=y | ||
| 1458 | CONFIG_USB_HIDINPUT_POWERBOOK=y | 1512 | CONFIG_USB_HIDINPUT_POWERBOOK=y |
| 1459 | # CONFIG_HID_FF is not set | 1513 | # CONFIG_HID_FF is not set |
| 1460 | # CONFIG_USB_HIDDEV is not set | 1514 | # CONFIG_USB_HIDDEV is not set |
| @@ -1484,12 +1538,14 @@ CONFIG_USB_APPLETOUCH=y | |||
| 1484 | # CONFIG_USB_KAWETH is not set | 1538 | # CONFIG_USB_KAWETH is not set |
| 1485 | # CONFIG_USB_PEGASUS is not set | 1539 | # CONFIG_USB_PEGASUS is not set |
| 1486 | # CONFIG_USB_RTL8150 is not set | 1540 | # CONFIG_USB_RTL8150 is not set |
| 1541 | CONFIG_USB_USBNET_MII=m | ||
| 1487 | CONFIG_USB_USBNET=m | 1542 | CONFIG_USB_USBNET=m |
| 1488 | CONFIG_USB_NET_AX8817X=m | 1543 | CONFIG_USB_NET_AX8817X=m |
| 1489 | CONFIG_USB_NET_CDCETHER=m | 1544 | CONFIG_USB_NET_CDCETHER=m |
| 1490 | # CONFIG_USB_NET_GL620A is not set | 1545 | # CONFIG_USB_NET_GL620A is not set |
| 1491 | CONFIG_USB_NET_NET1080=m | 1546 | CONFIG_USB_NET_NET1080=m |
| 1492 | # CONFIG_USB_NET_PLUSB is not set | 1547 | # CONFIG_USB_NET_PLUSB is not set |
| 1548 | # CONFIG_USB_NET_MCS7830 is not set | ||
| 1493 | # CONFIG_USB_NET_RNDIS_HOST is not set | 1549 | # CONFIG_USB_NET_RNDIS_HOST is not set |
| 1494 | # CONFIG_USB_NET_CDC_SUBSET is not set | 1550 | # CONFIG_USB_NET_CDC_SUBSET is not set |
| 1495 | CONFIG_USB_NET_ZAURUS=m | 1551 | CONFIG_USB_NET_ZAURUS=m |
| @@ -1504,6 +1560,7 @@ CONFIG_USB_MON=y | |||
| 1504 | # | 1560 | # |
| 1505 | CONFIG_USB_SERIAL=m | 1561 | CONFIG_USB_SERIAL=m |
| 1506 | # CONFIG_USB_SERIAL_GENERIC is not set | 1562 | # CONFIG_USB_SERIAL_GENERIC is not set |
| 1563 | # CONFIG_USB_SERIAL_AIRCABLE is not set | ||
| 1507 | # CONFIG_USB_SERIAL_AIRPRIME is not set | 1564 | # CONFIG_USB_SERIAL_AIRPRIME is not set |
| 1508 | # CONFIG_USB_SERIAL_ARK3116 is not set | 1565 | # CONFIG_USB_SERIAL_ARK3116 is not set |
| 1509 | # CONFIG_USB_SERIAL_BELKIN is not set | 1566 | # CONFIG_USB_SERIAL_BELKIN is not set |
| @@ -1538,6 +1595,8 @@ CONFIG_USB_SERIAL_KEYSPAN_USA49WLC=y | |||
| 1538 | # CONFIG_USB_SERIAL_KLSI is not set | 1595 | # CONFIG_USB_SERIAL_KLSI is not set |
| 1539 | # CONFIG_USB_SERIAL_KOBIL_SCT is not set | 1596 | # CONFIG_USB_SERIAL_KOBIL_SCT is not set |
| 1540 | # CONFIG_USB_SERIAL_MCT_U232 is not set | 1597 | # CONFIG_USB_SERIAL_MCT_U232 is not set |
| 1598 | # CONFIG_USB_SERIAL_MOS7720 is not set | ||
| 1599 | # CONFIG_USB_SERIAL_MOS7840 is not set | ||
| 1541 | # CONFIG_USB_SERIAL_NAVMAN is not set | 1600 | # CONFIG_USB_SERIAL_NAVMAN is not set |
| 1542 | # CONFIG_USB_SERIAL_PL2303 is not set | 1601 | # CONFIG_USB_SERIAL_PL2303 is not set |
| 1543 | # CONFIG_USB_SERIAL_HP4X is not set | 1602 | # CONFIG_USB_SERIAL_HP4X is not set |
| @@ -1548,6 +1607,7 @@ CONFIG_USB_SERIAL_KEYSPAN_USA49WLC=y | |||
| 1548 | # CONFIG_USB_SERIAL_XIRCOM is not set | 1607 | # CONFIG_USB_SERIAL_XIRCOM is not set |
| 1549 | # CONFIG_USB_SERIAL_OPTION is not set | 1608 | # CONFIG_USB_SERIAL_OPTION is not set |
| 1550 | # CONFIG_USB_SERIAL_OMNINET is not set | 1609 | # CONFIG_USB_SERIAL_OMNINET is not set |
| 1610 | # CONFIG_USB_SERIAL_DEBUG is not set | ||
| 1551 | CONFIG_USB_EZUSB=y | 1611 | CONFIG_USB_EZUSB=y |
| 1552 | 1612 | ||
| 1553 | # | 1613 | # |
| @@ -1555,6 +1615,7 @@ CONFIG_USB_EZUSB=y | |||
| 1555 | # | 1615 | # |
| 1556 | # CONFIG_USB_EMI62 is not set | 1616 | # CONFIG_USB_EMI62 is not set |
| 1557 | # CONFIG_USB_EMI26 is not set | 1617 | # CONFIG_USB_EMI26 is not set |
| 1618 | # CONFIG_USB_ADUTUX is not set | ||
| 1558 | # CONFIG_USB_AUERSWALD is not set | 1619 | # CONFIG_USB_AUERSWALD is not set |
| 1559 | # CONFIG_USB_RIO500 is not set | 1620 | # CONFIG_USB_RIO500 is not set |
| 1560 | # CONFIG_USB_LEGOTOWER is not set | 1621 | # CONFIG_USB_LEGOTOWER is not set |
| @@ -1562,12 +1623,13 @@ CONFIG_USB_EZUSB=y | |||
| 1562 | # CONFIG_USB_LED is not set | 1623 | # CONFIG_USB_LED is not set |
| 1563 | # CONFIG_USB_CYPRESS_CY7C63 is not set | 1624 | # CONFIG_USB_CYPRESS_CY7C63 is not set |
| 1564 | # CONFIG_USB_CYTHERM is not set | 1625 | # CONFIG_USB_CYTHERM is not set |
| 1565 | # CONFIG_USB_PHIDGETKIT is not set | 1626 | # CONFIG_USB_PHIDGET is not set |
| 1566 | # CONFIG_USB_PHIDGETSERVO is not set | ||
| 1567 | # CONFIG_USB_IDMOUSE is not set | 1627 | # CONFIG_USB_IDMOUSE is not set |
| 1628 | # CONFIG_USB_FTDI_ELAN is not set | ||
| 1568 | CONFIG_USB_APPLEDISPLAY=m | 1629 | CONFIG_USB_APPLEDISPLAY=m |
| 1569 | # CONFIG_USB_SISUSBVGA is not set | 1630 | # CONFIG_USB_SISUSBVGA is not set |
| 1570 | # CONFIG_USB_LD is not set | 1631 | # CONFIG_USB_LD is not set |
| 1632 | # CONFIG_USB_TRANCEVIBRATOR is not set | ||
| 1571 | # CONFIG_USB_TEST is not set | 1633 | # CONFIG_USB_TEST is not set |
| 1572 | 1634 | ||
| 1573 | # | 1635 | # |
| @@ -1630,6 +1692,10 @@ CONFIG_LEDS_TRIGGER_IDE_DISK=y | |||
| 1630 | # | 1692 | # |
| 1631 | 1693 | ||
| 1632 | # | 1694 | # |
| 1695 | # Virtualization | ||
| 1696 | # | ||
| 1697 | |||
| 1698 | # | ||
| 1633 | # File systems | 1699 | # File systems |
| 1634 | # | 1700 | # |
| 1635 | CONFIG_EXT2_FS=y | 1701 | CONFIG_EXT2_FS=y |
| @@ -1639,6 +1705,7 @@ CONFIG_EXT3_FS=y | |||
| 1639 | CONFIG_EXT3_FS_XATTR=y | 1705 | CONFIG_EXT3_FS_XATTR=y |
| 1640 | CONFIG_EXT3_FS_POSIX_ACL=y | 1706 | CONFIG_EXT3_FS_POSIX_ACL=y |
| 1641 | # CONFIG_EXT3_FS_SECURITY is not set | 1707 | # CONFIG_EXT3_FS_SECURITY is not set |
| 1708 | # CONFIG_EXT4DEV_FS is not set | ||
| 1642 | CONFIG_JBD=y | 1709 | CONFIG_JBD=y |
| 1643 | # CONFIG_JBD_DEBUG is not set | 1710 | # CONFIG_JBD_DEBUG is not set |
| 1644 | CONFIG_FS_MBCACHE=y | 1711 | CONFIG_FS_MBCACHE=y |
| @@ -1646,6 +1713,7 @@ CONFIG_FS_MBCACHE=y | |||
| 1646 | # CONFIG_JFS_FS is not set | 1713 | # CONFIG_JFS_FS is not set |
| 1647 | CONFIG_FS_POSIX_ACL=y | 1714 | CONFIG_FS_POSIX_ACL=y |
| 1648 | # CONFIG_XFS_FS is not set | 1715 | # CONFIG_XFS_FS is not set |
| 1716 | # CONFIG_GFS2_FS is not set | ||
| 1649 | # CONFIG_OCFS2_FS is not set | 1717 | # CONFIG_OCFS2_FS is not set |
| 1650 | # CONFIG_MINIX_FS is not set | 1718 | # CONFIG_MINIX_FS is not set |
| 1651 | # CONFIG_ROMFS_FS is not set | 1719 | # CONFIG_ROMFS_FS is not set |
| @@ -1682,8 +1750,10 @@ CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" | |||
| 1682 | # | 1750 | # |
| 1683 | CONFIG_PROC_FS=y | 1751 | CONFIG_PROC_FS=y |
| 1684 | CONFIG_PROC_KCORE=y | 1752 | CONFIG_PROC_KCORE=y |
| 1753 | CONFIG_PROC_SYSCTL=y | ||
| 1685 | CONFIG_SYSFS=y | 1754 | CONFIG_SYSFS=y |
| 1686 | CONFIG_TMPFS=y | 1755 | CONFIG_TMPFS=y |
| 1756 | # CONFIG_TMPFS_POSIX_ACL is not set | ||
| 1687 | # CONFIG_HUGETLB_PAGE is not set | 1757 | # CONFIG_HUGETLB_PAGE is not set |
| 1688 | CONFIG_RAMFS=y | 1758 | CONFIG_RAMFS=y |
| 1689 | # CONFIG_CONFIGFS_FS is not set | 1759 | # CONFIG_CONFIGFS_FS is not set |
| @@ -1802,8 +1872,14 @@ CONFIG_NLS_ISO8859_1=m | |||
| 1802 | CONFIG_NLS_UTF8=m | 1872 | CONFIG_NLS_UTF8=m |
| 1803 | 1873 | ||
| 1804 | # | 1874 | # |
| 1875 | # Distributed Lock Manager | ||
| 1876 | # | ||
| 1877 | # CONFIG_DLM is not set | ||
| 1878 | |||
| 1879 | # | ||
| 1805 | # Library routines | 1880 | # Library routines |
| 1806 | # | 1881 | # |
| 1882 | CONFIG_BITREVERSE=y | ||
| 1807 | CONFIG_CRC_CCITT=y | 1883 | CONFIG_CRC_CCITT=y |
| 1808 | CONFIG_CRC16=y | 1884 | CONFIG_CRC16=y |
| 1809 | CONFIG_CRC32=y | 1885 | CONFIG_CRC32=y |
| @@ -1815,6 +1891,7 @@ CONFIG_TEXTSEARCH_KMP=m | |||
| 1815 | CONFIG_TEXTSEARCH_BM=m | 1891 | CONFIG_TEXTSEARCH_BM=m |
| 1816 | CONFIG_TEXTSEARCH_FSM=m | 1892 | CONFIG_TEXTSEARCH_FSM=m |
| 1817 | CONFIG_PLIST=y | 1893 | CONFIG_PLIST=y |
| 1894 | CONFIG_IOMAP_COPY=y | ||
| 1818 | 1895 | ||
| 1819 | # | 1896 | # |
| 1820 | # Instrumentation Support | 1897 | # Instrumentation Support |
| @@ -1826,8 +1903,11 @@ CONFIG_OPROFILE=y | |||
| 1826 | # Kernel hacking | 1903 | # Kernel hacking |
| 1827 | # | 1904 | # |
| 1828 | # CONFIG_PRINTK_TIME is not set | 1905 | # CONFIG_PRINTK_TIME is not set |
| 1906 | CONFIG_ENABLE_MUST_CHECK=y | ||
| 1829 | CONFIG_MAGIC_SYSRQ=y | 1907 | CONFIG_MAGIC_SYSRQ=y |
| 1830 | # CONFIG_UNUSED_SYMBOLS is not set | 1908 | # CONFIG_UNUSED_SYMBOLS is not set |
| 1909 | # CONFIG_DEBUG_FS is not set | ||
| 1910 | # CONFIG_HEADERS_CHECK is not set | ||
| 1831 | CONFIG_DEBUG_KERNEL=y | 1911 | CONFIG_DEBUG_KERNEL=y |
| 1832 | CONFIG_LOG_BUF_SHIFT=14 | 1912 | CONFIG_LOG_BUF_SHIFT=14 |
| 1833 | CONFIG_DETECT_SOFTLOCKUP=y | 1913 | CONFIG_DETECT_SOFTLOCKUP=y |
| @@ -1841,14 +1921,16 @@ CONFIG_DETECT_SOFTLOCKUP=y | |||
| 1841 | # CONFIG_DEBUG_SPINLOCK_SLEEP is not set | 1921 | # CONFIG_DEBUG_SPINLOCK_SLEEP is not set |
| 1842 | # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set | 1922 | # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set |
| 1843 | # CONFIG_DEBUG_KOBJECT is not set | 1923 | # CONFIG_DEBUG_KOBJECT is not set |
| 1924 | CONFIG_DEBUG_BUGVERBOSE=y | ||
| 1844 | # CONFIG_DEBUG_INFO is not set | 1925 | # CONFIG_DEBUG_INFO is not set |
| 1845 | # CONFIG_DEBUG_FS is not set | ||
| 1846 | # CONFIG_DEBUG_VM is not set | 1926 | # CONFIG_DEBUG_VM is not set |
| 1927 | # CONFIG_DEBUG_LIST is not set | ||
| 1847 | # CONFIG_FORCED_INLINING is not set | 1928 | # CONFIG_FORCED_INLINING is not set |
| 1848 | # CONFIG_RCU_TORTURE_TEST is not set | 1929 | # CONFIG_RCU_TORTURE_TEST is not set |
| 1849 | CONFIG_DEBUGGER=y | 1930 | CONFIG_DEBUGGER=y |
| 1850 | CONFIG_XMON=y | 1931 | CONFIG_XMON=y |
| 1851 | CONFIG_XMON_DEFAULT=y | 1932 | CONFIG_XMON_DEFAULT=y |
| 1933 | CONFIG_XMON_DISASSEMBLY=y | ||
| 1852 | # CONFIG_BDI_SWITCH is not set | 1934 | # CONFIG_BDI_SWITCH is not set |
| 1853 | CONFIG_BOOTX_TEXT=y | 1935 | CONFIG_BOOTX_TEXT=y |
| 1854 | # CONFIG_PPC_EARLY_DEBUG is not set | 1936 | # CONFIG_PPC_EARLY_DEBUG is not set |
| @@ -1863,7 +1945,12 @@ CONFIG_BOOTX_TEXT=y | |||
| 1863 | # Cryptographic options | 1945 | # Cryptographic options |
| 1864 | # | 1946 | # |
| 1865 | CONFIG_CRYPTO=y | 1947 | CONFIG_CRYPTO=y |
| 1948 | CONFIG_CRYPTO_ALGAPI=y | ||
| 1949 | CONFIG_CRYPTO_BLKCIPHER=y | ||
| 1950 | CONFIG_CRYPTO_HASH=y | ||
| 1951 | CONFIG_CRYPTO_MANAGER=y | ||
| 1866 | CONFIG_CRYPTO_HMAC=y | 1952 | CONFIG_CRYPTO_HMAC=y |
| 1953 | # CONFIG_CRYPTO_XCBC is not set | ||
| 1867 | CONFIG_CRYPTO_NULL=m | 1954 | CONFIG_CRYPTO_NULL=m |
| 1868 | CONFIG_CRYPTO_MD4=m | 1955 | CONFIG_CRYPTO_MD4=m |
| 1869 | CONFIG_CRYPTO_MD5=y | 1956 | CONFIG_CRYPTO_MD5=y |
| @@ -1872,9 +1959,14 @@ CONFIG_CRYPTO_SHA256=m | |||
| 1872 | CONFIG_CRYPTO_SHA512=m | 1959 | CONFIG_CRYPTO_SHA512=m |
| 1873 | CONFIG_CRYPTO_WP512=m | 1960 | CONFIG_CRYPTO_WP512=m |
| 1874 | CONFIG_CRYPTO_TGR192=m | 1961 | CONFIG_CRYPTO_TGR192=m |
| 1962 | # CONFIG_CRYPTO_GF128MUL is not set | ||
| 1963 | CONFIG_CRYPTO_ECB=m | ||
| 1964 | CONFIG_CRYPTO_CBC=y | ||
| 1965 | # CONFIG_CRYPTO_LRW is not set | ||
| 1875 | CONFIG_CRYPTO_DES=y | 1966 | CONFIG_CRYPTO_DES=y |
| 1876 | CONFIG_CRYPTO_BLOWFISH=m | 1967 | CONFIG_CRYPTO_BLOWFISH=m |
| 1877 | CONFIG_CRYPTO_TWOFISH=m | 1968 | CONFIG_CRYPTO_TWOFISH=m |
| 1969 | CONFIG_CRYPTO_TWOFISH_COMMON=m | ||
| 1878 | CONFIG_CRYPTO_SERPENT=m | 1970 | CONFIG_CRYPTO_SERPENT=m |
| 1879 | CONFIG_CRYPTO_AES=m | 1971 | CONFIG_CRYPTO_AES=m |
| 1880 | CONFIG_CRYPTO_CAST5=m | 1972 | CONFIG_CRYPTO_CAST5=m |
diff --git a/arch/powerpc/configs/ppc64_defconfig b/arch/powerpc/configs/ppc64_defconfig index 340376a47001..debac66e8258 100644 --- a/arch/powerpc/configs/ppc64_defconfig +++ b/arch/powerpc/configs/ppc64_defconfig | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.20-rc3 | 3 | # Linux kernel version: 2.6.20-rc5 |
| 4 | # Tue Jan 2 15:32:44 2007 | 4 | # Mon Jan 22 22:28:58 2007 |
| 5 | # | 5 | # |
| 6 | CONFIG_PPC64=y | 6 | CONFIG_PPC64=y |
| 7 | CONFIG_64BIT=y | 7 | CONFIG_64BIT=y |
| @@ -246,7 +246,6 @@ CONFIG_PPC_I8259=y | |||
| 246 | CONFIG_PCI=y | 246 | CONFIG_PCI=y |
| 247 | CONFIG_PCI_DOMAINS=y | 247 | CONFIG_PCI_DOMAINS=y |
| 248 | # CONFIG_PCIEPORTBUS is not set | 248 | # CONFIG_PCIEPORTBUS is not set |
| 249 | # CONFIG_PCI_MULTITHREAD_PROBE is not set | ||
| 250 | # CONFIG_PCI_DEBUG is not set | 249 | # CONFIG_PCI_DEBUG is not set |
| 251 | 250 | ||
| 252 | # | 251 | # |
diff --git a/arch/powerpc/configs/ps3_defconfig b/arch/powerpc/configs/ps3_defconfig index 70ed61337f5c..32560876c3dc 100644 --- a/arch/powerpc/configs/ps3_defconfig +++ b/arch/powerpc/configs/ps3_defconfig | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.19-rc6 | 3 | # Linux kernel version: 2.6.20-rc5 |
| 4 | # Tue Nov 21 19:38:53 2006 | 4 | # Mon Jan 22 22:29:11 2007 |
| 5 | # | 5 | # |
| 6 | CONFIG_PPC64=y | 6 | CONFIG_PPC64=y |
| 7 | CONFIG_64BIT=y | 7 | CONFIG_64BIT=y |
| @@ -10,6 +10,8 @@ CONFIG_MMU=y | |||
| 10 | CONFIG_GENERIC_HARDIRQS=y | 10 | CONFIG_GENERIC_HARDIRQS=y |
| 11 | CONFIG_IRQ_PER_CPU=y | 11 | CONFIG_IRQ_PER_CPU=y |
| 12 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 12 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
| 13 | CONFIG_ARCH_HAS_ILOG2_U32=y | ||
| 14 | CONFIG_ARCH_HAS_ILOG2_U64=y | ||
| 13 | CONFIG_GENERIC_HWEIGHT=y | 15 | CONFIG_GENERIC_HWEIGHT=y |
| 14 | CONFIG_GENERIC_CALIBRATE_DELAY=y | 16 | CONFIG_GENERIC_CALIBRATE_DELAY=y |
| 15 | CONFIG_GENERIC_FIND_NEXT_BIT=y | 17 | CONFIG_GENERIC_FIND_NEXT_BIT=y |
| @@ -23,6 +25,7 @@ CONFIG_PPC_OF=y | |||
| 23 | # CONFIG_PPC_UDBG_16550 is not set | 25 | # CONFIG_PPC_UDBG_16550 is not set |
| 24 | # CONFIG_GENERIC_TBSYNC is not set | 26 | # CONFIG_GENERIC_TBSYNC is not set |
| 25 | CONFIG_AUDIT_ARCH=y | 27 | CONFIG_AUDIT_ARCH=y |
| 28 | CONFIG_GENERIC_BUG=y | ||
| 26 | # CONFIG_DEFAULT_UIMAGE is not set | 29 | # CONFIG_DEFAULT_UIMAGE is not set |
| 27 | 30 | ||
| 28 | # | 31 | # |
| @@ -64,6 +67,7 @@ CONFIG_SYSVIPC=y | |||
| 64 | # CONFIG_AUDIT is not set | 67 | # CONFIG_AUDIT is not set |
| 65 | # CONFIG_IKCONFIG is not set | 68 | # CONFIG_IKCONFIG is not set |
| 66 | # CONFIG_CPUSETS is not set | 69 | # CONFIG_CPUSETS is not set |
| 70 | CONFIG_SYSFS_DEPRECATED=y | ||
| 67 | # CONFIG_RELAY is not set | 71 | # CONFIG_RELAY is not set |
| 68 | CONFIG_INITRAMFS_SOURCE="" | 72 | CONFIG_INITRAMFS_SOURCE="" |
| 69 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | 73 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set |
| @@ -126,6 +130,7 @@ CONFIG_PPC_MULTIPLATFORM=y | |||
| 126 | # CONFIG_APUS is not set | 130 | # CONFIG_APUS is not set |
| 127 | # CONFIG_PPC_PSERIES is not set | 131 | # CONFIG_PPC_PSERIES is not set |
| 128 | # CONFIG_PPC_ISERIES is not set | 132 | # CONFIG_PPC_ISERIES is not set |
| 133 | # CONFIG_PPC_MPC52xx is not set | ||
| 129 | # CONFIG_PPC_PMAC is not set | 134 | # CONFIG_PPC_PMAC is not set |
| 130 | # CONFIG_PPC_MAPLE is not set | 135 | # CONFIG_PPC_MAPLE is not set |
| 131 | # CONFIG_PPC_PASEMI is not set | 136 | # CONFIG_PPC_PASEMI is not set |
| @@ -164,6 +169,7 @@ CONFIG_PS3_VUART=y | |||
| 164 | # | 169 | # |
| 165 | # CONFIG_HZ_100 is not set | 170 | # CONFIG_HZ_100 is not set |
| 166 | CONFIG_HZ_250=y | 171 | CONFIG_HZ_250=y |
| 172 | # CONFIG_HZ_300 is not set | ||
| 167 | # CONFIG_HZ_1000 is not set | 173 | # CONFIG_HZ_1000 is not set |
| 168 | CONFIG_HZ=250 | 174 | CONFIG_HZ=250 |
| 169 | CONFIG_PREEMPT_NONE=y | 175 | CONFIG_PREEMPT_NONE=y |
| @@ -261,6 +267,7 @@ CONFIG_IP_PNP_DHCP=y | |||
| 261 | # CONFIG_TCP_CONG_ADVANCED is not set | 267 | # CONFIG_TCP_CONG_ADVANCED is not set |
| 262 | CONFIG_TCP_CONG_CUBIC=y | 268 | CONFIG_TCP_CONG_CUBIC=y |
| 263 | CONFIG_DEFAULT_TCP_CONG="cubic" | 269 | CONFIG_DEFAULT_TCP_CONG="cubic" |
| 270 | # CONFIG_TCP_MD5SIG is not set | ||
| 264 | # CONFIG_IPV6 is not set | 271 | # CONFIG_IPV6 is not set |
| 265 | # CONFIG_INET6_XFRM_TUNNEL is not set | 272 | # CONFIG_INET6_XFRM_TUNNEL is not set |
| 266 | # CONFIG_INET6_TUNNEL is not set | 273 | # CONFIG_INET6_TUNNEL is not set |
| @@ -366,6 +373,7 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y | |||
| 366 | # | 373 | # |
| 367 | # CONFIG_RAID_ATTRS is not set | 374 | # CONFIG_RAID_ATTRS is not set |
| 368 | CONFIG_SCSI=y | 375 | CONFIG_SCSI=y |
| 376 | # CONFIG_SCSI_TGT is not set | ||
| 369 | # CONFIG_SCSI_NETLINK is not set | 377 | # CONFIG_SCSI_NETLINK is not set |
| 370 | CONFIG_SCSI_PROC_FS=y | 378 | CONFIG_SCSI_PROC_FS=y |
| 371 | 379 | ||
| @@ -385,6 +393,7 @@ CONFIG_SCSI_PROC_FS=y | |||
| 385 | # CONFIG_SCSI_MULTI_LUN is not set | 393 | # CONFIG_SCSI_MULTI_LUN is not set |
| 386 | # CONFIG_SCSI_CONSTANTS is not set | 394 | # CONFIG_SCSI_CONSTANTS is not set |
| 387 | # CONFIG_SCSI_LOGGING is not set | 395 | # CONFIG_SCSI_LOGGING is not set |
| 396 | # CONFIG_SCSI_SCAN_ASYNC is not set | ||
| 388 | 397 | ||
| 389 | # | 398 | # |
| 390 | # SCSI Transports | 399 | # SCSI Transports |
| @@ -427,6 +436,7 @@ CONFIG_SCSI_PROC_FS=y | |||
| 427 | # | 436 | # |
| 428 | # Macintosh device drivers | 437 | # Macintosh device drivers |
| 429 | # | 438 | # |
| 439 | # CONFIG_MAC_EMUMOUSEBTN is not set | ||
| 430 | # CONFIG_WINDFARM is not set | 440 | # CONFIG_WINDFARM is not set |
| 431 | 441 | ||
| 432 | # | 442 | # |
| @@ -549,10 +559,6 @@ CONFIG_GEN_RTC=y | |||
| 549 | # CONFIG_GEN_RTC_X is not set | 559 | # CONFIG_GEN_RTC_X is not set |
| 550 | # CONFIG_DTLK is not set | 560 | # CONFIG_DTLK is not set |
| 551 | # CONFIG_R3964 is not set | 561 | # CONFIG_R3964 is not set |
| 552 | |||
| 553 | # | ||
| 554 | # Ftape, the floppy tape device driver | ||
| 555 | # | ||
| 556 | # CONFIG_RAW_DRIVER is not set | 562 | # CONFIG_RAW_DRIVER is not set |
| 557 | # CONFIG_HANGCHECK_TIMER is not set | 563 | # CONFIG_HANGCHECK_TIMER is not set |
| 558 | 564 | ||
| @@ -598,6 +604,7 @@ CONFIG_GEN_RTC=y | |||
| 598 | # | 604 | # |
| 599 | # CONFIG_FIRMWARE_EDID is not set | 605 | # CONFIG_FIRMWARE_EDID is not set |
| 600 | # CONFIG_FB is not set | 606 | # CONFIG_FB is not set |
| 607 | # CONFIG_FB_IBM_GXT4500 is not set | ||
| 601 | 608 | ||
| 602 | # | 609 | # |
| 603 | # Console display driver support | 610 | # Console display driver support |
| @@ -612,6 +619,11 @@ CONFIG_DUMMY_CONSOLE=y | |||
| 612 | # CONFIG_SOUND is not set | 619 | # CONFIG_SOUND is not set |
| 613 | 620 | ||
| 614 | # | 621 | # |
| 622 | # HID Devices | ||
| 623 | # | ||
| 624 | CONFIG_HID=y | ||
| 625 | |||
| 626 | # | ||
| 615 | # USB support | 627 | # USB support |
| 616 | # | 628 | # |
| 617 | # CONFIG_USB_ARCH_HAS_HCD is not set | 629 | # CONFIG_USB_ARCH_HAS_HCD is not set |
| @@ -672,6 +684,10 @@ CONFIG_DUMMY_CONSOLE=y | |||
| 672 | # | 684 | # |
| 673 | 685 | ||
| 674 | # | 686 | # |
| 687 | # Virtualization | ||
| 688 | # | ||
| 689 | |||
| 690 | # | ||
| 675 | # File systems | 691 | # File systems |
| 676 | # | 692 | # |
| 677 | # CONFIG_EXT2_FS is not set | 693 | # CONFIG_EXT2_FS is not set |
| @@ -772,6 +788,11 @@ CONFIG_MSDOS_PARTITION=y | |||
| 772 | # CONFIG_NLS is not set | 788 | # CONFIG_NLS is not set |
| 773 | 789 | ||
| 774 | # | 790 | # |
| 791 | # Distributed Lock Manager | ||
| 792 | # | ||
| 793 | # CONFIG_DLM is not set | ||
| 794 | |||
| 795 | # | ||
| 775 | # Library routines | 796 | # Library routines |
| 776 | # | 797 | # |
| 777 | # CONFIG_CRC_CCITT is not set | 798 | # CONFIG_CRC_CCITT is not set |
| @@ -779,6 +800,7 @@ CONFIG_MSDOS_PARTITION=y | |||
| 779 | # CONFIG_CRC32 is not set | 800 | # CONFIG_CRC32 is not set |
| 780 | # CONFIG_LIBCRC32C is not set | 801 | # CONFIG_LIBCRC32C is not set |
| 781 | CONFIG_PLIST=y | 802 | CONFIG_PLIST=y |
| 803 | CONFIG_IOMAP_COPY=y | ||
| 782 | 804 | ||
| 783 | # | 805 | # |
| 784 | # Instrumentation Support | 806 | # Instrumentation Support |
| @@ -793,6 +815,8 @@ CONFIG_PLIST=y | |||
| 793 | CONFIG_ENABLE_MUST_CHECK=y | 815 | CONFIG_ENABLE_MUST_CHECK=y |
| 794 | # CONFIG_MAGIC_SYSRQ is not set | 816 | # CONFIG_MAGIC_SYSRQ is not set |
| 795 | # CONFIG_UNUSED_SYMBOLS is not set | 817 | # CONFIG_UNUSED_SYMBOLS is not set |
| 818 | # CONFIG_DEBUG_FS is not set | ||
| 819 | # CONFIG_HEADERS_CHECK is not set | ||
| 796 | CONFIG_DEBUG_KERNEL=y | 820 | CONFIG_DEBUG_KERNEL=y |
| 797 | CONFIG_LOG_BUF_SHIFT=17 | 821 | CONFIG_LOG_BUF_SHIFT=17 |
| 798 | CONFIG_DETECT_SOFTLOCKUP=y | 822 | CONFIG_DETECT_SOFTLOCKUP=y |
| @@ -806,12 +830,11 @@ CONFIG_DEBUG_SPINLOCK=y | |||
| 806 | CONFIG_DEBUG_SPINLOCK_SLEEP=y | 830 | CONFIG_DEBUG_SPINLOCK_SLEEP=y |
| 807 | # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set | 831 | # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set |
| 808 | # CONFIG_DEBUG_KOBJECT is not set | 832 | # CONFIG_DEBUG_KOBJECT is not set |
| 833 | # CONFIG_DEBUG_BUGVERBOSE is not set | ||
| 809 | CONFIG_DEBUG_INFO=y | 834 | CONFIG_DEBUG_INFO=y |
| 810 | # CONFIG_DEBUG_FS is not set | ||
| 811 | # CONFIG_DEBUG_VM is not set | 835 | # CONFIG_DEBUG_VM is not set |
| 812 | CONFIG_DEBUG_LIST=y | 836 | CONFIG_DEBUG_LIST=y |
| 813 | CONFIG_FORCED_INLINING=y | 837 | CONFIG_FORCED_INLINING=y |
| 814 | # CONFIG_HEADERS_CHECK is not set | ||
| 815 | # CONFIG_RCU_TORTURE_TEST is not set | 838 | # CONFIG_RCU_TORTURE_TEST is not set |
| 816 | # CONFIG_DEBUG_STACKOVERFLOW is not set | 839 | # CONFIG_DEBUG_STACKOVERFLOW is not set |
| 817 | # CONFIG_DEBUG_STACK_USAGE is not set | 840 | # CONFIG_DEBUG_STACK_USAGE is not set |
diff --git a/arch/powerpc/configs/pseries_defconfig b/arch/powerpc/configs/pseries_defconfig index d2833c1a1f3d..1c794fe718fd 100644 --- a/arch/powerpc/configs/pseries_defconfig +++ b/arch/powerpc/configs/pseries_defconfig | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.18-rc6 | 3 | # Linux kernel version: 2.6.20-rc5 |
| 4 | # Sun Sep 10 10:45:12 2006 | 4 | # Mon Jan 22 22:31:27 2007 |
| 5 | # | 5 | # |
| 6 | CONFIG_PPC64=y | 6 | CONFIG_PPC64=y |
| 7 | CONFIG_64BIT=y | 7 | CONFIG_64BIT=y |
| @@ -10,6 +10,8 @@ CONFIG_MMU=y | |||
| 10 | CONFIG_GENERIC_HARDIRQS=y | 10 | CONFIG_GENERIC_HARDIRQS=y |
| 11 | CONFIG_IRQ_PER_CPU=y | 11 | CONFIG_IRQ_PER_CPU=y |
| 12 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 12 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
| 13 | CONFIG_ARCH_HAS_ILOG2_U32=y | ||
| 14 | CONFIG_ARCH_HAS_ILOG2_U64=y | ||
| 13 | CONFIG_GENERIC_HWEIGHT=y | 15 | CONFIG_GENERIC_HWEIGHT=y |
| 14 | CONFIG_GENERIC_CALIBRATE_DELAY=y | 16 | CONFIG_GENERIC_CALIBRATE_DELAY=y |
| 15 | CONFIG_GENERIC_FIND_NEXT_BIT=y | 17 | CONFIG_GENERIC_FIND_NEXT_BIT=y |
| @@ -22,6 +24,8 @@ CONFIG_ARCH_MAY_HAVE_PC_FDC=y | |||
| 22 | CONFIG_PPC_OF=y | 24 | CONFIG_PPC_OF=y |
| 23 | CONFIG_PPC_UDBG_16550=y | 25 | CONFIG_PPC_UDBG_16550=y |
| 24 | # CONFIG_GENERIC_TBSYNC is not set | 26 | # CONFIG_GENERIC_TBSYNC is not set |
| 27 | CONFIG_AUDIT_ARCH=y | ||
| 28 | CONFIG_GENERIC_BUG=y | ||
| 25 | # CONFIG_DEFAULT_UIMAGE is not set | 29 | # CONFIG_DEFAULT_UIMAGE is not set |
| 26 | 30 | ||
| 27 | # | 31 | # |
| @@ -31,6 +35,9 @@ CONFIG_PPC_UDBG_16550=y | |||
| 31 | CONFIG_POWER3=y | 35 | CONFIG_POWER3=y |
| 32 | CONFIG_POWER4=y | 36 | CONFIG_POWER4=y |
| 33 | CONFIG_PPC_FPU=y | 37 | CONFIG_PPC_FPU=y |
| 38 | # CONFIG_PPC_DCR_NATIVE is not set | ||
| 39 | # CONFIG_PPC_DCR_MMIO is not set | ||
| 40 | # CONFIG_PPC_OF_PLATFORM_PCI is not set | ||
| 34 | CONFIG_ALTIVEC=y | 41 | CONFIG_ALTIVEC=y |
| 35 | CONFIG_PPC_STD_MMU=y | 42 | CONFIG_PPC_STD_MMU=y |
| 36 | CONFIG_VIRT_CPU_ACCOUNTING=y | 43 | CONFIG_VIRT_CPU_ACCOUNTING=y |
| @@ -52,19 +59,22 @@ CONFIG_LOCALVERSION="" | |||
| 52 | CONFIG_LOCALVERSION_AUTO=y | 59 | CONFIG_LOCALVERSION_AUTO=y |
| 53 | CONFIG_SWAP=y | 60 | CONFIG_SWAP=y |
| 54 | CONFIG_SYSVIPC=y | 61 | CONFIG_SYSVIPC=y |
| 62 | # CONFIG_IPC_NS is not set | ||
| 55 | CONFIG_POSIX_MQUEUE=y | 63 | CONFIG_POSIX_MQUEUE=y |
| 56 | # CONFIG_BSD_PROCESS_ACCT is not set | 64 | # CONFIG_BSD_PROCESS_ACCT is not set |
| 57 | # CONFIG_TASKSTATS is not set | 65 | # CONFIG_UTS_NS is not set |
| 58 | CONFIG_SYSCTL=y | ||
| 59 | CONFIG_AUDIT=y | 66 | CONFIG_AUDIT=y |
| 60 | CONFIG_AUDITSYSCALL=y | 67 | CONFIG_AUDITSYSCALL=y |
| 61 | CONFIG_IKCONFIG=y | 68 | CONFIG_IKCONFIG=y |
| 62 | CONFIG_IKCONFIG_PROC=y | 69 | CONFIG_IKCONFIG_PROC=y |
| 63 | CONFIG_CPUSETS=y | 70 | CONFIG_CPUSETS=y |
| 71 | CONFIG_SYSFS_DEPRECATED=y | ||
| 64 | # CONFIG_RELAY is not set | 72 | # CONFIG_RELAY is not set |
| 65 | CONFIG_INITRAMFS_SOURCE="" | 73 | CONFIG_INITRAMFS_SOURCE="" |
| 66 | CONFIG_CC_OPTIMIZE_FOR_SIZE=y | 74 | CONFIG_CC_OPTIMIZE_FOR_SIZE=y |
| 75 | CONFIG_SYSCTL=y | ||
| 67 | # CONFIG_EMBEDDED is not set | 76 | # CONFIG_EMBEDDED is not set |
| 77 | CONFIG_SYSCTL_SYSCALL=y | ||
| 68 | CONFIG_KALLSYMS=y | 78 | CONFIG_KALLSYMS=y |
| 69 | CONFIG_KALLSYMS_ALL=y | 79 | CONFIG_KALLSYMS_ALL=y |
| 70 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | 80 | # CONFIG_KALLSYMS_EXTRA_PASS is not set |
| @@ -73,12 +83,12 @@ CONFIG_PRINTK=y | |||
| 73 | CONFIG_BUG=y | 83 | CONFIG_BUG=y |
| 74 | CONFIG_ELF_CORE=y | 84 | CONFIG_ELF_CORE=y |
| 75 | CONFIG_BASE_FULL=y | 85 | CONFIG_BASE_FULL=y |
| 76 | CONFIG_RT_MUTEXES=y | ||
| 77 | CONFIG_FUTEX=y | 86 | CONFIG_FUTEX=y |
| 78 | CONFIG_EPOLL=y | 87 | CONFIG_EPOLL=y |
| 79 | CONFIG_SHMEM=y | 88 | CONFIG_SHMEM=y |
| 80 | CONFIG_SLAB=y | 89 | CONFIG_SLAB=y |
| 81 | CONFIG_VM_EVENT_COUNTERS=y | 90 | CONFIG_VM_EVENT_COUNTERS=y |
| 91 | CONFIG_RT_MUTEXES=y | ||
| 82 | # CONFIG_TINY_SHMEM is not set | 92 | # CONFIG_TINY_SHMEM is not set |
| 83 | CONFIG_BASE_SMALL=0 | 93 | CONFIG_BASE_SMALL=0 |
| 84 | # CONFIG_SLOB is not set | 94 | # CONFIG_SLOB is not set |
| @@ -97,6 +107,7 @@ CONFIG_STOP_MACHINE=y | |||
| 97 | # | 107 | # |
| 98 | # Block layer | 108 | # Block layer |
| 99 | # | 109 | # |
| 110 | CONFIG_BLOCK=y | ||
| 100 | # CONFIG_BLK_DEV_IO_TRACE is not set | 111 | # CONFIG_BLK_DEV_IO_TRACE is not set |
| 101 | 112 | ||
| 102 | # | 113 | # |
| @@ -116,15 +127,19 @@ CONFIG_DEFAULT_IOSCHED="anticipatory" | |||
| 116 | # Platform support | 127 | # Platform support |
| 117 | # | 128 | # |
| 118 | CONFIG_PPC_MULTIPLATFORM=y | 129 | CONFIG_PPC_MULTIPLATFORM=y |
| 119 | # CONFIG_PPC_ISERIES is not set | ||
| 120 | # CONFIG_EMBEDDED6xx is not set | 130 | # CONFIG_EMBEDDED6xx is not set |
| 121 | # CONFIG_APUS is not set | 131 | # CONFIG_APUS is not set |
| 122 | CONFIG_PPC_PSERIES=y | 132 | CONFIG_PPC_PSERIES=y |
| 133 | # CONFIG_PPC_ISERIES is not set | ||
| 134 | # CONFIG_PPC_MPC52xx is not set | ||
| 123 | # CONFIG_PPC_PMAC is not set | 135 | # CONFIG_PPC_PMAC is not set |
| 124 | # CONFIG_PPC_MAPLE is not set | 136 | # CONFIG_PPC_MAPLE is not set |
| 137 | # CONFIG_PPC_PASEMI is not set | ||
| 125 | # CONFIG_PPC_CELL is not set | 138 | # CONFIG_PPC_CELL is not set |
| 126 | # CONFIG_PPC_CELL_NATIVE is not set | 139 | # CONFIG_PPC_CELL_NATIVE is not set |
| 127 | # CONFIG_PPC_IBM_CELL_BLADE is not set | 140 | # CONFIG_PPC_IBM_CELL_BLADE is not set |
| 141 | # CONFIG_PPC_PS3 is not set | ||
| 142 | CONFIG_PPC_NATIVE=y | ||
| 128 | # CONFIG_UDBG_RTAS_CONSOLE is not set | 143 | # CONFIG_UDBG_RTAS_CONSOLE is not set |
| 129 | CONFIG_XICS=y | 144 | CONFIG_XICS=y |
| 130 | # CONFIG_U3_DART is not set | 145 | # CONFIG_U3_DART is not set |
| @@ -137,6 +152,8 @@ CONFIG_IBMVIO=y | |||
| 137 | CONFIG_IBMEBUS=y | 152 | CONFIG_IBMEBUS=y |
| 138 | # CONFIG_PPC_MPC106 is not set | 153 | # CONFIG_PPC_MPC106 is not set |
| 139 | # CONFIG_PPC_970_NAP is not set | 154 | # CONFIG_PPC_970_NAP is not set |
| 155 | # CONFIG_PPC_INDIRECT_IO is not set | ||
| 156 | # CONFIG_GENERIC_IOMAP is not set | ||
| 140 | # CONFIG_CPU_FREQ is not set | 157 | # CONFIG_CPU_FREQ is not set |
| 141 | # CONFIG_WANT_EARLY_SERIAL is not set | 158 | # CONFIG_WANT_EARLY_SERIAL is not set |
| 142 | CONFIG_MPIC=y | 159 | CONFIG_MPIC=y |
| @@ -146,6 +163,7 @@ CONFIG_MPIC=y | |||
| 146 | # | 163 | # |
| 147 | # CONFIG_HZ_100 is not set | 164 | # CONFIG_HZ_100 is not set |
| 148 | CONFIG_HZ_250=y | 165 | CONFIG_HZ_250=y |
| 166 | # CONFIG_HZ_300 is not set | ||
| 149 | # CONFIG_HZ_1000 is not set | 167 | # CONFIG_HZ_1000 is not set |
| 150 | CONFIG_HZ=250 | 168 | CONFIG_HZ=250 |
| 151 | CONFIG_PREEMPT_NONE=y | 169 | CONFIG_PREEMPT_NONE=y |
| @@ -170,6 +188,7 @@ CONFIG_NODES_SHIFT=4 | |||
| 170 | CONFIG_ARCH_SELECT_MEMORY_MODEL=y | 188 | CONFIG_ARCH_SELECT_MEMORY_MODEL=y |
| 171 | CONFIG_ARCH_SPARSEMEM_ENABLE=y | 189 | CONFIG_ARCH_SPARSEMEM_ENABLE=y |
| 172 | CONFIG_ARCH_SPARSEMEM_DEFAULT=y | 190 | CONFIG_ARCH_SPARSEMEM_DEFAULT=y |
| 191 | CONFIG_ARCH_POPULATES_NODE_MAP=y | ||
| 173 | CONFIG_SELECT_MEMORY_MODEL=y | 192 | CONFIG_SELECT_MEMORY_MODEL=y |
| 174 | # CONFIG_FLATMEM_MANUAL is not set | 193 | # CONFIG_FLATMEM_MANUAL is not set |
| 175 | # CONFIG_DISCONTIGMEM_MANUAL is not set | 194 | # CONFIG_DISCONTIGMEM_MANUAL is not set |
| @@ -183,7 +202,6 @@ CONFIG_SPARSEMEM_EXTREME=y | |||
| 183 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 202 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 184 | CONFIG_MIGRATION=y | 203 | CONFIG_MIGRATION=y |
| 185 | CONFIG_RESOURCES_64BIT=y | 204 | CONFIG_RESOURCES_64BIT=y |
| 186 | CONFIG_HAVE_ARCH_EARLY_PFN_TO_NID=y | ||
| 187 | CONFIG_NODES_SPAN_OTHER_NODES=y | 205 | CONFIG_NODES_SPAN_OTHER_NODES=y |
| 188 | # CONFIG_PPC_64K_PAGES is not set | 206 | # CONFIG_PPC_64K_PAGES is not set |
| 189 | CONFIG_SCHED_SMT=y | 207 | CONFIG_SCHED_SMT=y |
| @@ -235,6 +253,7 @@ CONFIG_PACKET=y | |||
| 235 | CONFIG_UNIX=y | 253 | CONFIG_UNIX=y |
| 236 | CONFIG_XFRM=y | 254 | CONFIG_XFRM=y |
| 237 | CONFIG_XFRM_USER=m | 255 | CONFIG_XFRM_USER=m |
| 256 | # CONFIG_XFRM_SUB_POLICY is not set | ||
| 238 | CONFIG_NET_KEY=m | 257 | CONFIG_NET_KEY=m |
| 239 | CONFIG_INET=y | 258 | CONFIG_INET=y |
| 240 | CONFIG_IP_MULTICAST=y | 259 | CONFIG_IP_MULTICAST=y |
| @@ -253,10 +272,13 @@ CONFIG_INET_XFRM_TUNNEL=m | |||
| 253 | CONFIG_INET_TUNNEL=y | 272 | CONFIG_INET_TUNNEL=y |
| 254 | CONFIG_INET_XFRM_MODE_TRANSPORT=y | 273 | CONFIG_INET_XFRM_MODE_TRANSPORT=y |
| 255 | CONFIG_INET_XFRM_MODE_TUNNEL=y | 274 | CONFIG_INET_XFRM_MODE_TUNNEL=y |
| 275 | CONFIG_INET_XFRM_MODE_BEET=y | ||
| 256 | CONFIG_INET_DIAG=y | 276 | CONFIG_INET_DIAG=y |
| 257 | CONFIG_INET_TCP_DIAG=y | 277 | CONFIG_INET_TCP_DIAG=y |
| 258 | # CONFIG_TCP_CONG_ADVANCED is not set | 278 | # CONFIG_TCP_CONG_ADVANCED is not set |
| 259 | CONFIG_TCP_CONG_BIC=y | 279 | CONFIG_TCP_CONG_CUBIC=y |
| 280 | CONFIG_DEFAULT_TCP_CONG="cubic" | ||
| 281 | # CONFIG_TCP_MD5SIG is not set | ||
| 260 | 282 | ||
| 261 | # | 283 | # |
| 262 | # IP: Virtual Server Configuration | 284 | # IP: Virtual Server Configuration |
| @@ -275,25 +297,30 @@ CONFIG_NETFILTER=y | |||
| 275 | CONFIG_NETFILTER_NETLINK=y | 297 | CONFIG_NETFILTER_NETLINK=y |
| 276 | CONFIG_NETFILTER_NETLINK_QUEUE=m | 298 | CONFIG_NETFILTER_NETLINK_QUEUE=m |
| 277 | CONFIG_NETFILTER_NETLINK_LOG=m | 299 | CONFIG_NETFILTER_NETLINK_LOG=m |
| 300 | CONFIG_NF_CONNTRACK_ENABLED=m | ||
| 301 | CONFIG_NF_CONNTRACK_SUPPORT=y | ||
| 302 | # CONFIG_IP_NF_CONNTRACK_SUPPORT is not set | ||
| 303 | CONFIG_NF_CONNTRACK=m | ||
| 304 | # CONFIG_NF_CT_ACCT is not set | ||
| 305 | CONFIG_NF_CONNTRACK_MARK=y | ||
| 306 | CONFIG_NF_CONNTRACK_EVENTS=y | ||
| 307 | # CONFIG_NF_CT_PROTO_SCTP is not set | ||
| 308 | # CONFIG_NF_CONNTRACK_AMANDA is not set | ||
| 309 | CONFIG_NF_CONNTRACK_FTP=m | ||
| 310 | # CONFIG_NF_CONNTRACK_H323 is not set | ||
| 311 | CONFIG_NF_CONNTRACK_IRC=m | ||
| 312 | # CONFIG_NF_CONNTRACK_NETBIOS_NS is not set | ||
| 313 | # CONFIG_NF_CONNTRACK_PPTP is not set | ||
| 314 | # CONFIG_NF_CONNTRACK_SIP is not set | ||
| 315 | CONFIG_NF_CONNTRACK_TFTP=m | ||
| 316 | CONFIG_NF_CT_NETLINK=m | ||
| 278 | # CONFIG_NETFILTER_XTABLES is not set | 317 | # CONFIG_NETFILTER_XTABLES is not set |
| 279 | 318 | ||
| 280 | # | 319 | # |
| 281 | # IP: Netfilter Configuration | 320 | # IP: Netfilter Configuration |
| 282 | # | 321 | # |
| 283 | CONFIG_IP_NF_CONNTRACK=m | 322 | CONFIG_NF_CONNTRACK_IPV4=m |
| 284 | CONFIG_IP_NF_CT_ACCT=y | 323 | CONFIG_NF_CONNTRACK_PROC_COMPAT=y |
| 285 | CONFIG_IP_NF_CONNTRACK_MARK=y | ||
| 286 | CONFIG_IP_NF_CONNTRACK_EVENTS=y | ||
| 287 | CONFIG_IP_NF_CONNTRACK_NETLINK=m | ||
| 288 | CONFIG_IP_NF_CT_PROTO_SCTP=m | ||
| 289 | CONFIG_IP_NF_FTP=m | ||
| 290 | CONFIG_IP_NF_IRC=m | ||
| 291 | # CONFIG_IP_NF_NETBIOS_NS is not set | ||
| 292 | CONFIG_IP_NF_TFTP=m | ||
| 293 | CONFIG_IP_NF_AMANDA=m | ||
| 294 | # CONFIG_IP_NF_PPTP is not set | ||
| 295 | # CONFIG_IP_NF_H323 is not set | ||
| 296 | # CONFIG_IP_NF_SIP is not set | ||
| 297 | CONFIG_IP_NF_QUEUE=m | 324 | CONFIG_IP_NF_QUEUE=m |
| 298 | 325 | ||
| 299 | # | 326 | # |
| @@ -320,7 +347,6 @@ CONFIG_LLC=y | |||
| 320 | # CONFIG_ATALK is not set | 347 | # CONFIG_ATALK is not set |
| 321 | # CONFIG_X25 is not set | 348 | # CONFIG_X25 is not set |
| 322 | # CONFIG_LAPB is not set | 349 | # CONFIG_LAPB is not set |
| 323 | # CONFIG_NET_DIVERT is not set | ||
| 324 | # CONFIG_ECONET is not set | 350 | # CONFIG_ECONET is not set |
| 325 | # CONFIG_WAN_ROUTER is not set | 351 | # CONFIG_WAN_ROUTER is not set |
| 326 | 352 | ||
| @@ -402,6 +428,12 @@ CONFIG_BLK_DEV_INITRD=y | |||
| 402 | # CONFIG_ATA_OVER_ETH is not set | 428 | # CONFIG_ATA_OVER_ETH is not set |
| 403 | 429 | ||
| 404 | # | 430 | # |
| 431 | # Misc devices | ||
| 432 | # | ||
| 433 | # CONFIG_SGI_IOC4 is not set | ||
| 434 | # CONFIG_TIFM_CORE is not set | ||
| 435 | |||
| 436 | # | ||
| 405 | # ATA/ATAPI/MFM/RLL support | 437 | # ATA/ATAPI/MFM/RLL support |
| 406 | # | 438 | # |
| 407 | CONFIG_IDE=y | 439 | CONFIG_IDE=y |
| @@ -428,7 +460,6 @@ CONFIG_IDEPCI_SHARE_IRQ=y | |||
| 428 | # CONFIG_BLK_DEV_OFFBOARD is not set | 460 | # CONFIG_BLK_DEV_OFFBOARD is not set |
| 429 | CONFIG_BLK_DEV_GENERIC=y | 461 | CONFIG_BLK_DEV_GENERIC=y |
| 430 | # CONFIG_BLK_DEV_OPTI621 is not set | 462 | # CONFIG_BLK_DEV_OPTI621 is not set |
| 431 | CONFIG_BLK_DEV_SL82C105=y | ||
| 432 | CONFIG_BLK_DEV_IDEDMA_PCI=y | 463 | CONFIG_BLK_DEV_IDEDMA_PCI=y |
| 433 | # CONFIG_BLK_DEV_IDEDMA_FORCED is not set | 464 | # CONFIG_BLK_DEV_IDEDMA_FORCED is not set |
| 434 | CONFIG_IDEDMA_PCI_AUTO=y | 465 | CONFIG_IDEDMA_PCI_AUTO=y |
| @@ -443,6 +474,7 @@ CONFIG_BLK_DEV_AMD74XX=y | |||
| 443 | # CONFIG_BLK_DEV_CS5530 is not set | 474 | # CONFIG_BLK_DEV_CS5530 is not set |
| 444 | # CONFIG_BLK_DEV_HPT34X is not set | 475 | # CONFIG_BLK_DEV_HPT34X is not set |
| 445 | # CONFIG_BLK_DEV_HPT366 is not set | 476 | # CONFIG_BLK_DEV_HPT366 is not set |
| 477 | # CONFIG_BLK_DEV_JMICRON is not set | ||
| 446 | # CONFIG_BLK_DEV_SC1200 is not set | 478 | # CONFIG_BLK_DEV_SC1200 is not set |
| 447 | # CONFIG_BLK_DEV_PIIX is not set | 479 | # CONFIG_BLK_DEV_PIIX is not set |
| 448 | # CONFIG_BLK_DEV_IT821X is not set | 480 | # CONFIG_BLK_DEV_IT821X is not set |
| @@ -451,6 +483,7 @@ CONFIG_BLK_DEV_AMD74XX=y | |||
| 451 | # CONFIG_BLK_DEV_PDC202XX_NEW is not set | 483 | # CONFIG_BLK_DEV_PDC202XX_NEW is not set |
| 452 | # CONFIG_BLK_DEV_SVWKS is not set | 484 | # CONFIG_BLK_DEV_SVWKS is not set |
| 453 | # CONFIG_BLK_DEV_SIIMAGE is not set | 485 | # CONFIG_BLK_DEV_SIIMAGE is not set |
| 486 | CONFIG_BLK_DEV_SL82C105=y | ||
| 454 | # CONFIG_BLK_DEV_SLC90E66 is not set | 487 | # CONFIG_BLK_DEV_SLC90E66 is not set |
| 455 | # CONFIG_BLK_DEV_TRM290 is not set | 488 | # CONFIG_BLK_DEV_TRM290 is not set |
| 456 | # CONFIG_BLK_DEV_VIA82CXXX is not set | 489 | # CONFIG_BLK_DEV_VIA82CXXX is not set |
| @@ -465,6 +498,8 @@ CONFIG_IDEDMA_AUTO=y | |||
| 465 | # | 498 | # |
| 466 | # CONFIG_RAID_ATTRS is not set | 499 | # CONFIG_RAID_ATTRS is not set |
| 467 | CONFIG_SCSI=y | 500 | CONFIG_SCSI=y |
| 501 | # CONFIG_SCSI_TGT is not set | ||
| 502 | CONFIG_SCSI_NETLINK=y | ||
| 468 | CONFIG_SCSI_PROC_FS=y | 503 | CONFIG_SCSI_PROC_FS=y |
| 469 | 504 | ||
| 470 | # | 505 | # |
| @@ -484,14 +519,16 @@ CONFIG_CHR_DEV_SG=y | |||
| 484 | CONFIG_SCSI_MULTI_LUN=y | 519 | CONFIG_SCSI_MULTI_LUN=y |
| 485 | CONFIG_SCSI_CONSTANTS=y | 520 | CONFIG_SCSI_CONSTANTS=y |
| 486 | # CONFIG_SCSI_LOGGING is not set | 521 | # CONFIG_SCSI_LOGGING is not set |
| 522 | # CONFIG_SCSI_SCAN_ASYNC is not set | ||
| 487 | 523 | ||
| 488 | # | 524 | # |
| 489 | # SCSI Transport Attributes | 525 | # SCSI Transports |
| 490 | # | 526 | # |
| 491 | CONFIG_SCSI_SPI_ATTRS=y | 527 | CONFIG_SCSI_SPI_ATTRS=y |
| 492 | CONFIG_SCSI_FC_ATTRS=y | 528 | CONFIG_SCSI_FC_ATTRS=y |
| 493 | CONFIG_SCSI_ISCSI_ATTRS=m | 529 | CONFIG_SCSI_ISCSI_ATTRS=m |
| 494 | CONFIG_SCSI_SAS_ATTRS=m | 530 | CONFIG_SCSI_SAS_ATTRS=m |
| 531 | # CONFIG_SCSI_SAS_LIBSAS is not set | ||
| 495 | 532 | ||
| 496 | # | 533 | # |
| 497 | # SCSI low-level drivers | 534 | # SCSI low-level drivers |
| @@ -504,10 +541,11 @@ CONFIG_SCSI_SAS_ATTRS=m | |||
| 504 | # CONFIG_SCSI_AIC7XXX is not set | 541 | # CONFIG_SCSI_AIC7XXX is not set |
| 505 | # CONFIG_SCSI_AIC7XXX_OLD is not set | 542 | # CONFIG_SCSI_AIC7XXX_OLD is not set |
| 506 | # CONFIG_SCSI_AIC79XX is not set | 543 | # CONFIG_SCSI_AIC79XX is not set |
| 544 | # CONFIG_SCSI_AIC94XX is not set | ||
| 545 | # CONFIG_SCSI_ARCMSR is not set | ||
| 507 | # CONFIG_MEGARAID_NEWGEN is not set | 546 | # CONFIG_MEGARAID_NEWGEN is not set |
| 508 | # CONFIG_MEGARAID_LEGACY is not set | 547 | # CONFIG_MEGARAID_LEGACY is not set |
| 509 | # CONFIG_MEGARAID_SAS is not set | 548 | # CONFIG_MEGARAID_SAS is not set |
| 510 | CONFIG_ATA=y | ||
| 511 | # CONFIG_SCSI_HPTIOP is not set | 549 | # CONFIG_SCSI_HPTIOP is not set |
| 512 | # CONFIG_SCSI_BUSLOGIC is not set | 550 | # CONFIG_SCSI_BUSLOGIC is not set |
| 513 | # CONFIG_SCSI_DMX3191D is not set | 551 | # CONFIG_SCSI_DMX3191D is not set |
| @@ -520,6 +558,7 @@ CONFIG_SCSI_IBMVSCSI=y | |||
| 520 | # CONFIG_SCSI_INIA100 is not set | 558 | # CONFIG_SCSI_INIA100 is not set |
| 521 | # CONFIG_SCSI_PPA is not set | 559 | # CONFIG_SCSI_PPA is not set |
| 522 | # CONFIG_SCSI_IMM is not set | 560 | # CONFIG_SCSI_IMM is not set |
| 561 | # CONFIG_SCSI_STEX is not set | ||
| 523 | CONFIG_SCSI_SYM53C8XX_2=y | 562 | CONFIG_SCSI_SYM53C8XX_2=y |
| 524 | CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=0 | 563 | CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=0 |
| 525 | CONFIG_SCSI_SYM53C8XX_DEFAULT_TAGS=16 | 564 | CONFIG_SCSI_SYM53C8XX_DEFAULT_TAGS=16 |
| @@ -530,10 +569,66 @@ CONFIG_SCSI_IPR_TRACE=y | |||
| 530 | CONFIG_SCSI_IPR_DUMP=y | 569 | CONFIG_SCSI_IPR_DUMP=y |
| 531 | # CONFIG_SCSI_QLOGIC_1280 is not set | 570 | # CONFIG_SCSI_QLOGIC_1280 is not set |
| 532 | CONFIG_SCSI_QLA_FC=m | 571 | CONFIG_SCSI_QLA_FC=m |
| 572 | # CONFIG_SCSI_QLA_ISCSI is not set | ||
| 533 | CONFIG_SCSI_LPFC=m | 573 | CONFIG_SCSI_LPFC=m |
| 534 | # CONFIG_SCSI_DC395x is not set | 574 | # CONFIG_SCSI_DC395x is not set |
| 535 | # CONFIG_SCSI_DC390T is not set | 575 | # CONFIG_SCSI_DC390T is not set |
| 536 | # CONFIG_SCSI_DEBUG is not set | 576 | # CONFIG_SCSI_DEBUG is not set |
| 577 | # CONFIG_SCSI_SRP is not set | ||
| 578 | |||
| 579 | # | ||
| 580 | # Serial ATA (prod) and Parallel ATA (experimental) drivers | ||
| 581 | # | ||
| 582 | CONFIG_ATA=y | ||
| 583 | # CONFIG_SATA_AHCI is not set | ||
| 584 | # CONFIG_SATA_SVW is not set | ||
| 585 | # CONFIG_ATA_PIIX is not set | ||
| 586 | # CONFIG_SATA_MV is not set | ||
| 587 | # CONFIG_SATA_NV is not set | ||
| 588 | # CONFIG_PDC_ADMA is not set | ||
| 589 | # CONFIG_SATA_QSTOR is not set | ||
| 590 | # CONFIG_SATA_PROMISE is not set | ||
| 591 | # CONFIG_SATA_SX4 is not set | ||
| 592 | # CONFIG_SATA_SIL is not set | ||
| 593 | # CONFIG_SATA_SIL24 is not set | ||
| 594 | # CONFIG_SATA_SIS is not set | ||
| 595 | # CONFIG_SATA_ULI is not set | ||
| 596 | # CONFIG_SATA_VIA is not set | ||
| 597 | # CONFIG_SATA_VITESSE is not set | ||
| 598 | # CONFIG_PATA_ALI is not set | ||
| 599 | # CONFIG_PATA_AMD is not set | ||
| 600 | # CONFIG_PATA_ARTOP is not set | ||
| 601 | # CONFIG_PATA_ATIIXP is not set | ||
| 602 | # CONFIG_PATA_CMD64X is not set | ||
| 603 | # CONFIG_PATA_CS5520 is not set | ||
| 604 | # CONFIG_PATA_CS5530 is not set | ||
| 605 | # CONFIG_PATA_CYPRESS is not set | ||
| 606 | # CONFIG_PATA_EFAR is not set | ||
| 607 | # CONFIG_ATA_GENERIC is not set | ||
| 608 | # CONFIG_PATA_HPT366 is not set | ||
| 609 | # CONFIG_PATA_HPT37X is not set | ||
| 610 | # CONFIG_PATA_HPT3X2N is not set | ||
| 611 | # CONFIG_PATA_HPT3X3 is not set | ||
| 612 | # CONFIG_PATA_IT821X is not set | ||
| 613 | # CONFIG_PATA_JMICRON is not set | ||
| 614 | # CONFIG_PATA_TRIFLEX is not set | ||
| 615 | # CONFIG_PATA_MARVELL is not set | ||
| 616 | # CONFIG_PATA_MPIIX is not set | ||
| 617 | # CONFIG_PATA_OLDPIIX is not set | ||
| 618 | # CONFIG_PATA_NETCELL is not set | ||
| 619 | # CONFIG_PATA_NS87410 is not set | ||
| 620 | # CONFIG_PATA_OPTI is not set | ||
| 621 | # CONFIG_PATA_OPTIDMA is not set | ||
| 622 | # CONFIG_PATA_PDC_OLD is not set | ||
| 623 | # CONFIG_PATA_RADISYS is not set | ||
| 624 | # CONFIG_PATA_RZ1000 is not set | ||
| 625 | # CONFIG_PATA_SC1200 is not set | ||
| 626 | # CONFIG_PATA_SERVERWORKS is not set | ||
| 627 | # CONFIG_PATA_PDC2027X is not set | ||
| 628 | # CONFIG_PATA_SIL680 is not set | ||
| 629 | # CONFIG_PATA_SIS is not set | ||
| 630 | # CONFIG_PATA_VIA is not set | ||
| 631 | # CONFIG_PATA_WINBOND is not set | ||
| 537 | 632 | ||
| 538 | # | 633 | # |
| 539 | # Multi-device support (RAID and LVM) | 634 | # Multi-device support (RAID and LVM) |
| @@ -548,6 +643,7 @@ CONFIG_MD_RAID10=m | |||
| 548 | CONFIG_MD_MULTIPATH=m | 643 | CONFIG_MD_MULTIPATH=m |
| 549 | CONFIG_MD_FAULTY=m | 644 | CONFIG_MD_FAULTY=m |
| 550 | CONFIG_BLK_DEV_DM=y | 645 | CONFIG_BLK_DEV_DM=y |
| 646 | # CONFIG_DM_DEBUG is not set | ||
| 551 | CONFIG_DM_CRYPT=m | 647 | CONFIG_DM_CRYPT=m |
| 552 | CONFIG_DM_SNAPSHOT=m | 648 | CONFIG_DM_SNAPSHOT=m |
| 553 | CONFIG_DM_MIRROR=m | 649 | CONFIG_DM_MIRROR=m |
| @@ -576,6 +672,7 @@ CONFIG_DM_MULTIPATH_EMC=m | |||
| 576 | # | 672 | # |
| 577 | # Macintosh device drivers | 673 | # Macintosh device drivers |
| 578 | # | 674 | # |
| 675 | # CONFIG_MAC_EMUMOUSEBTN is not set | ||
| 579 | # CONFIG_WINDFARM is not set | 676 | # CONFIG_WINDFARM is not set |
| 580 | 677 | ||
| 581 | # | 678 | # |
| @@ -617,6 +714,7 @@ CONFIG_VORTEX=y | |||
| 617 | CONFIG_IBMVETH=y | 714 | CONFIG_IBMVETH=y |
| 618 | CONFIG_NET_PCI=y | 715 | CONFIG_NET_PCI=y |
| 619 | CONFIG_PCNET32=y | 716 | CONFIG_PCNET32=y |
| 717 | # CONFIG_PCNET32_NAPI is not set | ||
| 620 | # CONFIG_AMD8111_ETH is not set | 718 | # CONFIG_AMD8111_ETH is not set |
| 621 | # CONFIG_ADAPTEC_STARFIRE is not set | 719 | # CONFIG_ADAPTEC_STARFIRE is not set |
| 622 | # CONFIG_B44 is not set | 720 | # CONFIG_B44 is not set |
| @@ -655,17 +753,19 @@ CONFIG_E1000=y | |||
| 655 | # CONFIG_VIA_VELOCITY is not set | 753 | # CONFIG_VIA_VELOCITY is not set |
| 656 | CONFIG_TIGON3=y | 754 | CONFIG_TIGON3=y |
| 657 | # CONFIG_BNX2 is not set | 755 | # CONFIG_BNX2 is not set |
| 658 | # CONFIG_MV643XX_ETH is not set | 756 | # CONFIG_QLA3XXX is not set |
| 659 | 757 | ||
| 660 | # | 758 | # |
| 661 | # Ethernet (10000 Mbit) | 759 | # Ethernet (10000 Mbit) |
| 662 | # | 760 | # |
| 663 | # CONFIG_CHELSIO_T1 is not set | 761 | # CONFIG_CHELSIO_T1 is not set |
| 762 | CONFIG_EHEA=m | ||
| 664 | CONFIG_IXGB=m | 763 | CONFIG_IXGB=m |
| 665 | # CONFIG_IXGB_NAPI is not set | 764 | # CONFIG_IXGB_NAPI is not set |
| 666 | CONFIG_S2IO=m | 765 | CONFIG_S2IO=m |
| 667 | # CONFIG_S2IO_NAPI is not set | 766 | # CONFIG_S2IO_NAPI is not set |
| 668 | # CONFIG_MYRI10GE is not set | 767 | # CONFIG_MYRI10GE is not set |
| 768 | # CONFIG_NETXEN_NIC is not set | ||
| 669 | 769 | ||
| 670 | # | 770 | # |
| 671 | # Token Ring devices | 771 | # Token Ring devices |
| @@ -697,6 +797,7 @@ CONFIG_PPP_BSDCOMP=m | |||
| 697 | # CONFIG_PPP_MPPE is not set | 797 | # CONFIG_PPP_MPPE is not set |
| 698 | CONFIG_PPPOE=m | 798 | CONFIG_PPPOE=m |
| 699 | # CONFIG_SLIP is not set | 799 | # CONFIG_SLIP is not set |
| 800 | CONFIG_SLHC=m | ||
| 700 | # CONFIG_NET_FC is not set | 801 | # CONFIG_NET_FC is not set |
| 701 | # CONFIG_SHAPER is not set | 802 | # CONFIG_SHAPER is not set |
| 702 | CONFIG_NETCONSOLE=y | 803 | CONFIG_NETCONSOLE=y |
| @@ -719,6 +820,7 @@ CONFIG_NET_POLL_CONTROLLER=y | |||
| 719 | # Input device support | 820 | # Input device support |
| 720 | # | 821 | # |
| 721 | CONFIG_INPUT=y | 822 | CONFIG_INPUT=y |
| 823 | # CONFIG_INPUT_FF_MEMLESS is not set | ||
| 722 | 824 | ||
| 723 | # | 825 | # |
| 724 | # Userland interfaces | 826 | # Userland interfaces |
| @@ -741,6 +843,7 @@ CONFIG_KEYBOARD_ATKBD=y | |||
| 741 | # CONFIG_KEYBOARD_LKKBD is not set | 843 | # CONFIG_KEYBOARD_LKKBD is not set |
| 742 | # CONFIG_KEYBOARD_XTKBD is not set | 844 | # CONFIG_KEYBOARD_XTKBD is not set |
| 743 | # CONFIG_KEYBOARD_NEWTON is not set | 845 | # CONFIG_KEYBOARD_NEWTON is not set |
| 846 | # CONFIG_KEYBOARD_STOWAWAY is not set | ||
| 744 | CONFIG_INPUT_MOUSE=y | 847 | CONFIG_INPUT_MOUSE=y |
| 745 | CONFIG_MOUSE_PS2=y | 848 | CONFIG_MOUSE_PS2=y |
| 746 | # CONFIG_MOUSE_SERIAL is not set | 849 | # CONFIG_MOUSE_SERIAL is not set |
| @@ -815,10 +918,6 @@ CONFIG_GEN_RTC=y | |||
| 815 | # CONFIG_DTLK is not set | 918 | # CONFIG_DTLK is not set |
| 816 | # CONFIG_R3964 is not set | 919 | # CONFIG_R3964 is not set |
| 817 | # CONFIG_APPLICOM is not set | 920 | # CONFIG_APPLICOM is not set |
| 818 | |||
| 819 | # | ||
| 820 | # Ftape, the floppy tape device driver | ||
| 821 | # | ||
| 822 | # CONFIG_AGP is not set | 921 | # CONFIG_AGP is not set |
| 823 | # CONFIG_DRM is not set | 922 | # CONFIG_DRM is not set |
| 824 | CONFIG_RAW_DRIVER=y | 923 | CONFIG_RAW_DRIVER=y |
| @@ -829,7 +928,6 @@ CONFIG_MAX_RAW_DEVS=1024 | |||
| 829 | # TPM devices | 928 | # TPM devices |
| 830 | # | 929 | # |
| 831 | # CONFIG_TCG_TPM is not set | 930 | # CONFIG_TCG_TPM is not set |
| 832 | # CONFIG_TELCLOCK is not set | ||
| 833 | 931 | ||
| 834 | # | 932 | # |
| 835 | # I2C support | 933 | # I2C support |
| @@ -894,6 +992,7 @@ CONFIG_I2C_ALGOBIT=y | |||
| 894 | # | 992 | # |
| 895 | # Dallas's 1-wire bus | 993 | # Dallas's 1-wire bus |
| 896 | # | 994 | # |
| 995 | # CONFIG_W1 is not set | ||
| 897 | 996 | ||
| 898 | # | 997 | # |
| 899 | # Hardware Monitoring support | 998 | # Hardware Monitoring support |
| @@ -902,14 +1001,9 @@ CONFIG_I2C_ALGOBIT=y | |||
| 902 | # CONFIG_HWMON_VID is not set | 1001 | # CONFIG_HWMON_VID is not set |
| 903 | 1002 | ||
| 904 | # | 1003 | # |
| 905 | # Misc devices | ||
| 906 | # | ||
| 907 | |||
| 908 | # | ||
| 909 | # Multimedia devices | 1004 | # Multimedia devices |
| 910 | # | 1005 | # |
| 911 | # CONFIG_VIDEO_DEV is not set | 1006 | # CONFIG_VIDEO_DEV is not set |
| 912 | CONFIG_VIDEO_V4L2=y | ||
| 913 | 1007 | ||
| 914 | # | 1008 | # |
| 915 | # Digital Video Broadcasting Devices | 1009 | # Digital Video Broadcasting Devices |
| @@ -922,6 +1016,7 @@ CONFIG_VIDEO_V4L2=y | |||
| 922 | # | 1016 | # |
| 923 | CONFIG_FIRMWARE_EDID=y | 1017 | CONFIG_FIRMWARE_EDID=y |
| 924 | CONFIG_FB=y | 1018 | CONFIG_FB=y |
| 1019 | CONFIG_FB_DDC=y | ||
| 925 | CONFIG_FB_CFB_FILLRECT=y | 1020 | CONFIG_FB_CFB_FILLRECT=y |
| 926 | CONFIG_FB_CFB_COPYAREA=y | 1021 | CONFIG_FB_CFB_COPYAREA=y |
| 927 | CONFIG_FB_CFB_IMAGEBLIT=y | 1022 | CONFIG_FB_CFB_IMAGEBLIT=y |
| @@ -957,6 +1052,7 @@ CONFIG_FB_RADEON_I2C=y | |||
| 957 | # CONFIG_FB_3DFX is not set | 1052 | # CONFIG_FB_3DFX is not set |
| 958 | # CONFIG_FB_VOODOO1 is not set | 1053 | # CONFIG_FB_VOODOO1 is not set |
| 959 | # CONFIG_FB_TRIDENT is not set | 1054 | # CONFIG_FB_TRIDENT is not set |
| 1055 | CONFIG_FB_IBM_GXT4500=y | ||
| 960 | # CONFIG_FB_VIRTUAL is not set | 1056 | # CONFIG_FB_VIRTUAL is not set |
| 961 | 1057 | ||
| 962 | # | 1058 | # |
| @@ -989,6 +1085,11 @@ CONFIG_LCD_DEVICE=y | |||
| 989 | # CONFIG_SOUND is not set | 1085 | # CONFIG_SOUND is not set |
| 990 | 1086 | ||
| 991 | # | 1087 | # |
| 1088 | # HID Devices | ||
| 1089 | # | ||
| 1090 | CONFIG_HID=y | ||
| 1091 | |||
| 1092 | # | ||
| 992 | # USB support | 1093 | # USB support |
| 993 | # | 1094 | # |
| 994 | CONFIG_USB_ARCH_HAS_HCD=y | 1095 | CONFIG_USB_ARCH_HAS_HCD=y |
| @@ -1003,6 +1104,7 @@ CONFIG_USB=y | |||
| 1003 | CONFIG_USB_DEVICEFS=y | 1104 | CONFIG_USB_DEVICEFS=y |
| 1004 | # CONFIG_USB_BANDWIDTH is not set | 1105 | # CONFIG_USB_BANDWIDTH is not set |
| 1005 | # CONFIG_USB_DYNAMIC_MINORS is not set | 1106 | # CONFIG_USB_DYNAMIC_MINORS is not set |
| 1107 | # CONFIG_USB_MULTITHREAD_PROBE is not set | ||
| 1006 | # CONFIG_USB_OTG is not set | 1108 | # CONFIG_USB_OTG is not set |
| 1007 | 1109 | ||
| 1008 | # | 1110 | # |
| @@ -1043,13 +1145,13 @@ CONFIG_USB_STORAGE=y | |||
| 1043 | # CONFIG_USB_STORAGE_SDDR55 is not set | 1145 | # CONFIG_USB_STORAGE_SDDR55 is not set |
| 1044 | # CONFIG_USB_STORAGE_JUMPSHOT is not set | 1146 | # CONFIG_USB_STORAGE_JUMPSHOT is not set |
| 1045 | # CONFIG_USB_STORAGE_ALAUDA is not set | 1147 | # CONFIG_USB_STORAGE_ALAUDA is not set |
| 1148 | # CONFIG_USB_STORAGE_KARMA is not set | ||
| 1046 | # CONFIG_USB_LIBUSUAL is not set | 1149 | # CONFIG_USB_LIBUSUAL is not set |
| 1047 | 1150 | ||
| 1048 | # | 1151 | # |
| 1049 | # USB Input Devices | 1152 | # USB Input Devices |
| 1050 | # | 1153 | # |
| 1051 | CONFIG_USB_HID=y | 1154 | CONFIG_USB_HID=y |
| 1052 | CONFIG_USB_HIDINPUT=y | ||
| 1053 | # CONFIG_USB_HIDINPUT_POWERBOOK is not set | 1155 | # CONFIG_USB_HIDINPUT_POWERBOOK is not set |
| 1054 | # CONFIG_HID_FF is not set | 1156 | # CONFIG_HID_FF is not set |
| 1055 | CONFIG_USB_HIDDEV=y | 1157 | CONFIG_USB_HIDDEV=y |
| @@ -1079,6 +1181,7 @@ CONFIG_USB_HIDDEV=y | |||
| 1079 | # CONFIG_USB_KAWETH is not set | 1181 | # CONFIG_USB_KAWETH is not set |
| 1080 | # CONFIG_USB_PEGASUS is not set | 1182 | # CONFIG_USB_PEGASUS is not set |
| 1081 | # CONFIG_USB_RTL8150 is not set | 1183 | # CONFIG_USB_RTL8150 is not set |
| 1184 | # CONFIG_USB_USBNET_MII is not set | ||
| 1082 | # CONFIG_USB_USBNET is not set | 1185 | # CONFIG_USB_USBNET is not set |
| 1083 | CONFIG_USB_MON=y | 1186 | CONFIG_USB_MON=y |
| 1084 | 1187 | ||
| @@ -1097,6 +1200,7 @@ CONFIG_USB_MON=y | |||
| 1097 | # | 1200 | # |
| 1098 | # CONFIG_USB_EMI62 is not set | 1201 | # CONFIG_USB_EMI62 is not set |
| 1099 | # CONFIG_USB_EMI26 is not set | 1202 | # CONFIG_USB_EMI26 is not set |
| 1203 | # CONFIG_USB_ADUTUX is not set | ||
| 1100 | # CONFIG_USB_AUERSWALD is not set | 1204 | # CONFIG_USB_AUERSWALD is not set |
| 1101 | # CONFIG_USB_RIO500 is not set | 1205 | # CONFIG_USB_RIO500 is not set |
| 1102 | # CONFIG_USB_LEGOTOWER is not set | 1206 | # CONFIG_USB_LEGOTOWER is not set |
| @@ -1104,12 +1208,13 @@ CONFIG_USB_MON=y | |||
| 1104 | # CONFIG_USB_LED is not set | 1208 | # CONFIG_USB_LED is not set |
| 1105 | # CONFIG_USB_CYPRESS_CY7C63 is not set | 1209 | # CONFIG_USB_CYPRESS_CY7C63 is not set |
| 1106 | # CONFIG_USB_CYTHERM is not set | 1210 | # CONFIG_USB_CYTHERM is not set |
| 1107 | # CONFIG_USB_PHIDGETKIT is not set | 1211 | # CONFIG_USB_PHIDGET is not set |
| 1108 | # CONFIG_USB_PHIDGETSERVO is not set | ||
| 1109 | # CONFIG_USB_IDMOUSE is not set | 1212 | # CONFIG_USB_IDMOUSE is not set |
| 1213 | # CONFIG_USB_FTDI_ELAN is not set | ||
| 1110 | # CONFIG_USB_APPLEDISPLAY is not set | 1214 | # CONFIG_USB_APPLEDISPLAY is not set |
| 1111 | # CONFIG_USB_SISUSBVGA is not set | 1215 | # CONFIG_USB_SISUSBVGA is not set |
| 1112 | # CONFIG_USB_LD is not set | 1216 | # CONFIG_USB_LD is not set |
| 1217 | # CONFIG_USB_TRANCEVIBRATOR is not set | ||
| 1113 | # CONFIG_USB_TEST is not set | 1218 | # CONFIG_USB_TEST is not set |
| 1114 | 1219 | ||
| 1115 | # | 1220 | # |
| @@ -1148,6 +1253,9 @@ CONFIG_INFINIBAND_USER_ACCESS=m | |||
| 1148 | CONFIG_INFINIBAND_ADDR_TRANS=y | 1253 | CONFIG_INFINIBAND_ADDR_TRANS=y |
| 1149 | CONFIG_INFINIBAND_MTHCA=m | 1254 | CONFIG_INFINIBAND_MTHCA=m |
| 1150 | CONFIG_INFINIBAND_MTHCA_DEBUG=y | 1255 | CONFIG_INFINIBAND_MTHCA_DEBUG=y |
| 1256 | CONFIG_INFINIBAND_EHCA=m | ||
| 1257 | CONFIG_INFINIBAND_EHCA_SCALING=y | ||
| 1258 | # CONFIG_INFINIBAND_AMSO1100 is not set | ||
| 1151 | CONFIG_INFINIBAND_IPOIB=m | 1259 | CONFIG_INFINIBAND_IPOIB=m |
| 1152 | CONFIG_INFINIBAND_IPOIB_DEBUG=y | 1260 | CONFIG_INFINIBAND_IPOIB_DEBUG=y |
| 1153 | # CONFIG_INFINIBAND_IPOIB_DEBUG_DATA is not set | 1261 | # CONFIG_INFINIBAND_IPOIB_DEBUG_DATA is not set |
| @@ -1177,6 +1285,10 @@ CONFIG_INFINIBAND_SRP=m | |||
| 1177 | # | 1285 | # |
| 1178 | 1286 | ||
| 1179 | # | 1287 | # |
| 1288 | # Virtualization | ||
| 1289 | # | ||
| 1290 | |||
| 1291 | # | ||
| 1180 | # File systems | 1292 | # File systems |
| 1181 | # | 1293 | # |
| 1182 | CONFIG_EXT2_FS=y | 1294 | CONFIG_EXT2_FS=y |
| @@ -1189,6 +1301,7 @@ CONFIG_EXT3_FS=y | |||
| 1189 | CONFIG_EXT3_FS_XATTR=y | 1301 | CONFIG_EXT3_FS_XATTR=y |
| 1190 | CONFIG_EXT3_FS_POSIX_ACL=y | 1302 | CONFIG_EXT3_FS_POSIX_ACL=y |
| 1191 | CONFIG_EXT3_FS_SECURITY=y | 1303 | CONFIG_EXT3_FS_SECURITY=y |
| 1304 | # CONFIG_EXT4DEV_FS is not set | ||
| 1192 | CONFIG_JBD=y | 1305 | CONFIG_JBD=y |
| 1193 | # CONFIG_JBD_DEBUG is not set | 1306 | # CONFIG_JBD_DEBUG is not set |
| 1194 | CONFIG_FS_MBCACHE=y | 1307 | CONFIG_FS_MBCACHE=y |
| @@ -1209,6 +1322,7 @@ CONFIG_XFS_FS=m | |||
| 1209 | CONFIG_XFS_SECURITY=y | 1322 | CONFIG_XFS_SECURITY=y |
| 1210 | CONFIG_XFS_POSIX_ACL=y | 1323 | CONFIG_XFS_POSIX_ACL=y |
| 1211 | # CONFIG_XFS_RT is not set | 1324 | # CONFIG_XFS_RT is not set |
| 1325 | # CONFIG_GFS2_FS is not set | ||
| 1212 | CONFIG_OCFS2_FS=m | 1326 | CONFIG_OCFS2_FS=m |
| 1213 | CONFIG_OCFS2_DEBUG_MASKLOG=y | 1327 | CONFIG_OCFS2_DEBUG_MASKLOG=y |
| 1214 | # CONFIG_MINIX_FS is not set | 1328 | # CONFIG_MINIX_FS is not set |
| @@ -1246,8 +1360,10 @@ CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" | |||
| 1246 | # | 1360 | # |
| 1247 | CONFIG_PROC_FS=y | 1361 | CONFIG_PROC_FS=y |
| 1248 | CONFIG_PROC_KCORE=y | 1362 | CONFIG_PROC_KCORE=y |
| 1363 | CONFIG_PROC_SYSCTL=y | ||
| 1249 | CONFIG_SYSFS=y | 1364 | CONFIG_SYSFS=y |
| 1250 | CONFIG_TMPFS=y | 1365 | CONFIG_TMPFS=y |
| 1366 | # CONFIG_TMPFS_POSIX_ACL is not set | ||
| 1251 | CONFIG_HUGETLBFS=y | 1367 | CONFIG_HUGETLBFS=y |
| 1252 | CONFIG_HUGETLB_PAGE=y | 1368 | CONFIG_HUGETLB_PAGE=y |
| 1253 | CONFIG_RAMFS=y | 1369 | CONFIG_RAMFS=y |
| @@ -1357,17 +1473,22 @@ CONFIG_NLS_ISO8859_1=y | |||
| 1357 | # CONFIG_NLS_UTF8 is not set | 1473 | # CONFIG_NLS_UTF8 is not set |
| 1358 | 1474 | ||
| 1359 | # | 1475 | # |
| 1476 | # Distributed Lock Manager | ||
| 1477 | # | ||
| 1478 | # CONFIG_DLM is not set | ||
| 1479 | |||
| 1480 | # | ||
| 1360 | # Library routines | 1481 | # Library routines |
| 1361 | # | 1482 | # |
| 1483 | CONFIG_BITREVERSE=y | ||
| 1362 | CONFIG_CRC_CCITT=m | 1484 | CONFIG_CRC_CCITT=m |
| 1363 | # CONFIG_CRC16 is not set | 1485 | # CONFIG_CRC16 is not set |
| 1364 | CONFIG_CRC32=y | 1486 | CONFIG_CRC32=y |
| 1365 | CONFIG_LIBCRC32C=m | 1487 | CONFIG_LIBCRC32C=m |
| 1366 | CONFIG_ZLIB_INFLATE=y | 1488 | CONFIG_ZLIB_INFLATE=y |
| 1367 | CONFIG_ZLIB_DEFLATE=m | 1489 | CONFIG_ZLIB_DEFLATE=m |
| 1368 | CONFIG_TEXTSEARCH=y | ||
| 1369 | CONFIG_TEXTSEARCH_KMP=m | ||
| 1370 | CONFIG_PLIST=y | 1490 | CONFIG_PLIST=y |
| 1491 | CONFIG_IOMAP_COPY=y | ||
| 1371 | 1492 | ||
| 1372 | # | 1493 | # |
| 1373 | # Instrumentation Support | 1494 | # Instrumentation Support |
| @@ -1380,8 +1501,11 @@ CONFIG_KPROBES=y | |||
| 1380 | # Kernel hacking | 1501 | # Kernel hacking |
| 1381 | # | 1502 | # |
| 1382 | # CONFIG_PRINTK_TIME is not set | 1503 | # CONFIG_PRINTK_TIME is not set |
| 1504 | CONFIG_ENABLE_MUST_CHECK=y | ||
| 1383 | CONFIG_MAGIC_SYSRQ=y | 1505 | CONFIG_MAGIC_SYSRQ=y |
| 1384 | # CONFIG_UNUSED_SYMBOLS is not set | 1506 | # CONFIG_UNUSED_SYMBOLS is not set |
| 1507 | CONFIG_DEBUG_FS=y | ||
| 1508 | # CONFIG_HEADERS_CHECK is not set | ||
| 1385 | CONFIG_DEBUG_KERNEL=y | 1509 | CONFIG_DEBUG_KERNEL=y |
| 1386 | CONFIG_LOG_BUF_SHIFT=17 | 1510 | CONFIG_LOG_BUF_SHIFT=17 |
| 1387 | CONFIG_DETECT_SOFTLOCKUP=y | 1511 | CONFIG_DETECT_SOFTLOCKUP=y |
| @@ -1395,16 +1519,20 @@ CONFIG_DETECT_SOFTLOCKUP=y | |||
| 1395 | # CONFIG_DEBUG_SPINLOCK_SLEEP is not set | 1519 | # CONFIG_DEBUG_SPINLOCK_SLEEP is not set |
| 1396 | # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set | 1520 | # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set |
| 1397 | # CONFIG_DEBUG_KOBJECT is not set | 1521 | # CONFIG_DEBUG_KOBJECT is not set |
| 1522 | CONFIG_DEBUG_BUGVERBOSE=y | ||
| 1398 | # CONFIG_DEBUG_INFO is not set | 1523 | # CONFIG_DEBUG_INFO is not set |
| 1399 | CONFIG_DEBUG_FS=y | ||
| 1400 | # CONFIG_DEBUG_VM is not set | 1524 | # CONFIG_DEBUG_VM is not set |
| 1525 | # CONFIG_DEBUG_LIST is not set | ||
| 1401 | CONFIG_FORCED_INLINING=y | 1526 | CONFIG_FORCED_INLINING=y |
| 1402 | # CONFIG_RCU_TORTURE_TEST is not set | 1527 | # CONFIG_RCU_TORTURE_TEST is not set |
| 1528 | # CONFIG_LKDTM is not set | ||
| 1403 | CONFIG_DEBUG_STACKOVERFLOW=y | 1529 | CONFIG_DEBUG_STACKOVERFLOW=y |
| 1404 | # CONFIG_DEBUG_STACK_USAGE is not set | 1530 | # CONFIG_DEBUG_STACK_USAGE is not set |
| 1531 | CONFIG_HCALL_STATS=y | ||
| 1405 | CONFIG_DEBUGGER=y | 1532 | CONFIG_DEBUGGER=y |
| 1406 | CONFIG_XMON=y | 1533 | CONFIG_XMON=y |
| 1407 | CONFIG_XMON_DEFAULT=y | 1534 | CONFIG_XMON_DEFAULT=y |
| 1535 | CONFIG_XMON_DISASSEMBLY=y | ||
| 1408 | CONFIG_IRQSTACKS=y | 1536 | CONFIG_IRQSTACKS=y |
| 1409 | # CONFIG_BOOTX_TEXT is not set | 1537 | # CONFIG_BOOTX_TEXT is not set |
| 1410 | # CONFIG_PPC_EARLY_DEBUG is not set | 1538 | # CONFIG_PPC_EARLY_DEBUG is not set |
| @@ -1419,7 +1547,12 @@ CONFIG_IRQSTACKS=y | |||
| 1419 | # Cryptographic options | 1547 | # Cryptographic options |
| 1420 | # | 1548 | # |
| 1421 | CONFIG_CRYPTO=y | 1549 | CONFIG_CRYPTO=y |
| 1550 | CONFIG_CRYPTO_ALGAPI=y | ||
| 1551 | CONFIG_CRYPTO_BLKCIPHER=y | ||
| 1552 | CONFIG_CRYPTO_HASH=y | ||
| 1553 | CONFIG_CRYPTO_MANAGER=y | ||
| 1422 | CONFIG_CRYPTO_HMAC=y | 1554 | CONFIG_CRYPTO_HMAC=y |
| 1555 | # CONFIG_CRYPTO_XCBC is not set | ||
| 1423 | CONFIG_CRYPTO_NULL=m | 1556 | CONFIG_CRYPTO_NULL=m |
| 1424 | CONFIG_CRYPTO_MD4=m | 1557 | CONFIG_CRYPTO_MD4=m |
| 1425 | CONFIG_CRYPTO_MD5=y | 1558 | CONFIG_CRYPTO_MD5=y |
| @@ -1428,9 +1561,14 @@ CONFIG_CRYPTO_SHA256=m | |||
| 1428 | CONFIG_CRYPTO_SHA512=m | 1561 | CONFIG_CRYPTO_SHA512=m |
| 1429 | CONFIG_CRYPTO_WP512=m | 1562 | CONFIG_CRYPTO_WP512=m |
| 1430 | CONFIG_CRYPTO_TGR192=m | 1563 | CONFIG_CRYPTO_TGR192=m |
| 1564 | # CONFIG_CRYPTO_GF128MUL is not set | ||
| 1565 | CONFIG_CRYPTO_ECB=m | ||
| 1566 | CONFIG_CRYPTO_CBC=y | ||
| 1567 | # CONFIG_CRYPTO_LRW is not set | ||
| 1431 | CONFIG_CRYPTO_DES=y | 1568 | CONFIG_CRYPTO_DES=y |
| 1432 | CONFIG_CRYPTO_BLOWFISH=m | 1569 | CONFIG_CRYPTO_BLOWFISH=m |
| 1433 | CONFIG_CRYPTO_TWOFISH=m | 1570 | CONFIG_CRYPTO_TWOFISH=m |
| 1571 | CONFIG_CRYPTO_TWOFISH_COMMON=m | ||
| 1434 | CONFIG_CRYPTO_SERPENT=m | 1572 | CONFIG_CRYPTO_SERPENT=m |
| 1435 | CONFIG_CRYPTO_AES=m | 1573 | CONFIG_CRYPTO_AES=m |
| 1436 | CONFIG_CRYPTO_CAST5=m | 1574 | CONFIG_CRYPTO_CAST5=m |
diff --git a/arch/powerpc/kernel/pci_32.c b/arch/powerpc/kernel/pci_32.c index 2847cd51a2d7..c54f3639c5ad 100644 --- a/arch/powerpc/kernel/pci_32.c +++ b/arch/powerpc/kernel/pci_32.c | |||
| @@ -775,11 +775,6 @@ static struct device_node *scan_OF_for_pci_bus(struct pci_bus *bus) | |||
| 775 | np = scan_OF_for_pci_dev(parent, bus->self->devfn); | 775 | np = scan_OF_for_pci_dev(parent, bus->self->devfn); |
| 776 | of_node_put(parent); | 776 | of_node_put(parent); |
| 777 | 777 | ||
| 778 | /* sanity check */ | ||
| 779 | if (strcmp(np->type, "pci") != 0) | ||
| 780 | printk(KERN_WARNING "pci: wrong type \"%s\" for bridge %s\n", | ||
| 781 | np->type, np->full_name); | ||
| 782 | |||
| 783 | return np; | 778 | return np; |
| 784 | } | 779 | } |
| 785 | 780 | ||
diff --git a/arch/powerpc/platforms/83xx/mpc832x_mds.c b/arch/powerpc/platforms/83xx/mpc832x_mds.c index f58c9780b66f..4d471190be8d 100644 --- a/arch/powerpc/platforms/83xx/mpc832x_mds.c +++ b/arch/powerpc/platforms/83xx/mpc832x_mds.c | |||
| @@ -103,7 +103,7 @@ static void __init mpc832x_sys_setup_arch(void) | |||
| 103 | #ifdef CONFIG_QUICC_ENGINE | 103 | #ifdef CONFIG_QUICC_ENGINE |
| 104 | qe_reset(); | 104 | qe_reset(); |
| 105 | 105 | ||
| 106 | if ((np = of_find_node_by_name(np, "par_io")) != NULL) { | 106 | if ((np = of_find_node_by_name(NULL, "par_io")) != NULL) { |
| 107 | par_io_init(np); | 107 | par_io_init(np); |
| 108 | of_node_put(np); | 108 | of_node_put(np); |
| 109 | 109 | ||
diff --git a/arch/powerpc/platforms/83xx/mpc8360e_pb.c b/arch/powerpc/platforms/83xx/mpc8360e_pb.c index 7bfd47ad7233..53b92a904e8e 100644 --- a/arch/powerpc/platforms/83xx/mpc8360e_pb.c +++ b/arch/powerpc/platforms/83xx/mpc8360e_pb.c | |||
| @@ -108,7 +108,7 @@ static void __init mpc8360_sys_setup_arch(void) | |||
| 108 | #ifdef CONFIG_QUICC_ENGINE | 108 | #ifdef CONFIG_QUICC_ENGINE |
| 109 | qe_reset(); | 109 | qe_reset(); |
| 110 | 110 | ||
| 111 | if ((np = of_find_node_by_name(np, "par_io")) != NULL) { | 111 | if ((np = of_find_node_by_name(NULL, "par_io")) != NULL) { |
| 112 | par_io_init(np); | 112 | par_io_init(np); |
| 113 | of_node_put(np); | 113 | of_node_put(np); |
| 114 | 114 | ||
diff --git a/arch/powerpc/platforms/pseries/iommu.c b/arch/powerpc/platforms/pseries/iommu.c index 3c95392f4f41..e6653a868b91 100644 --- a/arch/powerpc/platforms/pseries/iommu.c +++ b/arch/powerpc/platforms/pseries/iommu.c | |||
| @@ -459,7 +459,8 @@ static void pci_dma_dev_setup_pSeries(struct pci_dev *dev) | |||
| 459 | tbl = kmalloc_node(sizeof(struct iommu_table), GFP_KERNEL, | 459 | tbl = kmalloc_node(sizeof(struct iommu_table), GFP_KERNEL, |
| 460 | phb->node); | 460 | phb->node); |
| 461 | iommu_table_setparms(phb, dn, tbl); | 461 | iommu_table_setparms(phb, dn, tbl); |
| 462 | dev->dev.archdata.dma_data = iommu_init_table(tbl, phb->node); | 462 | PCI_DN(dn)->iommu_table = iommu_init_table(tbl, phb->node); |
| 463 | dev->dev.archdata.dma_data = PCI_DN(dn)->iommu_table; | ||
| 463 | return; | 464 | return; |
| 464 | } | 465 | } |
| 465 | 466 | ||
diff --git a/arch/powerpc/sysdev/mmio_nvram.c b/arch/powerpc/sysdev/mmio_nvram.c index ff23f5a4d4b9..e073e246293d 100644 --- a/arch/powerpc/sysdev/mmio_nvram.c +++ b/arch/powerpc/sysdev/mmio_nvram.c | |||
| @@ -80,33 +80,39 @@ static ssize_t mmio_nvram_get_size(void) | |||
| 80 | int __init mmio_nvram_init(void) | 80 | int __init mmio_nvram_init(void) |
| 81 | { | 81 | { |
| 82 | struct device_node *nvram_node; | 82 | struct device_node *nvram_node; |
| 83 | const unsigned long *buffer; | ||
| 84 | int proplen; | ||
| 85 | unsigned long nvram_addr; | 83 | unsigned long nvram_addr; |
| 84 | struct resource r; | ||
| 86 | int ret; | 85 | int ret; |
| 87 | 86 | ||
| 88 | ret = -ENODEV; | ||
| 89 | nvram_node = of_find_node_by_type(NULL, "nvram"); | 87 | nvram_node = of_find_node_by_type(NULL, "nvram"); |
| 90 | if (!nvram_node) | 88 | if (!nvram_node) { |
| 89 | printk(KERN_WARNING "nvram: no node found in device-tree\n"); | ||
| 90 | return -ENODEV; | ||
| 91 | } | ||
| 92 | |||
| 93 | ret = of_address_to_resource(nvram_node, 0, &r); | ||
| 94 | if (ret) { | ||
| 95 | printk(KERN_WARNING "nvram: failed to get address (err %d)\n", | ||
| 96 | ret); | ||
| 91 | goto out; | 97 | goto out; |
| 92 | 98 | } | |
| 93 | ret = -EIO; | 99 | nvram_addr = r.start; |
| 94 | buffer = get_property(nvram_node, "reg", &proplen); | 100 | mmio_nvram_len = r.end - r.start + 1; |
| 95 | if (proplen != 2*sizeof(unsigned long)) | 101 | if ( (!mmio_nvram_len) || (!nvram_addr) ) { |
| 96 | goto out; | 102 | printk(KERN_WARNING "nvram: address or lenght is 0\n"); |
| 97 | 103 | ret = -EIO; | |
| 98 | ret = -ENODEV; | ||
| 99 | nvram_addr = buffer[0]; | ||
| 100 | mmio_nvram_len = buffer[1]; | ||
| 101 | if ( (!mmio_nvram_len) || (!nvram_addr) ) | ||
| 102 | goto out; | 104 | goto out; |
| 105 | } | ||
| 103 | 106 | ||
| 104 | mmio_nvram_start = ioremap(nvram_addr, mmio_nvram_len); | 107 | mmio_nvram_start = ioremap(nvram_addr, mmio_nvram_len); |
| 105 | if (!mmio_nvram_start) | 108 | if (!mmio_nvram_start) { |
| 109 | printk(KERN_WARNING "nvram: failed to ioremap\n"); | ||
| 110 | ret = -ENOMEM; | ||
| 106 | goto out; | 111 | goto out; |
| 112 | } | ||
| 107 | 113 | ||
| 108 | printk(KERN_INFO "mmio NVRAM, %luk mapped to %p\n", | 114 | printk(KERN_INFO "mmio NVRAM, %luk at 0x%lx mapped to %p\n", |
| 109 | mmio_nvram_len >> 10, mmio_nvram_start); | 115 | mmio_nvram_len >> 10, nvram_addr, mmio_nvram_start); |
| 110 | 116 | ||
| 111 | ppc_md.nvram_read = mmio_nvram_read; | 117 | ppc_md.nvram_read = mmio_nvram_read; |
| 112 | ppc_md.nvram_write = mmio_nvram_write; | 118 | ppc_md.nvram_write = mmio_nvram_write; |
diff --git a/drivers/ata/libata-eh.c b/drivers/ata/libata-eh.c index 08ad44b3e48f..56cf59b60ec4 100644 --- a/drivers/ata/libata-eh.c +++ b/drivers/ata/libata-eh.c | |||
| @@ -1979,6 +1979,10 @@ static int ata_eh_recover(struct ata_port *ap, ata_prereset_fn_t prereset, | |||
| 1979 | 1979 | ||
| 1980 | ehc->tries[dev->devno] = ATA_EH_DEV_TRIES; | 1980 | ehc->tries[dev->devno] = ATA_EH_DEV_TRIES; |
| 1981 | 1981 | ||
| 1982 | /* collect port action mask recorded in dev actions */ | ||
| 1983 | ehc->i.action |= ehc->i.dev_action[i] & ~ATA_EH_PERDEV_MASK; | ||
| 1984 | ehc->i.dev_action[i] &= ATA_EH_PERDEV_MASK; | ||
| 1985 | |||
| 1982 | /* process hotplug request */ | 1986 | /* process hotplug request */ |
| 1983 | if (dev->flags & ATA_DFLAG_DETACH) | 1987 | if (dev->flags & ATA_DFLAG_DETACH) |
| 1984 | ata_eh_detach_dev(dev); | 1988 | ata_eh_detach_dev(dev); |
diff --git a/drivers/ata/sata_mv.c b/drivers/ata/sata_mv.c index 1b8e0eb9e032..aae0b5201c1e 100644 --- a/drivers/ata/sata_mv.c +++ b/drivers/ata/sata_mv.c | |||
| @@ -523,8 +523,7 @@ static const struct ata_port_info mv_port_info[] = { | |||
| 523 | }, | 523 | }, |
| 524 | { /* chip_7042 */ | 524 | { /* chip_7042 */ |
| 525 | .sht = &mv_sht, | 525 | .sht = &mv_sht, |
| 526 | .flags = (MV_COMMON_FLAGS | MV_6XXX_FLAGS | | 526 | .flags = (MV_COMMON_FLAGS | MV_6XXX_FLAGS), |
| 527 | MV_FLAG_DUAL_HC), | ||
| 528 | .pio_mask = 0x1f, /* pio0-4 */ | 527 | .pio_mask = 0x1f, /* pio0-4 */ |
| 529 | .udma_mask = 0x7f, /* udma0-6 */ | 528 | .udma_mask = 0x7f, /* udma0-6 */ |
| 530 | .port_ops = &mv_iie_ops, | 529 | .port_ops = &mv_iie_ops, |
| @@ -545,6 +544,8 @@ static const struct pci_device_id mv_pci_tbl[] = { | |||
| 545 | 544 | ||
| 546 | { PCI_VDEVICE(ADAPTEC2, 0x0241), chip_604x }, | 545 | { PCI_VDEVICE(ADAPTEC2, 0x0241), chip_604x }, |
| 547 | 546 | ||
| 547 | { PCI_VDEVICE(TTI, 0x2310), chip_7042 }, | ||
| 548 | |||
| 548 | { } /* terminate list */ | 549 | { } /* terminate list */ |
| 549 | }; | 550 | }; |
| 550 | 551 | ||
diff --git a/drivers/ata/sata_via.c b/drivers/ata/sata_via.c index 1c7f19aecc25..88f0565c8883 100644 --- a/drivers/ata/sata_via.c +++ b/drivers/ata/sata_via.c | |||
| @@ -77,6 +77,7 @@ static void svia_scr_write (struct ata_port *ap, unsigned int sc_reg, u32 val); | |||
| 77 | static void vt6420_error_handler(struct ata_port *ap); | 77 | static void vt6420_error_handler(struct ata_port *ap); |
| 78 | 78 | ||
| 79 | static const struct pci_device_id svia_pci_tbl[] = { | 79 | static const struct pci_device_id svia_pci_tbl[] = { |
| 80 | { PCI_VDEVICE(VIA, 0x5337), vt6420 }, | ||
| 80 | { PCI_VDEVICE(VIA, 0x0591), vt6420 }, | 81 | { PCI_VDEVICE(VIA, 0x0591), vt6420 }, |
| 81 | { PCI_VDEVICE(VIA, 0x3149), vt6420 }, | 82 | { PCI_VDEVICE(VIA, 0x3149), vt6420 }, |
| 82 | { PCI_VDEVICE(VIA, 0x3249), vt6421 }, | 83 | { PCI_VDEVICE(VIA, 0x3249), vt6421 }, |
diff --git a/drivers/char/mem.c b/drivers/char/mem.c index 4f1813e04754..f5c160caf9f4 100644 --- a/drivers/char/mem.c +++ b/drivers/char/mem.c | |||
| @@ -293,8 +293,8 @@ static int mmap_kmem(struct file * file, struct vm_area_struct * vma) | |||
| 293 | { | 293 | { |
| 294 | unsigned long pfn; | 294 | unsigned long pfn; |
| 295 | 295 | ||
| 296 | /* Turn a pfn offset into an absolute pfn */ | 296 | /* Turn a kernel-virtual address into a physical page frame */ |
| 297 | pfn = PFN_DOWN(virt_to_phys((void *)PAGE_OFFSET)) + vma->vm_pgoff; | 297 | pfn = __pa((u64)vma->vm_pgoff << PAGE_SHIFT) >> PAGE_SHIFT; |
| 298 | 298 | ||
| 299 | /* | 299 | /* |
| 300 | * RED-PEN: on some architectures there is more mapped memory | 300 | * RED-PEN: on some architectures there is more mapped memory |
diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c index 1e1a7770a6b9..b8cf50fcd64d 100644 --- a/drivers/hid/hid-core.c +++ b/drivers/hid/hid-core.c | |||
| @@ -880,6 +880,10 @@ static void hid_output_field(struct hid_field *field, __u8 *data) | |||
| 880 | unsigned size = field->report_size; | 880 | unsigned size = field->report_size; |
| 881 | unsigned n; | 881 | unsigned n; |
| 882 | 882 | ||
| 883 | /* make sure the unused bits in the last byte are zeros */ | ||
| 884 | if (count > 0 && size > 0) | ||
| 885 | data[(count*size-1)/8] = 0; | ||
| 886 | |||
| 883 | for (n = 0; n < count; n++) { | 887 | for (n = 0; n < count; n++) { |
| 884 | if (field->logical_minimum < 0) /* signed values */ | 888 | if (field->logical_minimum < 0) /* signed values */ |
| 885 | implement(data, offset + n * size, size, s32ton(field->value[n], size)); | 889 | implement(data, offset + n * size, size, s32ton(field->value[n], size)); |
| @@ -947,7 +951,7 @@ int hid_input_report(struct hid_device *hid, int type, u8 *data, int size, int i | |||
| 947 | } | 951 | } |
| 948 | 952 | ||
| 949 | #ifdef DEBUG_DATA | 953 | #ifdef DEBUG_DATA |
| 950 | printk(KERN_DEBUG __FILE__ ": report (size %u) (%snumbered)\n", len, report_enum->numbered ? "" : "un"); | 954 | printk(KERN_DEBUG __FILE__ ": report (size %u) (%snumbered)\n", size, report_enum->numbered ? "" : "un"); |
| 951 | #endif | 955 | #endif |
| 952 | 956 | ||
| 953 | n = 0; /* Normally report number is 0 */ | 957 | n = 0; /* Normally report number is 0 */ |
diff --git a/drivers/hid/hid-input.c b/drivers/hid/hid-input.c index 28689e3eb552..9cf591a1bda3 100644 --- a/drivers/hid/hid-input.c +++ b/drivers/hid/hid-input.c | |||
| @@ -30,7 +30,6 @@ | |||
| 30 | #include <linux/module.h> | 30 | #include <linux/module.h> |
| 31 | #include <linux/slab.h> | 31 | #include <linux/slab.h> |
| 32 | #include <linux/kernel.h> | 32 | #include <linux/kernel.h> |
| 33 | #include <linux/usb/input.h> | ||
| 34 | 33 | ||
| 35 | #undef DEBUG | 34 | #undef DEBUG |
| 36 | 35 | ||
| @@ -364,9 +363,22 @@ static void hidinput_configure_usage(struct hid_input *hidinput, struct hid_fiel | |||
| 364 | break; | 363 | break; |
| 365 | 364 | ||
| 366 | case HID_UP_LED: | 365 | case HID_UP_LED: |
| 367 | if (((usage->hid - 1) & 0xffff) >= LED_MAX) | 366 | |
| 368 | goto ignore; | 367 | switch (usage->hid & 0xffff) { /* HID-Value: */ |
| 369 | map_led((usage->hid - 1) & 0xffff); | 368 | case 0x01: map_led (LED_NUML); break; /* "Num Lock" */ |
| 369 | case 0x02: map_led (LED_CAPSL); break; /* "Caps Lock" */ | ||
| 370 | case 0x03: map_led (LED_SCROLLL); break; /* "Scroll Lock" */ | ||
| 371 | case 0x04: map_led (LED_COMPOSE); break; /* "Compose" */ | ||
| 372 | case 0x05: map_led (LED_KANA); break; /* "Kana" */ | ||
| 373 | case 0x27: map_led (LED_SLEEP); break; /* "Stand-By" */ | ||
| 374 | case 0x4c: map_led (LED_SUSPEND); break; /* "System Suspend" */ | ||
| 375 | case 0x09: map_led (LED_MUTE); break; /* "Mute" */ | ||
| 376 | case 0x4b: map_led (LED_MISC); break; /* "Generic Indicator" */ | ||
| 377 | case 0x19: map_led (LED_MAIL); break; /* "Message Waiting" */ | ||
| 378 | case 0x4d: map_led (LED_CHARGING); break; /* "External Power Connected" */ | ||
| 379 | |||
| 380 | default: goto ignore; | ||
| 381 | } | ||
| 370 | break; | 382 | break; |
| 371 | 383 | ||
| 372 | case HID_UP_DIGITIZER: | 384 | case HID_UP_DIGITIZER: |
diff --git a/drivers/hwmon/hwmon-vid.c b/drivers/hwmon/hwmon-vid.c index 31c42002708f..b80f6ed5acfc 100644 --- a/drivers/hwmon/hwmon-vid.c +++ b/drivers/hwmon/hwmon-vid.c | |||
| @@ -93,7 +93,7 @@ int vid_from_reg(int val, u8 vrm) | |||
| 93 | case 110: /* Intel Conroe */ | 93 | case 110: /* Intel Conroe */ |
| 94 | /* compute in uV, round to mV */ | 94 | /* compute in uV, round to mV */ |
| 95 | val &= 0xff; | 95 | val &= 0xff; |
| 96 | if(((val & 0x7e) == 0xfe) || (!(val & 0x7e))) | 96 | if (val < 0x02 || val > 0xb2) |
| 97 | return 0; | 97 | return 0; |
| 98 | return((1600000 - (val - 2) * 6250 + 500) / 1000); | 98 | return((1600000 - (val - 2) * 6250 + 500) / 1000); |
| 99 | case 24: /* Opteron processor */ | 99 | case 24: /* Opteron processor */ |
diff --git a/drivers/hwmon/w83793.c b/drivers/hwmon/w83793.c index c12ac5abc2bb..253ffaf1568a 100644 --- a/drivers/hwmon/w83793.c +++ b/drivers/hwmon/w83793.c | |||
| @@ -117,6 +117,7 @@ static const u16 W83793_REG_IN[][3] = { | |||
| 117 | /* Low Bits of Vcore A/B Vtt Read/High/Low */ | 117 | /* Low Bits of Vcore A/B Vtt Read/High/Low */ |
| 118 | static const u16 W83793_REG_IN_LOW_BITS[] = { 0x1b, 0x68, 0x69 }; | 118 | static const u16 W83793_REG_IN_LOW_BITS[] = { 0x1b, 0x68, 0x69 }; |
| 119 | static u8 scale_in[] = { 2, 2, 2, 16, 16, 16, 8, 24, 24, 16 }; | 119 | static u8 scale_in[] = { 2, 2, 2, 16, 16, 16, 8, 24, 24, 16 }; |
| 120 | static u8 scale_in_add[] = { 0, 0, 0, 0, 0, 0, 0, 150, 150, 0 }; | ||
| 120 | 121 | ||
| 121 | #define W83793_REG_FAN(index) (0x23 + 2 * (index)) /* High byte */ | 122 | #define W83793_REG_FAN(index) (0x23 + 2 * (index)) /* High byte */ |
| 122 | #define W83793_REG_FAN_MIN(index) (0x90 + 2 * (index)) /* High byte */ | 123 | #define W83793_REG_FAN_MIN(index) (0x90 + 2 * (index)) /* High byte */ |
| @@ -203,6 +204,8 @@ struct w83793_data { | |||
| 203 | u8 temp_fan_map[6]; /* Temp controls which pwm fan, bit field */ | 204 | u8 temp_fan_map[6]; /* Temp controls which pwm fan, bit field */ |
| 204 | 205 | ||
| 205 | u8 has_pwm; | 206 | u8 has_pwm; |
| 207 | u8 has_temp; | ||
| 208 | u8 has_vid; | ||
| 206 | u8 pwm_enable; /* Register value, each Temp has 1 bit */ | 209 | u8 pwm_enable; /* Register value, each Temp has 1 bit */ |
| 207 | u8 pwm_uptime; /* Register value */ | 210 | u8 pwm_uptime; /* Register value */ |
| 208 | u8 pwm_downtime; /* Register value */ | 211 | u8 pwm_downtime; /* Register value */ |
| @@ -500,7 +503,7 @@ store_temp(struct device *dev, struct device_attribute *attr, | |||
| 500 | each has 4 mode:(2 bits) | 503 | each has 4 mode:(2 bits) |
| 501 | 0: Stop monitor | 504 | 0: Stop monitor |
| 502 | 1: Use internal temp sensor(default) | 505 | 1: Use internal temp sensor(default) |
| 503 | 2: Use sensor in AMD CPU and get result by AMDSI | 506 | 2: Reserved |
| 504 | 3: Use sensor in Intel CPU and get result by PECI | 507 | 3: Use sensor in Intel CPU and get result by PECI |
| 505 | 508 | ||
| 506 | TR1-TR2 | 509 | TR1-TR2 |
| @@ -509,8 +512,8 @@ store_temp(struct device *dev, struct device_attribute *attr, | |||
| 509 | 1: To enable temp sensors monitor | 512 | 1: To enable temp sensors monitor |
| 510 | */ | 513 | */ |
| 511 | 514 | ||
| 512 | /* 0 disable, 5 AMDSI, 6 PECI */ | 515 | /* 0 disable, 6 PECI */ |
| 513 | static u8 TO_TEMP_MODE[] = { 0, 0, 5, 6 }; | 516 | static u8 TO_TEMP_MODE[] = { 0, 0, 0, 6 }; |
| 514 | 517 | ||
| 515 | static ssize_t | 518 | static ssize_t |
| 516 | show_temp_mode(struct device *dev, struct device_attribute *attr, char *buf) | 519 | show_temp_mode(struct device *dev, struct device_attribute *attr, char *buf) |
| @@ -550,11 +553,10 @@ store_temp_mode(struct device *dev, struct device_attribute *attr, | |||
| 550 | u8 val = simple_strtoul(buf, NULL, 10); | 553 | u8 val = simple_strtoul(buf, NULL, 10); |
| 551 | 554 | ||
| 552 | /* transform the sysfs interface values into table above */ | 555 | /* transform the sysfs interface values into table above */ |
| 553 | if ((val == 5 || val == 6) && (index < 4)) { | 556 | if ((val == 6) && (index < 4)) { |
| 554 | val -= 3; | 557 | val -= 3; |
| 555 | } else if ((val == 3 && index < 4) | 558 | } else if ((val == 3 && index < 4) |
| 556 | || (val == 4 && index >= 4) | 559 | || (val == 4 && index >= 4)) { |
| 557 | || val == 0) { | ||
| 558 | /* transform diode or thermistor into internal enable */ | 560 | /* transform diode or thermistor into internal enable */ |
| 559 | val = !!val; | 561 | val = !!val; |
| 560 | } else { | 562 | } else { |
| @@ -839,7 +841,9 @@ show_in(struct device *dev, struct device_attribute *attr, char *buf) | |||
| 839 | val <<= 2; | 841 | val <<= 2; |
| 840 | val += (data->in_low_bits[nr] >> (index * 2)) & 0x3; | 842 | val += (data->in_low_bits[nr] >> (index * 2)) & 0x3; |
| 841 | } | 843 | } |
| 842 | return sprintf(buf, "%d\n", val * scale_in[index]); | 844 | /* voltage inputs 5VDD and 5VSB needs 150mV offset */ |
| 845 | val = val * scale_in[index] + scale_in_add[index]; | ||
| 846 | return sprintf(buf, "%d\n", val); | ||
| 843 | } | 847 | } |
| 844 | 848 | ||
| 845 | static ssize_t | 849 | static ssize_t |
| @@ -859,6 +863,10 @@ store_in(struct device *dev, struct device_attribute *attr, | |||
| 859 | scale_in[index] / 2) / scale_in[index]; | 863 | scale_in[index] / 2) / scale_in[index]; |
| 860 | mutex_lock(&data->update_lock); | 864 | mutex_lock(&data->update_lock); |
| 861 | if (index > 2) { | 865 | if (index > 2) { |
| 866 | /* fix the limit values of 5VDD and 5VSB to ALARM mechanism */ | ||
| 867 | if (1 == nr || 2 == nr) { | ||
| 868 | val -= scale_in_add[index] / scale_in[index]; | ||
| 869 | } | ||
| 862 | val = SENSORS_LIMIT(val, 0, 255); | 870 | val = SENSORS_LIMIT(val, 0, 255); |
| 863 | } else { | 871 | } else { |
| 864 | val = SENSORS_LIMIT(val, 0, 0x3FF); | 872 | val = SENSORS_LIMIT(val, 0, 0x3FF); |
| @@ -979,12 +987,6 @@ static struct sensor_device_attribute_2 w83793_sensor_attr_2[] = { | |||
| 979 | SENSOR_ATTR_IN(7), | 987 | SENSOR_ATTR_IN(7), |
| 980 | SENSOR_ATTR_IN(8), | 988 | SENSOR_ATTR_IN(8), |
| 981 | SENSOR_ATTR_IN(9), | 989 | SENSOR_ATTR_IN(9), |
| 982 | SENSOR_ATTR_TEMP(1), | ||
| 983 | SENSOR_ATTR_TEMP(2), | ||
| 984 | SENSOR_ATTR_TEMP(3), | ||
| 985 | SENSOR_ATTR_TEMP(4), | ||
| 986 | SENSOR_ATTR_TEMP(5), | ||
| 987 | SENSOR_ATTR_TEMP(6), | ||
| 988 | SENSOR_ATTR_FAN(1), | 990 | SENSOR_ATTR_FAN(1), |
| 989 | SENSOR_ATTR_FAN(2), | 991 | SENSOR_ATTR_FAN(2), |
| 990 | SENSOR_ATTR_FAN(3), | 992 | SENSOR_ATTR_FAN(3), |
| @@ -995,6 +997,15 @@ static struct sensor_device_attribute_2 w83793_sensor_attr_2[] = { | |||
| 995 | SENSOR_ATTR_PWM(3), | 997 | SENSOR_ATTR_PWM(3), |
| 996 | }; | 998 | }; |
| 997 | 999 | ||
| 1000 | static struct sensor_device_attribute_2 w83793_temp[] = { | ||
| 1001 | SENSOR_ATTR_TEMP(1), | ||
| 1002 | SENSOR_ATTR_TEMP(2), | ||
| 1003 | SENSOR_ATTR_TEMP(3), | ||
| 1004 | SENSOR_ATTR_TEMP(4), | ||
| 1005 | SENSOR_ATTR_TEMP(5), | ||
| 1006 | SENSOR_ATTR_TEMP(6), | ||
| 1007 | }; | ||
| 1008 | |||
| 998 | /* Fan6-Fan12 */ | 1009 | /* Fan6-Fan12 */ |
| 999 | static struct sensor_device_attribute_2 w83793_left_fan[] = { | 1010 | static struct sensor_device_attribute_2 w83793_left_fan[] = { |
| 1000 | SENSOR_ATTR_FAN(6), | 1011 | SENSOR_ATTR_FAN(6), |
| @@ -1015,9 +1026,12 @@ static struct sensor_device_attribute_2 w83793_left_pwm[] = { | |||
| 1015 | SENSOR_ATTR_PWM(8), | 1026 | SENSOR_ATTR_PWM(8), |
| 1016 | }; | 1027 | }; |
| 1017 | 1028 | ||
| 1018 | static struct sensor_device_attribute_2 sda_single_files[] = { | 1029 | static struct sensor_device_attribute_2 w83793_vid[] = { |
| 1019 | SENSOR_ATTR_2(cpu0_vid, S_IRUGO, show_vid, NULL, NOT_USED, 0), | 1030 | SENSOR_ATTR_2(cpu0_vid, S_IRUGO, show_vid, NULL, NOT_USED, 0), |
| 1020 | SENSOR_ATTR_2(cpu1_vid, S_IRUGO, show_vid, NULL, NOT_USED, 1), | 1031 | SENSOR_ATTR_2(cpu1_vid, S_IRUGO, show_vid, NULL, NOT_USED, 1), |
| 1032 | }; | ||
| 1033 | |||
| 1034 | static struct sensor_device_attribute_2 sda_single_files[] = { | ||
| 1021 | SENSOR_ATTR_2(vrm, S_IWUSR | S_IRUGO, show_vrm, store_vrm, | 1035 | SENSOR_ATTR_2(vrm, S_IWUSR | S_IRUGO, show_vrm, store_vrm, |
| 1022 | NOT_USED, NOT_USED), | 1036 | NOT_USED, NOT_USED), |
| 1023 | SENSOR_ATTR_2(chassis, S_IWUSR | S_IRUGO, show_alarm_beep, | 1037 | SENSOR_ATTR_2(chassis, S_IWUSR | S_IRUGO, show_alarm_beep, |
| @@ -1070,11 +1084,17 @@ static int w83793_detach_client(struct i2c_client *client) | |||
| 1070 | for (i = 0; i < ARRAY_SIZE(sda_single_files); i++) | 1084 | for (i = 0; i < ARRAY_SIZE(sda_single_files); i++) |
| 1071 | device_remove_file(dev, &sda_single_files[i].dev_attr); | 1085 | device_remove_file(dev, &sda_single_files[i].dev_attr); |
| 1072 | 1086 | ||
| 1087 | for (i = 0; i < ARRAY_SIZE(w83793_vid); i++) | ||
| 1088 | device_remove_file(dev, &w83793_vid[i].dev_attr); | ||
| 1089 | |||
| 1073 | for (i = 0; i < ARRAY_SIZE(w83793_left_fan); i++) | 1090 | for (i = 0; i < ARRAY_SIZE(w83793_left_fan); i++) |
| 1074 | device_remove_file(dev, &w83793_left_fan[i].dev_attr); | 1091 | device_remove_file(dev, &w83793_left_fan[i].dev_attr); |
| 1075 | 1092 | ||
| 1076 | for (i = 0; i < ARRAY_SIZE(w83793_left_pwm); i++) | 1093 | for (i = 0; i < ARRAY_SIZE(w83793_left_pwm); i++) |
| 1077 | device_remove_file(dev, &w83793_left_pwm[i].dev_attr); | 1094 | device_remove_file(dev, &w83793_left_pwm[i].dev_attr); |
| 1095 | |||
| 1096 | for (i = 0; i < ARRAY_SIZE(w83793_temp); i++) | ||
| 1097 | device_remove_file(dev, &w83793_temp[i].dev_attr); | ||
| 1078 | } | 1098 | } |
| 1079 | 1099 | ||
| 1080 | if ((err = i2c_detach_client(client))) | 1100 | if ((err = i2c_detach_client(client))) |
| @@ -1187,6 +1207,7 @@ static int w83793_detect(struct i2c_adapter *adapter, int address, int kind) | |||
| 1187 | struct w83793_data *data; | 1207 | struct w83793_data *data; |
| 1188 | int files_fan = ARRAY_SIZE(w83793_left_fan) / 7; | 1208 | int files_fan = ARRAY_SIZE(w83793_left_fan) / 7; |
| 1189 | int files_pwm = ARRAY_SIZE(w83793_left_pwm) / 5; | 1209 | int files_pwm = ARRAY_SIZE(w83793_left_pwm) / 5; |
| 1210 | int files_temp = ARRAY_SIZE(w83793_temp) / 6; | ||
| 1190 | int err = 0; | 1211 | int err = 0; |
| 1191 | 1212 | ||
| 1192 | if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_BYTE_DATA)) { | 1213 | if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_BYTE_DATA)) { |
| @@ -1313,6 +1334,44 @@ static int w83793_detect(struct i2c_adapter *adapter, int address, int kind) | |||
| 1313 | data->has_pwm |= 0x80; | 1334 | data->has_pwm |= 0x80; |
| 1314 | } | 1335 | } |
| 1315 | 1336 | ||
| 1337 | tmp = w83793_read_value(client, W83793_REG_FANIN_SEL); | ||
| 1338 | if ((tmp & 0x01) && (val & 0x08)) { /* fan 9, second location */ | ||
| 1339 | data->has_fan |= 0x100; | ||
| 1340 | } | ||
| 1341 | if ((tmp & 0x02) && (val & 0x10)) { /* fan 10, second location */ | ||
| 1342 | data->has_fan |= 0x200; | ||
| 1343 | } | ||
| 1344 | if ((tmp & 0x04) && (val & 0x20)) { /* fan 11, second location */ | ||
| 1345 | data->has_fan |= 0x400; | ||
| 1346 | } | ||
| 1347 | if ((tmp & 0x08) && (val & 0x40)) { /* fan 12, second location */ | ||
| 1348 | data->has_fan |= 0x800; | ||
| 1349 | } | ||
| 1350 | |||
| 1351 | /* check the temp1-6 mode, ignore former AMDSI selected inputs */ | ||
| 1352 | tmp = w83793_read_value(client,W83793_REG_TEMP_MODE[0]); | ||
| 1353 | if (tmp & 0x01) | ||
| 1354 | data->has_temp |= 0x01; | ||
| 1355 | if (tmp & 0x04) | ||
| 1356 | data->has_temp |= 0x02; | ||
| 1357 | if (tmp & 0x10) | ||
| 1358 | data->has_temp |= 0x04; | ||
| 1359 | if (tmp & 0x40) | ||
| 1360 | data->has_temp |= 0x08; | ||
| 1361 | |||
| 1362 | tmp = w83793_read_value(client,W83793_REG_TEMP_MODE[1]); | ||
| 1363 | if (tmp & 0x01) | ||
| 1364 | data->has_temp |= 0x10; | ||
| 1365 | if (tmp & 0x02) | ||
| 1366 | data->has_temp |= 0x20; | ||
| 1367 | |||
| 1368 | /* Detect the VID usage and ignore unused input */ | ||
| 1369 | tmp = w83793_read_value(client, W83793_REG_MFC); | ||
| 1370 | if (!(tmp & 0x29)) | ||
| 1371 | data->has_vid |= 0x1; /* has VIDA */ | ||
| 1372 | if (tmp & 0x80) | ||
| 1373 | data->has_vid |= 0x2; /* has VIDB */ | ||
| 1374 | |||
| 1316 | /* Register sysfs hooks */ | 1375 | /* Register sysfs hooks */ |
| 1317 | for (i = 0; i < ARRAY_SIZE(w83793_sensor_attr_2); i++) { | 1376 | for (i = 0; i < ARRAY_SIZE(w83793_sensor_attr_2); i++) { |
| 1318 | err = device_create_file(dev, | 1377 | err = device_create_file(dev, |
| @@ -1321,6 +1380,14 @@ static int w83793_detect(struct i2c_adapter *adapter, int address, int kind) | |||
| 1321 | goto exit_remove; | 1380 | goto exit_remove; |
| 1322 | } | 1381 | } |
| 1323 | 1382 | ||
| 1383 | for (i = 0; i < ARRAY_SIZE(w83793_vid); i++) { | ||
| 1384 | if (!(data->has_vid & (1 << i))) | ||
| 1385 | continue; | ||
| 1386 | err = device_create_file(dev, &w83793_vid[i].dev_attr); | ||
| 1387 | if (err) | ||
| 1388 | goto exit_remove; | ||
| 1389 | } | ||
| 1390 | |||
| 1324 | for (i = 0; i < ARRAY_SIZE(sda_single_files); i++) { | 1391 | for (i = 0; i < ARRAY_SIZE(sda_single_files); i++) { |
| 1325 | err = device_create_file(dev, &sda_single_files[i].dev_attr); | 1392 | err = device_create_file(dev, &sda_single_files[i].dev_attr); |
| 1326 | if (err) | 1393 | if (err) |
| @@ -1328,6 +1395,19 @@ static int w83793_detect(struct i2c_adapter *adapter, int address, int kind) | |||
| 1328 | 1395 | ||
| 1329 | } | 1396 | } |
| 1330 | 1397 | ||
| 1398 | for (i = 0; i < 6; i++) { | ||
| 1399 | int j; | ||
| 1400 | if (!(data->has_temp & (1 << i))) | ||
| 1401 | continue; | ||
| 1402 | for (j = 0; j < files_temp; j++) { | ||
| 1403 | err = device_create_file(dev, | ||
| 1404 | &w83793_temp[(i) * files_temp | ||
| 1405 | + j].dev_attr); | ||
| 1406 | if (err) | ||
| 1407 | goto exit_remove; | ||
| 1408 | } | ||
| 1409 | } | ||
| 1410 | |||
| 1331 | for (i = 5; i < 12; i++) { | 1411 | for (i = 5; i < 12; i++) { |
| 1332 | int j; | 1412 | int j; |
| 1333 | if (!(data->has_fan & (1 << i))) | 1413 | if (!(data->has_fan & (1 << i))) |
| @@ -1371,12 +1451,18 @@ exit_remove: | |||
| 1371 | for (i = 0; i < ARRAY_SIZE(sda_single_files); i++) | 1451 | for (i = 0; i < ARRAY_SIZE(sda_single_files); i++) |
| 1372 | device_remove_file(dev, &sda_single_files[i].dev_attr); | 1452 | device_remove_file(dev, &sda_single_files[i].dev_attr); |
| 1373 | 1453 | ||
| 1454 | for (i = 0; i < ARRAY_SIZE(w83793_vid); i++) | ||
| 1455 | device_remove_file(dev, &w83793_vid[i].dev_attr); | ||
| 1456 | |||
| 1374 | for (i = 0; i < ARRAY_SIZE(w83793_left_fan); i++) | 1457 | for (i = 0; i < ARRAY_SIZE(w83793_left_fan); i++) |
| 1375 | device_remove_file(dev, &w83793_left_fan[i].dev_attr); | 1458 | device_remove_file(dev, &w83793_left_fan[i].dev_attr); |
| 1376 | 1459 | ||
| 1377 | for (i = 0; i < ARRAY_SIZE(w83793_left_pwm); i++) | 1460 | for (i = 0; i < ARRAY_SIZE(w83793_left_pwm); i++) |
| 1378 | device_remove_file(dev, &w83793_left_pwm[i].dev_attr); | 1461 | device_remove_file(dev, &w83793_left_pwm[i].dev_attr); |
| 1379 | 1462 | ||
| 1463 | for (i = 0; i < ARRAY_SIZE(w83793_temp); i++) | ||
| 1464 | device_remove_file(dev, &w83793_temp[i].dev_attr); | ||
| 1465 | |||
| 1380 | if (data->lm75[0] != NULL) { | 1466 | if (data->lm75[0] != NULL) { |
| 1381 | i2c_detach_client(data->lm75[0]); | 1467 | i2c_detach_client(data->lm75[0]); |
| 1382 | kfree(data->lm75[0]); | 1468 | kfree(data->lm75[0]); |
| @@ -1428,6 +1514,8 @@ static void w83793_update_nonvolatile(struct device *dev) | |||
| 1428 | } | 1514 | } |
| 1429 | 1515 | ||
| 1430 | for (i = 0; i < ARRAY_SIZE(data->temp_fan_map); i++) { | 1516 | for (i = 0; i < ARRAY_SIZE(data->temp_fan_map); i++) { |
| 1517 | if (!(data->has_temp & (1 << i))) | ||
| 1518 | continue; | ||
| 1431 | data->temp_fan_map[i] = | 1519 | data->temp_fan_map[i] = |
| 1432 | w83793_read_value(client, W83793_REG_TEMP_FAN_MAP(i)); | 1520 | w83793_read_value(client, W83793_REG_TEMP_FAN_MAP(i)); |
| 1433 | for (j = 1; j < 5; j++) { | 1521 | for (j = 1; j < 5; j++) { |
| @@ -1510,9 +1598,12 @@ static struct w83793_data *w83793_update_device(struct device *dev) | |||
| 1510 | w83793_read_value(client, W83793_REG_FAN(i) + 1); | 1598 | w83793_read_value(client, W83793_REG_FAN(i) + 1); |
| 1511 | } | 1599 | } |
| 1512 | 1600 | ||
| 1513 | for (i = 0; i < ARRAY_SIZE(data->temp); i++) | 1601 | for (i = 0; i < ARRAY_SIZE(data->temp); i++) { |
| 1602 | if (!(data->has_temp & (1 << i))) | ||
| 1603 | continue; | ||
| 1514 | data->temp[i][TEMP_READ] = | 1604 | data->temp[i][TEMP_READ] = |
| 1515 | w83793_read_value(client, W83793_REG_TEMP[i][TEMP_READ]); | 1605 | w83793_read_value(client, W83793_REG_TEMP[i][TEMP_READ]); |
| 1606 | } | ||
| 1516 | 1607 | ||
| 1517 | data->temp_low_bits = | 1608 | data->temp_low_bits = |
| 1518 | w83793_read_value(client, W83793_REG_TEMP_LOW_BITS); | 1609 | w83793_read_value(client, W83793_REG_TEMP_LOW_BITS); |
| @@ -1527,8 +1618,10 @@ static struct w83793_data *w83793_update_device(struct device *dev) | |||
| 1527 | for (i = 0; i < ARRAY_SIZE(data->alarms); i++) | 1618 | for (i = 0; i < ARRAY_SIZE(data->alarms); i++) |
| 1528 | data->alarms[i] = | 1619 | data->alarms[i] = |
| 1529 | w83793_read_value(client, W83793_REG_ALARM(i)); | 1620 | w83793_read_value(client, W83793_REG_ALARM(i)); |
| 1530 | data->vid[0] = w83793_read_value(client, W83793_REG_VID_INA); | 1621 | if (data->has_vid & 0x01) |
| 1531 | data->vid[1] = w83793_read_value(client, W83793_REG_VID_INB); | 1622 | data->vid[0] = w83793_read_value(client, W83793_REG_VID_INA); |
| 1623 | if (data->has_vid & 0x02) | ||
| 1624 | data->vid[1] = w83793_read_value(client, W83793_REG_VID_INB); | ||
| 1532 | w83793_update_nonvolatile(dev); | 1625 | w83793_update_nonvolatile(dev); |
| 1533 | data->last_updated = jiffies; | 1626 | data->last_updated = jiffies; |
| 1534 | data->valid = 1; | 1627 | data->valid = 1; |
diff --git a/drivers/media/video/cx88/cx88-tvaudio.c b/drivers/media/video/cx88/cx88-tvaudio.c index 3482e0114d43..2bd84d351a18 100644 --- a/drivers/media/video/cx88/cx88-tvaudio.c +++ b/drivers/media/video/cx88/cx88-tvaudio.c | |||
| @@ -38,6 +38,7 @@ | |||
| 38 | #include <linux/module.h> | 38 | #include <linux/module.h> |
| 39 | #include <linux/moduleparam.h> | 39 | #include <linux/moduleparam.h> |
| 40 | #include <linux/errno.h> | 40 | #include <linux/errno.h> |
| 41 | #include <linux/freezer.h> | ||
| 41 | #include <linux/kernel.h> | 42 | #include <linux/kernel.h> |
| 42 | #include <linux/slab.h> | 43 | #include <linux/slab.h> |
| 43 | #include <linux/mm.h> | 44 | #include <linux/mm.h> |
| @@ -961,6 +962,7 @@ int cx88_audio_thread(void *data) | |||
| 961 | msleep_interruptible(1000); | 962 | msleep_interruptible(1000); |
| 962 | if (kthread_should_stop()) | 963 | if (kthread_should_stop()) |
| 963 | break; | 964 | break; |
| 965 | try_to_freeze(); | ||
| 964 | 966 | ||
| 965 | /* just monitor the audio status for now ... */ | 967 | /* just monitor the audio status for now ... */ |
| 966 | memset(&t, 0, sizeof(t)); | 968 | memset(&t, 0, sizeof(t)); |
diff --git a/drivers/media/video/ks0127.c b/drivers/media/video/ks0127.c index c1a377f797d9..b6cd21e6dab9 100644 --- a/drivers/media/video/ks0127.c +++ b/drivers/media/video/ks0127.c | |||
| @@ -712,13 +712,13 @@ static int ks0127_command(struct i2c_client *client, | |||
| 712 | *iarg = 0; | 712 | *iarg = 0; |
| 713 | status = ks0127_read(ks, KS_STAT); | 713 | status = ks0127_read(ks, KS_STAT); |
| 714 | if (!(status & 0x20)) /* NOVID not set */ | 714 | if (!(status & 0x20)) /* NOVID not set */ |
| 715 | *iarg = (*iarg & DECODER_STATUS_GOOD); | 715 | *iarg = (*iarg | DECODER_STATUS_GOOD); |
| 716 | if ((status & 0x01)) /* CLOCK set */ | 716 | if ((status & 0x01)) /* CLOCK set */ |
| 717 | *iarg = (*iarg & DECODER_STATUS_COLOR); | 717 | *iarg = (*iarg | DECODER_STATUS_COLOR); |
| 718 | if ((status & 0x08)) /* PALDET set */ | 718 | if ((status & 0x08)) /* PALDET set */ |
| 719 | *iarg = (*iarg & DECODER_STATUS_PAL); | 719 | *iarg = (*iarg | DECODER_STATUS_PAL); |
| 720 | else | 720 | else |
| 721 | *iarg = (*iarg & DECODER_STATUS_NTSC); | 721 | *iarg = (*iarg | DECODER_STATUS_NTSC); |
| 722 | break; | 722 | break; |
| 723 | 723 | ||
| 724 | //Catch any unknown command | 724 | //Catch any unknown command |
diff --git a/drivers/media/video/saa7134/saa7134-cards.c b/drivers/media/video/saa7134/saa7134-cards.c index 4dead84aff46..ae984bbe36b6 100644 --- a/drivers/media/video/saa7134/saa7134-cards.c +++ b/drivers/media/video/saa7134/saa7134-cards.c | |||
| @@ -2570,6 +2570,7 @@ struct saa7134_board saa7134_boards[] = { | |||
| 2570 | .radio_type = UNSET, | 2570 | .radio_type = UNSET, |
| 2571 | .tuner_addr = ADDR_UNSET, | 2571 | .tuner_addr = ADDR_UNSET, |
| 2572 | .radio_addr = ADDR_UNSET, | 2572 | .radio_addr = ADDR_UNSET, |
| 2573 | .gpiomask = 1 << 21, | ||
| 2573 | .inputs = {{ | 2574 | .inputs = {{ |
| 2574 | .name = name_tv, | 2575 | .name = name_tv, |
| 2575 | .vmux = 1, | 2576 | .vmux = 1, |
| @@ -2578,15 +2579,20 @@ struct saa7134_board saa7134_boards[] = { | |||
| 2578 | },{ | 2579 | },{ |
| 2579 | .name = name_comp1, | 2580 | .name = name_comp1, |
| 2580 | .vmux = 3, | 2581 | .vmux = 3, |
| 2581 | .amux = LINE1, | 2582 | .amux = LINE2, /* unconfirmed, taken from Philips driver */ |
| 2583 | },{ | ||
| 2584 | .name = name_comp2, | ||
| 2585 | .vmux = 0, /* untested, Composite over S-Video */ | ||
| 2586 | .amux = LINE2, | ||
| 2582 | },{ | 2587 | },{ |
| 2583 | .name = name_svideo, | 2588 | .name = name_svideo, |
| 2584 | .vmux = 0, | 2589 | .vmux = 8, |
| 2585 | .amux = LINE1, | 2590 | .amux = LINE2, |
| 2586 | }}, | 2591 | }}, |
| 2587 | .radio = { | 2592 | .radio = { |
| 2588 | .name = name_radio, | 2593 | .name = name_radio, |
| 2589 | .amux = LINE1, | 2594 | .amux = TV, |
| 2595 | .gpio = 0x0200000, | ||
| 2590 | }, | 2596 | }, |
| 2591 | }, | 2597 | }, |
| 2592 | [SAA7134_BOARD_CINERGY250PCI] = { | 2598 | [SAA7134_BOARD_CINERGY250PCI] = { |
diff --git a/drivers/media/video/tveeprom.c b/drivers/media/video/tveeprom.c index 2624e3f7dd29..4e7c1fa668d3 100644 --- a/drivers/media/video/tveeprom.c +++ b/drivers/media/video/tveeprom.c | |||
| @@ -184,7 +184,7 @@ hauppauge_tuner[] = | |||
| 184 | { TUNER_ABSENT, "Thompson DTT757"}, | 184 | { TUNER_ABSENT, "Thompson DTT757"}, |
| 185 | /* 80-89 */ | 185 | /* 80-89 */ |
| 186 | { TUNER_ABSENT, "Philips FQ1216LME MK3"}, | 186 | { TUNER_ABSENT, "Philips FQ1216LME MK3"}, |
| 187 | { TUNER_ABSENT, "LG TAPC G701D"}, | 187 | { TUNER_LG_PAL_NEW_TAPC, "LG TAPC G701D"}, |
| 188 | { TUNER_LG_NTSC_NEW_TAPC, "LG TAPC H791F"}, | 188 | { TUNER_LG_NTSC_NEW_TAPC, "LG TAPC H791F"}, |
| 189 | { TUNER_LG_PAL_NEW_TAPC, "TCL 2002MB 3"}, | 189 | { TUNER_LG_PAL_NEW_TAPC, "TCL 2002MB 3"}, |
| 190 | { TUNER_LG_PAL_NEW_TAPC, "TCL 2002MI 3"}, | 190 | { TUNER_LG_PAL_NEW_TAPC, "TCL 2002MI 3"}, |
diff --git a/drivers/media/video/usbvideo/quickcam_messenger.h b/drivers/media/video/usbvideo/quickcam_messenger.h index baab9c081b52..17ace394d981 100644 --- a/drivers/media/video/usbvideo/quickcam_messenger.h +++ b/drivers/media/video/usbvideo/quickcam_messenger.h | |||
| @@ -35,27 +35,13 @@ struct rgb { | |||
| 35 | }; | 35 | }; |
| 36 | 36 | ||
| 37 | struct bayL0 { | 37 | struct bayL0 { |
| 38 | #ifdef __BIG_ENDIAN | ||
| 39 | u8 r; | ||
| 40 | u8 g; | ||
| 41 | #elif __LITTLE_ENDIAN | ||
| 42 | u8 g; | 38 | u8 g; |
| 43 | u8 r; | 39 | u8 r; |
| 44 | #else | ||
| 45 | #error not byte order defined | ||
| 46 | #endif | ||
| 47 | }; | 40 | }; |
| 48 | 41 | ||
| 49 | struct bayL1 { | 42 | struct bayL1 { |
| 50 | #ifdef __BIG_ENDIAN | ||
| 51 | u8 g; | ||
| 52 | u8 b; | ||
| 53 | #elif __LITTLE_ENDIAN | ||
| 54 | u8 b; | 43 | u8 b; |
| 55 | u8 g; | 44 | u8 g; |
| 56 | #else | ||
| 57 | #error not byte order defined | ||
| 58 | #endif | ||
| 59 | }; | 45 | }; |
| 60 | 46 | ||
| 61 | struct cam_size { | 47 | struct cam_size { |
diff --git a/drivers/media/video/usbvision/usbvision-video.c b/drivers/media/video/usbvision/usbvision-video.c index 8c7eba2a728e..7243337b771a 100644 --- a/drivers/media/video/usbvision/usbvision-video.c +++ b/drivers/media/video/usbvision/usbvision-video.c | |||
| @@ -1080,7 +1080,6 @@ static ssize_t usbvision_v4l2_read(struct file *file, char *buf, | |||
| 1080 | int noblock = file->f_flags & O_NONBLOCK; | 1080 | int noblock = file->f_flags & O_NONBLOCK; |
| 1081 | unsigned long lock_flags; | 1081 | unsigned long lock_flags; |
| 1082 | 1082 | ||
| 1083 | int frmx = -1; | ||
| 1084 | int ret,i; | 1083 | int ret,i; |
| 1085 | struct usbvision_frame *frame; | 1084 | struct usbvision_frame *frame; |
| 1086 | 1085 | ||
| @@ -1155,7 +1154,7 @@ static ssize_t usbvision_v4l2_read(struct file *file, char *buf, | |||
| 1155 | frame->bytes_read = 0; | 1154 | frame->bytes_read = 0; |
| 1156 | 1155 | ||
| 1157 | /* Mark it as available to be used again. */ | 1156 | /* Mark it as available to be used again. */ |
| 1158 | usbvision->frame[frmx].grabstate = FrameState_Unused; | 1157 | frame->grabstate = FrameState_Unused; |
| 1159 | /* } */ | 1158 | /* } */ |
| 1160 | 1159 | ||
| 1161 | return count; | 1160 | return count; |
diff --git a/drivers/media/video/v4l2-common.c b/drivers/media/video/v4l2-common.c index 752c82c37f55..b87d571e0463 100644 --- a/drivers/media/video/v4l2-common.c +++ b/drivers/media/video/v4l2-common.c | |||
| @@ -90,8 +90,15 @@ MODULE_LICENSE("GPL"); | |||
| 90 | char *v4l2_norm_to_name(v4l2_std_id id) | 90 | char *v4l2_norm_to_name(v4l2_std_id id) |
| 91 | { | 91 | { |
| 92 | char *name; | 92 | char *name; |
| 93 | u32 myid = id; | ||
| 93 | 94 | ||
| 94 | switch (id) { | 95 | /* HACK: ppc32 architecture doesn't have __ucmpdi2 function to handle |
| 96 | 64 bit comparations. So, on that architecture, with some gcc variants, | ||
| 97 | compilation fails. Currently, the max value is 30bit wide. | ||
| 98 | */ | ||
| 99 | BUG_ON(myid != id); | ||
| 100 | |||
| 101 | switch (myid) { | ||
| 95 | case V4L2_STD_PAL: | 102 | case V4L2_STD_PAL: |
| 96 | name="PAL"; break; | 103 | name="PAL"; break; |
| 97 | case V4L2_STD_PAL_BG: | 104 | case V4L2_STD_PAL_BG: |
diff --git a/drivers/media/video/video-buf.c b/drivers/media/video/video-buf.c index f429f49901b9..635d102c86f0 100644 --- a/drivers/media/video/video-buf.c +++ b/drivers/media/video/video-buf.c | |||
| @@ -1229,7 +1229,7 @@ videobuf_vm_nopage(struct vm_area_struct *vma, unsigned long vaddr, | |||
| 1229 | vaddr,vma->vm_start,vma->vm_end); | 1229 | vaddr,vma->vm_start,vma->vm_end); |
| 1230 | if (vaddr > vma->vm_end) | 1230 | if (vaddr > vma->vm_end) |
| 1231 | return NOPAGE_SIGBUS; | 1231 | return NOPAGE_SIGBUS; |
| 1232 | page = alloc_page(GFP_USER); | 1232 | page = alloc_page(GFP_USER | __GFP_DMA32); |
| 1233 | if (!page) | 1233 | if (!page) |
| 1234 | return NOPAGE_OOM; | 1234 | return NOPAGE_OOM; |
| 1235 | clear_user_page(page_address(page), vaddr, page); | 1235 | clear_user_page(page_address(page), vaddr, page); |
diff --git a/drivers/media/video/vivi.c b/drivers/media/video/vivi.c index bacb311b4f24..d4cf55666731 100644 --- a/drivers/media/video/vivi.c +++ b/drivers/media/video/vivi.c | |||
| @@ -270,10 +270,15 @@ static void gen_line(struct sg_to_addr to_addr[],int inipos,int pages,int wmax, | |||
| 270 | char *p,*s,*basep; | 270 | char *p,*s,*basep; |
| 271 | struct page *pg; | 271 | struct page *pg; |
| 272 | u8 chr,r,g,b,color; | 272 | u8 chr,r,g,b,color; |
| 273 | unsigned long flags; | ||
| 274 | spinlock_t spinlock; | ||
| 275 | |||
| 276 | spin_lock_init(&spinlock); | ||
| 273 | 277 | ||
| 274 | /* Get first addr pointed to pixel position */ | 278 | /* Get first addr pointed to pixel position */ |
| 275 | oldpg=get_addr_pos(pos,pages,to_addr); | 279 | oldpg=get_addr_pos(pos,pages,to_addr); |
| 276 | pg=pfn_to_page(sg_dma_address(to_addr[oldpg].sg) >> PAGE_SHIFT); | 280 | pg=pfn_to_page(sg_dma_address(to_addr[oldpg].sg) >> PAGE_SHIFT); |
| 281 | spin_lock_irqsave(&spinlock,flags); | ||
| 277 | basep = kmap_atomic(pg, KM_BOUNCE_READ)+to_addr[oldpg].sg->offset; | 282 | basep = kmap_atomic(pg, KM_BOUNCE_READ)+to_addr[oldpg].sg->offset; |
| 278 | 283 | ||
| 279 | /* We will just duplicate the second pixel at the packet */ | 284 | /* We will just duplicate the second pixel at the packet */ |
| @@ -376,6 +381,8 @@ static void gen_line(struct sg_to_addr to_addr[],int inipos,int pages,int wmax, | |||
| 376 | 381 | ||
| 377 | end: | 382 | end: |
| 378 | kunmap_atomic(basep, KM_BOUNCE_READ); | 383 | kunmap_atomic(basep, KM_BOUNCE_READ); |
| 384 | spin_unlock_irqrestore(&spinlock,flags); | ||
| 385 | |||
| 379 | } | 386 | } |
| 380 | static void vivi_fillbuff(struct vivi_dev *dev,struct vivi_buffer *buf) | 387 | static void vivi_fillbuff(struct vivi_dev *dev,struct vivi_buffer *buf) |
| 381 | { | 388 | { |
diff --git a/drivers/message/fusion/mptbase.c b/drivers/message/fusion/mptbase.c index 6e068cf1049b..b3f28a03b6a9 100644 --- a/drivers/message/fusion/mptbase.c +++ b/drivers/message/fusion/mptbase.c | |||
| @@ -5,7 +5,7 @@ | |||
| 5 | * For use with LSI Logic PCI chip/adapter(s) | 5 | * For use with LSI Logic PCI chip/adapter(s) |
| 6 | * running LSI Logic Fusion MPT (Message Passing Technology) firmware. | 6 | * running LSI Logic Fusion MPT (Message Passing Technology) firmware. |
| 7 | * | 7 | * |
| 8 | * Copyright (c) 1999-2005 LSI Logic Corporation | 8 | * Copyright (c) 1999-2007 LSI Logic Corporation |
| 9 | * (mailto:mpt_linux_developer@lsil.com) | 9 | * (mailto:mpt_linux_developer@lsil.com) |
| 10 | * | 10 | * |
| 11 | */ | 11 | */ |
| @@ -73,6 +73,7 @@ | |||
| 73 | MODULE_AUTHOR(MODULEAUTHOR); | 73 | MODULE_AUTHOR(MODULEAUTHOR); |
| 74 | MODULE_DESCRIPTION(my_NAME); | 74 | MODULE_DESCRIPTION(my_NAME); |
| 75 | MODULE_LICENSE("GPL"); | 75 | MODULE_LICENSE("GPL"); |
| 76 | MODULE_VERSION(my_VERSION); | ||
| 76 | 77 | ||
| 77 | /* | 78 | /* |
| 78 | * cmd line parameters | 79 | * cmd line parameters |
diff --git a/drivers/message/fusion/mptbase.h b/drivers/message/fusion/mptbase.h index a4afad4ecab2..e316708f76bd 100644 --- a/drivers/message/fusion/mptbase.h +++ b/drivers/message/fusion/mptbase.h | |||
| @@ -5,7 +5,7 @@ | |||
| 5 | * LSIFC9xx/LSI409xx Fibre Channel | 5 | * LSIFC9xx/LSI409xx Fibre Channel |
| 6 | * running LSI Logic Fusion MPT (Message Passing Technology) firmware. | 6 | * running LSI Logic Fusion MPT (Message Passing Technology) firmware. |
| 7 | * | 7 | * |
| 8 | * Copyright (c) 1999-2005 LSI Logic Corporation | 8 | * Copyright (c) 1999-2007 LSI Logic Corporation |
| 9 | * (mailto:mpt_linux_developer@lsil.com) | 9 | * (mailto:mpt_linux_developer@lsil.com) |
| 10 | * | 10 | * |
| 11 | */ | 11 | */ |
| @@ -72,11 +72,11 @@ | |||
| 72 | #endif | 72 | #endif |
| 73 | 73 | ||
| 74 | #ifndef COPYRIGHT | 74 | #ifndef COPYRIGHT |
| 75 | #define COPYRIGHT "Copyright (c) 1999-2005 " MODULEAUTHOR | 75 | #define COPYRIGHT "Copyright (c) 1999-2007 " MODULEAUTHOR |
| 76 | #endif | 76 | #endif |
| 77 | 77 | ||
| 78 | #define MPT_LINUX_VERSION_COMMON "3.04.02" | 78 | #define MPT_LINUX_VERSION_COMMON "3.04.03" |
| 79 | #define MPT_LINUX_PACKAGE_NAME "@(#)mptlinux-3.04.02" | 79 | #define MPT_LINUX_PACKAGE_NAME "@(#)mptlinux-3.04.03" |
| 80 | #define WHAT_MAGIC_STRING "@" "(" "#" ")" | 80 | #define WHAT_MAGIC_STRING "@" "(" "#" ")" |
| 81 | 81 | ||
| 82 | #define show_mptmod_ver(s,ver) \ | 82 | #define show_mptmod_ver(s,ver) \ |
| @@ -1059,7 +1059,7 @@ extern int mpt_stm_index; /* needed by mptstm.c */ | |||
| 1059 | /*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/ | 1059 | /*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/ |
| 1060 | #endif /* } __KERNEL__ */ | 1060 | #endif /* } __KERNEL__ */ |
| 1061 | 1061 | ||
| 1062 | #if defined(__alpha__) || defined(__sparc_v9__) || defined(__ia64__) || defined(__x86_64__) | 1062 | #if defined(__alpha__) || defined(__sparc_v9__) || defined(__ia64__) || defined(__x86_64__) || defined(__powerpc__) |
| 1063 | #define CAST_U32_TO_PTR(x) ((void *)(u64)x) | 1063 | #define CAST_U32_TO_PTR(x) ((void *)(u64)x) |
| 1064 | #define CAST_PTR_TO_U32(x) ((u32)(u64)x) | 1064 | #define CAST_PTR_TO_U32(x) ((u32)(u64)x) |
| 1065 | #else | 1065 | #else |
diff --git a/drivers/message/fusion/mptctl.c b/drivers/message/fusion/mptctl.c index 30975ccd9947..504632da4347 100644 --- a/drivers/message/fusion/mptctl.c +++ b/drivers/message/fusion/mptctl.c | |||
| @@ -4,7 +4,7 @@ | |||
| 4 | * For use with LSI Logic PCI chip/adapters | 4 | * For use with LSI Logic PCI chip/adapters |
| 5 | * running LSI Logic Fusion MPT (Message Passing Technology) firmware. | 5 | * running LSI Logic Fusion MPT (Message Passing Technology) firmware. |
| 6 | * | 6 | * |
| 7 | * Copyright (c) 1999-2005 LSI Logic Corporation | 7 | * Copyright (c) 1999-2007 LSI Logic Corporation |
| 8 | * (mailto:mpt_linux_developer@lsil.com) | 8 | * (mailto:mpt_linux_developer@lsil.com) |
| 9 | * | 9 | * |
| 10 | */ | 10 | */ |
| @@ -66,7 +66,7 @@ | |||
| 66 | #include <scsi/scsi_host.h> | 66 | #include <scsi/scsi_host.h> |
| 67 | #include <scsi/scsi_tcq.h> | 67 | #include <scsi/scsi_tcq.h> |
| 68 | 68 | ||
| 69 | #define COPYRIGHT "Copyright (c) 1999-2005 LSI Logic Corporation" | 69 | #define COPYRIGHT "Copyright (c) 1999-2007 LSI Logic Corporation" |
| 70 | #define MODULEAUTHOR "LSI Logic Corporation" | 70 | #define MODULEAUTHOR "LSI Logic Corporation" |
| 71 | #include "mptbase.h" | 71 | #include "mptbase.h" |
| 72 | #include "mptctl.h" | 72 | #include "mptctl.h" |
| @@ -79,6 +79,7 @@ | |||
| 79 | MODULE_AUTHOR(MODULEAUTHOR); | 79 | MODULE_AUTHOR(MODULEAUTHOR); |
| 80 | MODULE_DESCRIPTION(my_NAME); | 80 | MODULE_DESCRIPTION(my_NAME); |
| 81 | MODULE_LICENSE("GPL"); | 81 | MODULE_LICENSE("GPL"); |
| 82 | MODULE_VERSION(my_VERSION); | ||
| 82 | 83 | ||
| 83 | /*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/ | 84 | /*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/ |
| 84 | 85 | ||
diff --git a/drivers/message/fusion/mptctl.h b/drivers/message/fusion/mptctl.h index 043941882c6e..e65a1cf5eb0b 100644 --- a/drivers/message/fusion/mptctl.h +++ b/drivers/message/fusion/mptctl.h | |||
| @@ -5,7 +5,7 @@ | |||
| 5 | * LSIFC9xx/LSI409xx Fibre Channel | 5 | * LSIFC9xx/LSI409xx Fibre Channel |
| 6 | * running LSI Logic Fusion MPT (Message Passing Technology) firmware. | 6 | * running LSI Logic Fusion MPT (Message Passing Technology) firmware. |
| 7 | * | 7 | * |
| 8 | * Copyright (c) 1999-2005 LSI Logic Corporation | 8 | * Copyright (c) 1999-2007 LSI Logic Corporation |
| 9 | * (mailto:mpt_linux_developer@lsil.com) | 9 | * (mailto:mpt_linux_developer@lsil.com) |
| 10 | * | 10 | * |
| 11 | */ | 11 | */ |
diff --git a/drivers/message/fusion/mptfc.c b/drivers/message/fusion/mptfc.c index ca2f9107f145..c819c23b55b1 100644 --- a/drivers/message/fusion/mptfc.c +++ b/drivers/message/fusion/mptfc.c | |||
| @@ -3,7 +3,7 @@ | |||
| 3 | * For use with LSI Logic PCI chip/adapter(s) | 3 | * For use with LSI Logic PCI chip/adapter(s) |
| 4 | * running LSI Logic Fusion MPT (Message Passing Technology) firmware. | 4 | * running LSI Logic Fusion MPT (Message Passing Technology) firmware. |
| 5 | * | 5 | * |
| 6 | * Copyright (c) 1999-2005 LSI Logic Corporation | 6 | * Copyright (c) 1999-2007 LSI Logic Corporation |
| 7 | * (mailto:mpt_linux_developer@lsil.com) | 7 | * (mailto:mpt_linux_developer@lsil.com) |
| 8 | * | 8 | * |
| 9 | */ | 9 | */ |
| @@ -75,6 +75,7 @@ | |||
| 75 | MODULE_AUTHOR(MODULEAUTHOR); | 75 | MODULE_AUTHOR(MODULEAUTHOR); |
| 76 | MODULE_DESCRIPTION(my_NAME); | 76 | MODULE_DESCRIPTION(my_NAME); |
| 77 | MODULE_LICENSE("GPL"); | 77 | MODULE_LICENSE("GPL"); |
| 78 | MODULE_VERSION(my_VERSION); | ||
| 78 | 79 | ||
| 79 | /* Command line args */ | 80 | /* Command line args */ |
| 80 | #define MPTFC_DEV_LOSS_TMO (60) | 81 | #define MPTFC_DEV_LOSS_TMO (60) |
diff --git a/drivers/message/fusion/mptlan.c b/drivers/message/fusion/mptlan.c index b7c4407c5e3f..2936204d8ad6 100644 --- a/drivers/message/fusion/mptlan.c +++ b/drivers/message/fusion/mptlan.c | |||
| @@ -4,7 +4,7 @@ | |||
| 4 | * For use with LSI Logic Fibre Channel PCI chip/adapters | 4 | * For use with LSI Logic Fibre Channel PCI chip/adapters |
| 5 | * running LSI Logic Fusion MPT (Message Passing Technology) firmware. | 5 | * running LSI Logic Fusion MPT (Message Passing Technology) firmware. |
| 6 | * | 6 | * |
| 7 | * Copyright (c) 2000-2005 LSI Logic Corporation | 7 | * Copyright (c) 2000-2007 LSI Logic Corporation |
| 8 | * | 8 | * |
| 9 | */ | 9 | */ |
| 10 | /*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/ | 10 | /*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/ |
| @@ -56,9 +56,11 @@ | |||
| 56 | #include <linux/module.h> | 56 | #include <linux/module.h> |
| 57 | #include <linux/fs.h> | 57 | #include <linux/fs.h> |
| 58 | 58 | ||
| 59 | #define my_VERSION MPT_LINUX_VERSION_COMMON | ||
| 59 | #define MYNAM "mptlan" | 60 | #define MYNAM "mptlan" |
| 60 | 61 | ||
| 61 | MODULE_LICENSE("GPL"); | 62 | MODULE_LICENSE("GPL"); |
| 63 | MODULE_VERSION(my_VERSION); | ||
| 62 | 64 | ||
| 63 | /*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/ | 65 | /*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/ |
| 64 | /* | 66 | /* |
diff --git a/drivers/message/fusion/mptlan.h b/drivers/message/fusion/mptlan.h index 3726ecba5707..70ab75e7c263 100644 --- a/drivers/message/fusion/mptlan.h +++ b/drivers/message/fusion/mptlan.h | |||
| @@ -4,7 +4,7 @@ | |||
| 4 | * For use with LSI Logic Fibre Channel PCI chip/adapters | 4 | * For use with LSI Logic Fibre Channel PCI chip/adapters |
| 5 | * running LSI Logic Fusion MPT (Message Passing Technology) firmware. | 5 | * running LSI Logic Fusion MPT (Message Passing Technology) firmware. |
| 6 | * | 6 | * |
| 7 | * Copyright (c) 2000-2005 LSI Logic Corporation | 7 | * Copyright (c) 2000-2007 LSI Logic Corporation |
| 8 | * | 8 | * |
| 9 | */ | 9 | */ |
| 10 | /*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/ | 10 | /*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/ |
diff --git a/drivers/message/fusion/mptsas.c b/drivers/message/fusion/mptsas.c index 4f0c530e47b0..09e9a9d96410 100644 --- a/drivers/message/fusion/mptsas.c +++ b/drivers/message/fusion/mptsas.c | |||
| @@ -3,9 +3,9 @@ | |||
| 3 | * For use with LSI Logic PCI chip/adapter(s) | 3 | * For use with LSI Logic PCI chip/adapter(s) |
| 4 | * running LSI Logic Fusion MPT (Message Passing Technology) firmware. | 4 | * running LSI Logic Fusion MPT (Message Passing Technology) firmware. |
| 5 | * | 5 | * |
| 6 | * Copyright (c) 1999-2005 LSI Logic Corporation | 6 | * Copyright (c) 1999-2007 LSI Logic Corporation |
| 7 | * (mailto:mpt_linux_developer@lsil.com) | 7 | * (mailto:mpt_linux_developer@lsil.com) |
| 8 | * Copyright (c) 2005-2006 Dell | 8 | * Copyright (c) 2005-2007 Dell |
| 9 | */ | 9 | */ |
| 10 | /*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/ | 10 | /*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/ |
| 11 | /* | 11 | /* |
| @@ -75,6 +75,7 @@ | |||
| 75 | MODULE_AUTHOR(MODULEAUTHOR); | 75 | MODULE_AUTHOR(MODULEAUTHOR); |
| 76 | MODULE_DESCRIPTION(my_NAME); | 76 | MODULE_DESCRIPTION(my_NAME); |
| 77 | MODULE_LICENSE("GPL"); | 77 | MODULE_LICENSE("GPL"); |
| 78 | MODULE_VERSION(my_VERSION); | ||
| 78 | 79 | ||
| 79 | static int mpt_pt_clear; | 80 | static int mpt_pt_clear; |
| 80 | module_param(mpt_pt_clear, int, 0); | 81 | module_param(mpt_pt_clear, int, 0); |
| @@ -245,7 +246,8 @@ static void mptsas_print_device_pg0(SasDevicePage0_t *pg0) | |||
| 245 | printk("Parent Handle=0x%X\n" ,le16_to_cpu(pg0->ParentDevHandle)); | 246 | printk("Parent Handle=0x%X\n" ,le16_to_cpu(pg0->ParentDevHandle)); |
| 246 | printk("Enclosure Handle=0x%X\n", le16_to_cpu(pg0->EnclosureHandle)); | 247 | printk("Enclosure Handle=0x%X\n", le16_to_cpu(pg0->EnclosureHandle)); |
| 247 | printk("Slot=0x%X\n", le16_to_cpu(pg0->Slot)); | 248 | printk("Slot=0x%X\n", le16_to_cpu(pg0->Slot)); |
| 248 | printk("SAS Address=0x%llX\n", le64_to_cpu(sas_address)); | 249 | printk("SAS Address=0x%llX\n", (unsigned long long) |
| 250 | le64_to_cpu(sas_address)); | ||
| 249 | printk("Target ID=0x%X\n", pg0->TargetID); | 251 | printk("Target ID=0x%X\n", pg0->TargetID); |
| 250 | printk("Bus=0x%X\n", pg0->Bus); | 252 | printk("Bus=0x%X\n", pg0->Bus); |
| 251 | /* The PhyNum field specifies the PHY number of the parent | 253 | /* The PhyNum field specifies the PHY number of the parent |
| @@ -349,9 +351,9 @@ mptsas_port_delete(struct mptsas_portinfo_details * port_details) | |||
| 349 | phy_info = port_info->phy_info; | 351 | phy_info = port_info->phy_info; |
| 350 | 352 | ||
| 351 | dsaswideprintk((KERN_DEBUG "%s: [%p]: num_phys=%02d " | 353 | dsaswideprintk((KERN_DEBUG "%s: [%p]: num_phys=%02d " |
| 352 | "bitmask=0x%016llX\n", | 354 | "bitmask=0x%016llX\n", __FUNCTION__, port_details, |
| 353 | __FUNCTION__, port_details, port_details->num_phys, | 355 | port_details->num_phys, (unsigned long long) |
| 354 | port_details->phy_bitmask)); | 356 | port_details->phy_bitmask)); |
| 355 | 357 | ||
| 356 | for (i = 0; i < port_info->num_phys; i++, phy_info++) { | 358 | for (i = 0; i < port_info->num_phys; i++, phy_info++) { |
| 357 | if(phy_info->port_details != port_details) | 359 | if(phy_info->port_details != port_details) |
| @@ -476,7 +478,7 @@ mptsas_setup_wide_ports(MPT_ADAPTER *ioc, struct mptsas_portinfo *port_info) | |||
| 476 | for (i = 0 ; i < port_info->num_phys ; i++, phy_info++) { | 478 | for (i = 0 ; i < port_info->num_phys ; i++, phy_info++) { |
| 477 | sas_address = phy_info->attached.sas_address; | 479 | sas_address = phy_info->attached.sas_address; |
| 478 | dsaswideprintk((KERN_DEBUG "phy_id=%d sas_address=0x%018llX\n", | 480 | dsaswideprintk((KERN_DEBUG "phy_id=%d sas_address=0x%018llX\n", |
| 479 | i, sas_address)); | 481 | i, (unsigned long long)sas_address)); |
| 480 | if (!sas_address) | 482 | if (!sas_address) |
| 481 | continue; | 483 | continue; |
| 482 | port_details = phy_info->port_details; | 484 | port_details = phy_info->port_details; |
| @@ -495,8 +497,8 @@ mptsas_setup_wide_ports(MPT_ADAPTER *ioc, struct mptsas_portinfo *port_info) | |||
| 495 | (1 << phy_info->phy_id); | 497 | (1 << phy_info->phy_id); |
| 496 | phy_info->sas_port_add_phy=1; | 498 | phy_info->sas_port_add_phy=1; |
| 497 | dsaswideprintk((KERN_DEBUG "\t\tForming port\n\t\t" | 499 | dsaswideprintk((KERN_DEBUG "\t\tForming port\n\t\t" |
| 498 | "phy_id=%d sas_address=0x%018llX\n", | 500 | "phy_id=%d sas_address=0x%018llX\n", |
| 499 | i, sas_address)); | 501 | i, (unsigned long long)sas_address)); |
| 500 | phy_info->port_details = port_details; | 502 | phy_info->port_details = port_details; |
| 501 | } | 503 | } |
| 502 | 504 | ||
| @@ -512,8 +514,9 @@ mptsas_setup_wide_ports(MPT_ADAPTER *ioc, struct mptsas_portinfo *port_info) | |||
| 512 | if (phy_info_cmp->port_details == port_details ) | 514 | if (phy_info_cmp->port_details == port_details ) |
| 513 | continue; | 515 | continue; |
| 514 | dsaswideprintk((KERN_DEBUG | 516 | dsaswideprintk((KERN_DEBUG |
| 515 | "\t\tphy_id=%d sas_address=0x%018llX\n", | 517 | "\t\tphy_id=%d sas_address=0x%018llX\n", |
| 516 | j, phy_info_cmp->attached.sas_address)); | 518 | j, (unsigned long long) |
| 519 | phy_info_cmp->attached.sas_address)); | ||
| 517 | if (phy_info_cmp->port_details) { | 520 | if (phy_info_cmp->port_details) { |
| 518 | port_details->rphy = | 521 | port_details->rphy = |
| 519 | mptsas_get_rphy(phy_info_cmp); | 522 | mptsas_get_rphy(phy_info_cmp); |
| @@ -546,11 +549,10 @@ mptsas_setup_wide_ports(MPT_ADAPTER *ioc, struct mptsas_portinfo *port_info) | |||
| 546 | if (!port_details) | 549 | if (!port_details) |
| 547 | continue; | 550 | continue; |
| 548 | dsaswideprintk((KERN_DEBUG | 551 | dsaswideprintk((KERN_DEBUG |
| 549 | "%s: [%p]: phy_id=%02d num_phys=%02d " | 552 | "%s: [%p]: phy_id=%02d num_phys=%02d " |
| 550 | "bitmask=0x%016llX\n", | 553 | "bitmask=0x%016llX\n", __FUNCTION__, |
| 551 | __FUNCTION__, | 554 | port_details, i, port_details->num_phys, |
| 552 | port_details, i, port_details->num_phys, | 555 | (unsigned long long)port_details->phy_bitmask)); |
| 553 | port_details->phy_bitmask)); | ||
| 554 | dsaswideprintk((KERN_DEBUG"\t\tport = %p rphy=%p\n", | 556 | dsaswideprintk((KERN_DEBUG"\t\tport = %p rphy=%p\n", |
| 555 | port_details->port, port_details->rphy)); | 557 | port_details->port, port_details->rphy)); |
| 556 | } | 558 | } |
| @@ -2079,8 +2081,10 @@ mptsas_persist_clear_table(struct work_struct *work) | |||
| 2079 | static void | 2081 | static void |
| 2080 | mptsas_reprobe_lun(struct scsi_device *sdev, void *data) | 2082 | mptsas_reprobe_lun(struct scsi_device *sdev, void *data) |
| 2081 | { | 2083 | { |
| 2084 | int rc; | ||
| 2085 | |||
| 2082 | sdev->no_uld_attach = data ? 1 : 0; | 2086 | sdev->no_uld_attach = data ? 1 : 0; |
| 2083 | scsi_device_reprobe(sdev); | 2087 | rc = scsi_device_reprobe(sdev); |
| 2084 | } | 2088 | } |
| 2085 | 2089 | ||
| 2086 | static void | 2090 | static void |
diff --git a/drivers/message/fusion/mptscsih.c b/drivers/message/fusion/mptscsih.c index 2c72c36b8171..f0cca3ea93b2 100644 --- a/drivers/message/fusion/mptscsih.c +++ b/drivers/message/fusion/mptscsih.c | |||
| @@ -3,7 +3,7 @@ | |||
| 3 | * For use with LSI Logic PCI chip/adapter(s) | 3 | * For use with LSI Logic PCI chip/adapter(s) |
| 4 | * running LSI Logic Fusion MPT (Message Passing Technology) firmware. | 4 | * running LSI Logic Fusion MPT (Message Passing Technology) firmware. |
| 5 | * | 5 | * |
| 6 | * Copyright (c) 1999-2005 LSI Logic Corporation | 6 | * Copyright (c) 1999-2007 LSI Logic Corporation |
| 7 | * (mailto:mpt_linux_developer@lsil.com) | 7 | * (mailto:mpt_linux_developer@lsil.com) |
| 8 | * | 8 | * |
| 9 | */ | 9 | */ |
| @@ -76,6 +76,7 @@ | |||
| 76 | MODULE_AUTHOR(MODULEAUTHOR); | 76 | MODULE_AUTHOR(MODULEAUTHOR); |
| 77 | MODULE_DESCRIPTION(my_NAME); | 77 | MODULE_DESCRIPTION(my_NAME); |
| 78 | MODULE_LICENSE("GPL"); | 78 | MODULE_LICENSE("GPL"); |
| 79 | MODULE_VERSION(my_VERSION); | ||
| 79 | 80 | ||
| 80 | /*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/ | 81 | /*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/ |
| 81 | 82 | ||
| @@ -701,6 +702,17 @@ mptscsih_io_done(MPT_ADAPTER *ioc, MPT_FRAME_HDR *mf, MPT_FRAME_HDR *mr) | |||
| 701 | break; | 702 | break; |
| 702 | } | 703 | } |
| 703 | } | 704 | } |
| 705 | } else if (ioc->bus_type == FC) { | ||
| 706 | /* | ||
| 707 | * The FC IOC may kill a request for variety of | ||
| 708 | * reasons, some of which may be recovered by a | ||
| 709 | * retry, some which are unlikely to be | ||
| 710 | * recovered. Return DID_ERROR instead of | ||
| 711 | * DID_RESET to permit retry of the command, | ||
| 712 | * just not an infinite number of them | ||
| 713 | */ | ||
| 714 | sc->result = DID_ERROR << 16; | ||
| 715 | break; | ||
| 704 | } | 716 | } |
| 705 | 717 | ||
| 706 | /* | 718 | /* |
| @@ -2688,7 +2700,8 @@ mptscsih_initTarget(MPT_SCSI_HOST *hd, VirtTarget *vtarget, | |||
| 2688 | struct scsi_device *sdev) | 2700 | struct scsi_device *sdev) |
| 2689 | { | 2701 | { |
| 2690 | dinitprintk((MYIOC_s_INFO_FMT "initTarget bus=%d id=%d lun=%d hd=%p\n", | 2702 | dinitprintk((MYIOC_s_INFO_FMT "initTarget bus=%d id=%d lun=%d hd=%p\n", |
| 2691 | hd->ioc->name, vtarget->bus_id, vtarget->target_id, lun, hd)); | 2703 | hd->ioc->name, vtarget->bus_id, vtarget->target_id, |
| 2704 | sdev->lun, hd)); | ||
| 2692 | 2705 | ||
| 2693 | /* Is LUN supported? If so, upper 2 bits will be 0 | 2706 | /* Is LUN supported? If so, upper 2 bits will be 0 |
| 2694 | * in first byte of inquiry data. | 2707 | * in first byte of inquiry data. |
| @@ -2770,7 +2783,7 @@ mptscsih_setTargetNegoParms(MPT_SCSI_HOST *hd, VirtTarget *target, | |||
| 2770 | else { | 2783 | else { |
| 2771 | factor = MPT_ULTRA320; | 2784 | factor = MPT_ULTRA320; |
| 2772 | if (scsi_device_qas(sdev)) { | 2785 | if (scsi_device_qas(sdev)) { |
| 2773 | ddvtprintk((KERN_INFO "Enabling QAS due to byte56=%02x on id=%d!\n", byte56, id)); | 2786 | ddvtprintk((KERN_INFO "Enabling QAS due to byte56=%02x on id=%d!\n", scsi_device_qas(sdev), id)); |
| 2774 | noQas = 0; | 2787 | noQas = 0; |
| 2775 | } | 2788 | } |
| 2776 | if (sdev->type == TYPE_TAPE && | 2789 | if (sdev->type == TYPE_TAPE && |
diff --git a/drivers/message/fusion/mptscsih.h b/drivers/message/fusion/mptscsih.h index 14a5b6c2e2bd..187c8af0890b 100644 --- a/drivers/message/fusion/mptscsih.h +++ b/drivers/message/fusion/mptscsih.h | |||
| @@ -5,7 +5,7 @@ | |||
| 5 | * LSIFC9xx/LSI409xx Fibre Channel | 5 | * LSIFC9xx/LSI409xx Fibre Channel |
| 6 | * running LSI Logic Fusion MPT (Message Passing Technology) firmware. | 6 | * running LSI Logic Fusion MPT (Message Passing Technology) firmware. |
| 7 | * | 7 | * |
| 8 | * Copyright (c) 1999-2005 LSI Logic Corporation | 8 | * Copyright (c) 1999-2007 LSI Logic Corporation |
| 9 | * (mailto:mpt_linux_developer@lsil.com) | 9 | * (mailto:mpt_linux_developer@lsil.com) |
| 10 | * | 10 | * |
| 11 | */ | 11 | */ |
diff --git a/drivers/message/fusion/mptspi.c b/drivers/message/fusion/mptspi.c index 36641da59289..203c661d2c79 100644 --- a/drivers/message/fusion/mptspi.c +++ b/drivers/message/fusion/mptspi.c | |||
| @@ -3,7 +3,7 @@ | |||
| 3 | * For use with LSI Logic PCI chip/adapter(s) | 3 | * For use with LSI Logic PCI chip/adapter(s) |
| 4 | * running LSI Logic Fusion MPT (Message Passing Technology) firmware. | 4 | * running LSI Logic Fusion MPT (Message Passing Technology) firmware. |
| 5 | * | 5 | * |
| 6 | * Copyright (c) 1999-2005 LSI Logic Corporation | 6 | * Copyright (c) 1999-2007 LSI Logic Corporation |
| 7 | * (mailto:mpt_linux_developer@lsil.com) | 7 | * (mailto:mpt_linux_developer@lsil.com) |
| 8 | * | 8 | * |
| 9 | */ | 9 | */ |
| @@ -77,6 +77,7 @@ | |||
| 77 | MODULE_AUTHOR(MODULEAUTHOR); | 77 | MODULE_AUTHOR(MODULEAUTHOR); |
| 78 | MODULE_DESCRIPTION(my_NAME); | 78 | MODULE_DESCRIPTION(my_NAME); |
| 79 | MODULE_LICENSE("GPL"); | 79 | MODULE_LICENSE("GPL"); |
| 80 | MODULE_VERSION(my_VERSION); | ||
| 80 | 81 | ||
| 81 | /* Command line args */ | 82 | /* Command line args */ |
| 82 | static int mpt_saf_te = MPTSCSIH_SAF_TE; | 83 | static int mpt_saf_te = MPTSCSIH_SAF_TE; |
diff --git a/drivers/mmc/imxmmc.c b/drivers/mmc/imxmmc.c index 06e7fcd19221..bfb9ff693208 100644 --- a/drivers/mmc/imxmmc.c +++ b/drivers/mmc/imxmmc.c | |||
| @@ -351,9 +351,6 @@ static void imxmci_start_cmd(struct imxmci_host *host, struct mmc_command *cmd, | |||
| 351 | case MMC_RSP_R3: /* short */ | 351 | case MMC_RSP_R3: /* short */ |
| 352 | cmdat |= CMD_DAT_CONT_RESPONSE_FORMAT_R3; | 352 | cmdat |= CMD_DAT_CONT_RESPONSE_FORMAT_R3; |
| 353 | break; | 353 | break; |
| 354 | case MMC_RSP_R6: /* short CRC */ | ||
| 355 | cmdat |= CMD_DAT_CONT_RESPONSE_FORMAT_R6; | ||
| 356 | break; | ||
| 357 | default: | 354 | default: |
| 358 | break; | 355 | break; |
| 359 | } | 356 | } |
diff --git a/drivers/mmc/omap.c b/drivers/mmc/omap.c index 9488408308fb..d30540b27614 100644 --- a/drivers/mmc/omap.c +++ b/drivers/mmc/omap.c | |||
| @@ -91,7 +91,6 @@ | |||
| 91 | 91 | ||
| 92 | 92 | ||
| 93 | #define DRIVER_NAME "mmci-omap" | 93 | #define DRIVER_NAME "mmci-omap" |
| 94 | #define RSP_TYPE(x) ((x) & ~(MMC_RSP_BUSY|MMC_RSP_OPCODE)) | ||
| 95 | 94 | ||
| 96 | /* Specifies how often in millisecs to poll for card status changes | 95 | /* Specifies how often in millisecs to poll for card status changes |
| 97 | * when the cover switch is open */ | 96 | * when the cover switch is open */ |
| @@ -204,18 +203,22 @@ mmc_omap_start_command(struct mmc_omap_host *host, struct mmc_command *cmd) | |||
| 204 | cmdtype = 0; | 203 | cmdtype = 0; |
| 205 | 204 | ||
| 206 | /* Our hardware needs to know exact type */ | 205 | /* Our hardware needs to know exact type */ |
| 207 | switch (RSP_TYPE(mmc_resp_type(cmd))) { | 206 | switch (mmc_resp_type(cmd)) { |
| 208 | case RSP_TYPE(MMC_RSP_R1): | 207 | case MMC_RSP_NONE: |
| 209 | /* resp 1, resp 1b */ | 208 | break; |
| 209 | case MMC_RSP_R1: | ||
| 210 | case MMC_RSP_R1B: | ||
| 211 | /* resp 1, 1b, 6, 7 */ | ||
| 210 | resptype = 1; | 212 | resptype = 1; |
| 211 | break; | 213 | break; |
| 212 | case RSP_TYPE(MMC_RSP_R2): | 214 | case MMC_RSP_R2: |
| 213 | resptype = 2; | 215 | resptype = 2; |
| 214 | break; | 216 | break; |
| 215 | case RSP_TYPE(MMC_RSP_R3): | 217 | case MMC_RSP_R3: |
| 216 | resptype = 3; | 218 | resptype = 3; |
| 217 | break; | 219 | break; |
| 218 | default: | 220 | default: |
| 221 | dev_err(mmc_dev(host->mmc), "Invalid response type: %04x\n", mmc_resp_type(cmd)); | ||
| 219 | break; | 222 | break; |
| 220 | } | 223 | } |
| 221 | 224 | ||
diff --git a/drivers/mmc/pxamci.c b/drivers/mmc/pxamci.c index 45a9283ce498..6073d998b11f 100644 --- a/drivers/mmc/pxamci.c +++ b/drivers/mmc/pxamci.c | |||
| @@ -171,7 +171,7 @@ static void pxamci_start_cmd(struct pxamci_host *host, struct mmc_command *cmd, | |||
| 171 | 171 | ||
| 172 | #define RSP_TYPE(x) ((x) & ~(MMC_RSP_BUSY|MMC_RSP_OPCODE)) | 172 | #define RSP_TYPE(x) ((x) & ~(MMC_RSP_BUSY|MMC_RSP_OPCODE)) |
| 173 | switch (RSP_TYPE(mmc_resp_type(cmd))) { | 173 | switch (RSP_TYPE(mmc_resp_type(cmd))) { |
| 174 | case RSP_TYPE(MMC_RSP_R1): /* r1, r1b, r6 */ | 174 | case RSP_TYPE(MMC_RSP_R1): /* r1, r1b, r6, r7 */ |
| 175 | cmdat |= CMDAT_RESP_SHORT; | 175 | cmdat |= CMDAT_RESP_SHORT; |
| 176 | break; | 176 | break; |
| 177 | case RSP_TYPE(MMC_RSP_R3): | 177 | case RSP_TYPE(MMC_RSP_R3): |
diff --git a/drivers/mmc/tifm_sd.c b/drivers/mmc/tifm_sd.c index f18ad998b3cb..fa4a52886b97 100644 --- a/drivers/mmc/tifm_sd.c +++ b/drivers/mmc/tifm_sd.c | |||
| @@ -173,9 +173,6 @@ static unsigned int tifm_sd_op_flags(struct mmc_command *cmd) | |||
| 173 | case MMC_RSP_R3: | 173 | case MMC_RSP_R3: |
| 174 | rc |= TIFM_MMCSD_RSP_R3; | 174 | rc |= TIFM_MMCSD_RSP_R3; |
| 175 | break; | 175 | break; |
| 176 | case MMC_RSP_R6: | ||
| 177 | rc |= TIFM_MMCSD_RSP_R6; | ||
| 178 | break; | ||
| 179 | default: | 176 | default: |
| 180 | BUG(); | 177 | BUG(); |
| 181 | } | 178 | } |
diff --git a/drivers/net/8139cp.c b/drivers/net/8139cp.c index e2cb19b582a1..6f93a765e564 100644 --- a/drivers/net/8139cp.c +++ b/drivers/net/8139cp.c | |||
| @@ -765,17 +765,18 @@ static int cp_start_xmit (struct sk_buff *skb, struct net_device *dev) | |||
| 765 | struct cp_private *cp = netdev_priv(dev); | 765 | struct cp_private *cp = netdev_priv(dev); |
| 766 | unsigned entry; | 766 | unsigned entry; |
| 767 | u32 eor, flags; | 767 | u32 eor, flags; |
| 768 | unsigned long intr_flags; | ||
| 768 | #if CP_VLAN_TAG_USED | 769 | #if CP_VLAN_TAG_USED |
| 769 | u32 vlan_tag = 0; | 770 | u32 vlan_tag = 0; |
| 770 | #endif | 771 | #endif |
| 771 | int mss = 0; | 772 | int mss = 0; |
| 772 | 773 | ||
| 773 | spin_lock_irq(&cp->lock); | 774 | spin_lock_irqsave(&cp->lock, intr_flags); |
| 774 | 775 | ||
| 775 | /* This is a hard error, log it. */ | 776 | /* This is a hard error, log it. */ |
| 776 | if (TX_BUFFS_AVAIL(cp) <= (skb_shinfo(skb)->nr_frags + 1)) { | 777 | if (TX_BUFFS_AVAIL(cp) <= (skb_shinfo(skb)->nr_frags + 1)) { |
| 777 | netif_stop_queue(dev); | 778 | netif_stop_queue(dev); |
| 778 | spin_unlock_irq(&cp->lock); | 779 | spin_unlock_irqrestore(&cp->lock, intr_flags); |
| 779 | printk(KERN_ERR PFX "%s: BUG! Tx Ring full when queue awake!\n", | 780 | printk(KERN_ERR PFX "%s: BUG! Tx Ring full when queue awake!\n", |
| 780 | dev->name); | 781 | dev->name); |
| 781 | return 1; | 782 | return 1; |
| @@ -908,7 +909,7 @@ static int cp_start_xmit (struct sk_buff *skb, struct net_device *dev) | |||
| 908 | if (TX_BUFFS_AVAIL(cp) <= (MAX_SKB_FRAGS + 1)) | 909 | if (TX_BUFFS_AVAIL(cp) <= (MAX_SKB_FRAGS + 1)) |
| 909 | netif_stop_queue(dev); | 910 | netif_stop_queue(dev); |
| 910 | 911 | ||
| 911 | spin_unlock_irq(&cp->lock); | 912 | spin_unlock_irqrestore(&cp->lock, intr_flags); |
| 912 | 913 | ||
| 913 | cpw8(TxPoll, NormalTxPoll); | 914 | cpw8(TxPoll, NormalTxPoll); |
| 914 | dev->trans_start = jiffies; | 915 | dev->trans_start = jiffies; |
diff --git a/drivers/net/myri10ge/myri10ge.c b/drivers/net/myri10ge/myri10ge.c index 07cf574197e5..61cbd4a60446 100644 --- a/drivers/net/myri10ge/myri10ge.c +++ b/drivers/net/myri10ge/myri10ge.c | |||
| @@ -71,7 +71,7 @@ | |||
| 71 | #include "myri10ge_mcp.h" | 71 | #include "myri10ge_mcp.h" |
| 72 | #include "myri10ge_mcp_gen_header.h" | 72 | #include "myri10ge_mcp_gen_header.h" |
| 73 | 73 | ||
| 74 | #define MYRI10GE_VERSION_STR "1.1.0" | 74 | #define MYRI10GE_VERSION_STR "1.2.0" |
| 75 | 75 | ||
| 76 | MODULE_DESCRIPTION("Myricom 10G driver (10GbE)"); | 76 | MODULE_DESCRIPTION("Myricom 10G driver (10GbE)"); |
| 77 | MODULE_AUTHOR("Maintainer: help@myri.com"); | 77 | MODULE_AUTHOR("Maintainer: help@myri.com"); |
| @@ -274,6 +274,10 @@ static int myri10ge_fill_thresh = 256; | |||
| 274 | module_param(myri10ge_fill_thresh, int, S_IRUGO | S_IWUSR); | 274 | module_param(myri10ge_fill_thresh, int, S_IRUGO | S_IWUSR); |
| 275 | MODULE_PARM_DESC(myri10ge_fill_thresh, "Number of empty rx slots allowed\n"); | 275 | MODULE_PARM_DESC(myri10ge_fill_thresh, "Number of empty rx slots allowed\n"); |
| 276 | 276 | ||
| 277 | static int myri10ge_wcfifo = 1; | ||
| 278 | module_param(myri10ge_wcfifo, int, S_IRUGO); | ||
| 279 | MODULE_PARM_DESC(myri10ge_wcfifo, "Enable WC Fifo when WC is enabled\n"); | ||
| 280 | |||
| 277 | #define MYRI10GE_FW_OFFSET 1024*1024 | 281 | #define MYRI10GE_FW_OFFSET 1024*1024 |
| 278 | #define MYRI10GE_HIGHPART_TO_U32(X) \ | 282 | #define MYRI10GE_HIGHPART_TO_U32(X) \ |
| 279 | (sizeof (X) == 8) ? ((u32)((u64)(X) >> 32)) : (0) | 283 | (sizeof (X) == 8) ? ((u32)((u64)(X) >> 32)) : (0) |
| @@ -1714,7 +1718,7 @@ static int myri10ge_open(struct net_device *dev) | |||
| 1714 | goto abort_with_irq; | 1718 | goto abort_with_irq; |
| 1715 | } | 1719 | } |
| 1716 | 1720 | ||
| 1717 | if (mgp->mtrr >= 0) { | 1721 | if (myri10ge_wcfifo && mgp->mtrr >= 0) { |
| 1718 | mgp->tx.wc_fifo = (u8 __iomem *) mgp->sram + MXGEFW_ETH_SEND_4; | 1722 | mgp->tx.wc_fifo = (u8 __iomem *) mgp->sram + MXGEFW_ETH_SEND_4; |
| 1719 | mgp->rx_small.wc_fifo = | 1723 | mgp->rx_small.wc_fifo = |
| 1720 | (u8 __iomem *) mgp->sram + MXGEFW_ETH_RECV_SMALL; | 1724 | (u8 __iomem *) mgp->sram + MXGEFW_ETH_RECV_SMALL; |
| @@ -2878,7 +2882,6 @@ static int myri10ge_probe(struct pci_dev *pdev, const struct pci_device_id *ent) | |||
| 2878 | netdev->hard_start_xmit = myri10ge_xmit; | 2882 | netdev->hard_start_xmit = myri10ge_xmit; |
| 2879 | netdev->get_stats = myri10ge_get_stats; | 2883 | netdev->get_stats = myri10ge_get_stats; |
| 2880 | netdev->base_addr = mgp->iomem_base; | 2884 | netdev->base_addr = mgp->iomem_base; |
| 2881 | netdev->irq = pdev->irq; | ||
| 2882 | netdev->change_mtu = myri10ge_change_mtu; | 2885 | netdev->change_mtu = myri10ge_change_mtu; |
| 2883 | netdev->set_multicast_list = myri10ge_set_multicast_list; | 2886 | netdev->set_multicast_list = myri10ge_set_multicast_list; |
| 2884 | netdev->set_mac_address = myri10ge_set_mac_address; | 2887 | netdev->set_mac_address = myri10ge_set_mac_address; |
| @@ -2888,6 +2891,15 @@ static int myri10ge_probe(struct pci_dev *pdev, const struct pci_device_id *ent) | |||
| 2888 | netdev->poll = myri10ge_poll; | 2891 | netdev->poll = myri10ge_poll; |
| 2889 | netdev->weight = myri10ge_napi_weight; | 2892 | netdev->weight = myri10ge_napi_weight; |
| 2890 | 2893 | ||
| 2894 | /* make sure we can get an irq, and that MSI can be | ||
| 2895 | * setup (if available). Also ensure netdev->irq | ||
| 2896 | * is set to correct value if MSI is enabled */ | ||
| 2897 | status = myri10ge_request_irq(mgp); | ||
| 2898 | if (status != 0) | ||
| 2899 | goto abort_with_firmware; | ||
| 2900 | netdev->irq = pdev->irq; | ||
| 2901 | myri10ge_free_irq(mgp); | ||
| 2902 | |||
| 2891 | /* Save configuration space to be restored if the | 2903 | /* Save configuration space to be restored if the |
| 2892 | * nic resets due to a parity error */ | 2904 | * nic resets due to a parity error */ |
| 2893 | pci_save_state(pdev); | 2905 | pci_save_state(pdev); |
| @@ -2903,8 +2915,9 @@ static int myri10ge_probe(struct pci_dev *pdev, const struct pci_device_id *ent) | |||
| 2903 | dev_err(&pdev->dev, "register_netdev failed: %d\n", status); | 2915 | dev_err(&pdev->dev, "register_netdev failed: %d\n", status); |
| 2904 | goto abort_with_state; | 2916 | goto abort_with_state; |
| 2905 | } | 2917 | } |
| 2906 | dev_info(dev, "%d, tx bndry %d, fw %s, WC %s\n", | 2918 | dev_info(dev, "%s IRQ %d, tx bndry %d, fw %s, WC %s\n", |
| 2907 | pdev->irq, mgp->tx.boundary, mgp->fw_name, | 2919 | (mgp->msi_enabled ? "MSI" : "xPIC"), |
| 2920 | netdev->irq, mgp->tx.boundary, mgp->fw_name, | ||
| 2908 | (mgp->mtrr >= 0 ? "Enabled" : "Disabled")); | 2921 | (mgp->mtrr >= 0 ? "Enabled" : "Disabled")); |
| 2909 | 2922 | ||
| 2910 | return 0; | 2923 | return 0; |
diff --git a/drivers/net/sis190.c b/drivers/net/sis190.c index b70ed79d4121..45d91b159100 100644 --- a/drivers/net/sis190.c +++ b/drivers/net/sis190.c | |||
| @@ -1562,7 +1562,7 @@ static int __devinit sis190_get_mac_addr_from_eeprom(struct pci_dev *pdev, | |||
| 1562 | for (i = 0; i < MAC_ADDR_LEN / 2; i++) { | 1562 | for (i = 0; i < MAC_ADDR_LEN / 2; i++) { |
| 1563 | __le16 w = sis190_read_eeprom(ioaddr, EEPROMMACAddr + i); | 1563 | __le16 w = sis190_read_eeprom(ioaddr, EEPROMMACAddr + i); |
| 1564 | 1564 | ||
| 1565 | ((u16 *)dev->dev_addr)[0] = le16_to_cpu(w); | 1565 | ((u16 *)dev->dev_addr)[i] = le16_to_cpu(w); |
| 1566 | } | 1566 | } |
| 1567 | 1567 | ||
| 1568 | sis190_set_rgmii(tp, sis190_read_eeprom(ioaddr, EEPROMInfo)); | 1568 | sis190_set_rgmii(tp, sis190_read_eeprom(ioaddr, EEPROMInfo)); |
diff --git a/drivers/net/ucc_geth.c b/drivers/net/ucc_geth.c index 8243150f5b05..7e4b23c7c1ba 100644 --- a/drivers/net/ucc_geth.c +++ b/drivers/net/ucc_geth.c | |||
| @@ -29,6 +29,7 @@ | |||
| 29 | #include <linux/fsl_devices.h> | 29 | #include <linux/fsl_devices.h> |
| 30 | #include <linux/ethtool.h> | 30 | #include <linux/ethtool.h> |
| 31 | #include <linux/mii.h> | 31 | #include <linux/mii.h> |
| 32 | #include <linux/workqueue.h> | ||
| 32 | 33 | ||
| 33 | #include <asm/of_platform.h> | 34 | #include <asm/of_platform.h> |
| 34 | #include <asm/uaccess.h> | 35 | #include <asm/uaccess.h> |
| @@ -472,7 +473,7 @@ static void put_enet_addr_container(struct enet_addr_container *enet_addr_cont) | |||
| 472 | kfree(enet_addr_cont); | 473 | kfree(enet_addr_cont); |
| 473 | } | 474 | } |
| 474 | 475 | ||
| 475 | static int set_mac_addr(__be16 __iomem *reg, u8 *mac) | 476 | static void set_mac_addr(__be16 __iomem *reg, u8 *mac) |
| 476 | { | 477 | { |
| 477 | out_be16(®[0], ((u16)mac[5] << 8) | mac[4]); | 478 | out_be16(®[0], ((u16)mac[5] << 8) | mac[4]); |
| 478 | out_be16(®[1], ((u16)mac[3] << 8) | mac[2]); | 479 | out_be16(®[1], ((u16)mac[3] << 8) | mac[2]); |
| @@ -3920,10 +3921,11 @@ static irqreturn_t phy_interrupt(int irq, void *dev_id) | |||
| 3920 | } | 3921 | } |
| 3921 | 3922 | ||
| 3922 | /* Scheduled by the phy_interrupt/timer to handle PHY changes */ | 3923 | /* Scheduled by the phy_interrupt/timer to handle PHY changes */ |
| 3923 | static void ugeth_phy_change(void *data) | 3924 | static void ugeth_phy_change(struct work_struct *work) |
| 3924 | { | 3925 | { |
| 3925 | struct net_device *dev = (struct net_device *)data; | 3926 | struct ucc_geth_private *ugeth = |
| 3926 | struct ucc_geth_private *ugeth = netdev_priv(dev); | 3927 | container_of(work, struct ucc_geth_private, tq); |
| 3928 | struct net_device *dev = ugeth->dev; | ||
| 3927 | struct ucc_geth *ug_regs; | 3929 | struct ucc_geth *ug_regs; |
| 3928 | int result = 0; | 3930 | int result = 0; |
| 3929 | 3931 | ||
| @@ -4080,7 +4082,7 @@ static int ucc_geth_open(struct net_device *dev) | |||
| 4080 | #endif /* CONFIG_UGETH_NAPI */ | 4082 | #endif /* CONFIG_UGETH_NAPI */ |
| 4081 | 4083 | ||
| 4082 | /* Set up the PHY change work queue */ | 4084 | /* Set up the PHY change work queue */ |
| 4083 | INIT_WORK(&ugeth->tq, ugeth_phy_change, dev); | 4085 | INIT_WORK(&ugeth->tq, ugeth_phy_change); |
| 4084 | 4086 | ||
| 4085 | init_timer(&ugeth->phy_info_timer); | 4087 | init_timer(&ugeth->phy_info_timer); |
| 4086 | ugeth->phy_info_timer.function = &ugeth_phy_startup_timer; | 4088 | ugeth->phy_info_timer.function = &ugeth_phy_startup_timer; |
diff --git a/drivers/net/ucc_geth_phy.c b/drivers/net/ucc_geth_phy.c index 5360ec05eaa3..3c86592ce03c 100644 --- a/drivers/net/ucc_geth_phy.c +++ b/drivers/net/ucc_geth_phy.c | |||
| @@ -68,8 +68,31 @@ static int gbit_config_aneg(struct ugeth_mii_info *mii_info); | |||
| 68 | static int genmii_config_aneg(struct ugeth_mii_info *mii_info); | 68 | static int genmii_config_aneg(struct ugeth_mii_info *mii_info); |
| 69 | static int genmii_update_link(struct ugeth_mii_info *mii_info); | 69 | static int genmii_update_link(struct ugeth_mii_info *mii_info); |
| 70 | static int genmii_read_status(struct ugeth_mii_info *mii_info); | 70 | static int genmii_read_status(struct ugeth_mii_info *mii_info); |
| 71 | u16 phy_read(struct ugeth_mii_info *mii_info, u16 regnum); | 71 | |
| 72 | void phy_write(struct ugeth_mii_info *mii_info, u16 regnum, u16 val); | 72 | static u16 ucc_geth_phy_read(struct ugeth_mii_info *mii_info, u16 regnum) |
| 73 | { | ||
| 74 | u16 retval; | ||
| 75 | unsigned long flags; | ||
| 76 | |||
| 77 | ugphy_vdbg("%s: IN", __FUNCTION__); | ||
| 78 | |||
| 79 | spin_lock_irqsave(&mii_info->mdio_lock, flags); | ||
| 80 | retval = mii_info->mdio_read(mii_info->dev, mii_info->mii_id, regnum); | ||
| 81 | spin_unlock_irqrestore(&mii_info->mdio_lock, flags); | ||
| 82 | |||
| 83 | return retval; | ||
| 84 | } | ||
| 85 | |||
| 86 | static void ucc_geth_phy_write(struct ugeth_mii_info *mii_info, u16 regnum, u16 val) | ||
| 87 | { | ||
| 88 | unsigned long flags; | ||
| 89 | |||
| 90 | ugphy_vdbg("%s: IN", __FUNCTION__); | ||
| 91 | |||
| 92 | spin_lock_irqsave(&mii_info->mdio_lock, flags); | ||
| 93 | mii_info->mdio_write(mii_info->dev, mii_info->mii_id, regnum, val); | ||
| 94 | spin_unlock_irqrestore(&mii_info->mdio_lock, flags); | ||
| 95 | } | ||
| 73 | 96 | ||
| 74 | /* Write value to the PHY for this device to the register at regnum, */ | 97 | /* Write value to the PHY for this device to the register at regnum, */ |
| 75 | /* waiting until the write is done before it returns. All PHY */ | 98 | /* waiting until the write is done before it returns. All PHY */ |
| @@ -184,7 +207,7 @@ static void config_genmii_advert(struct ugeth_mii_info *mii_info) | |||
| 184 | advertise = mii_info->advertising; | 207 | advertise = mii_info->advertising; |
| 185 | 208 | ||
| 186 | /* Setup standard advertisement */ | 209 | /* Setup standard advertisement */ |
| 187 | adv = phy_read(mii_info, MII_ADVERTISE); | 210 | adv = ucc_geth_phy_read(mii_info, MII_ADVERTISE); |
| 188 | adv &= ~(ADVERTISE_ALL | ADVERTISE_100BASE4); | 211 | adv &= ~(ADVERTISE_ALL | ADVERTISE_100BASE4); |
| 189 | if (advertise & ADVERTISED_10baseT_Half) | 212 | if (advertise & ADVERTISED_10baseT_Half) |
| 190 | adv |= ADVERTISE_10HALF; | 213 | adv |= ADVERTISE_10HALF; |
| @@ -194,7 +217,7 @@ static void config_genmii_advert(struct ugeth_mii_info *mii_info) | |||
| 194 | adv |= ADVERTISE_100HALF; | 217 | adv |= ADVERTISE_100HALF; |
| 195 | if (advertise & ADVERTISED_100baseT_Full) | 218 | if (advertise & ADVERTISED_100baseT_Full) |
| 196 | adv |= ADVERTISE_100FULL; | 219 | adv |= ADVERTISE_100FULL; |
| 197 | phy_write(mii_info, MII_ADVERTISE, adv); | 220 | ucc_geth_phy_write(mii_info, MII_ADVERTISE, adv); |
| 198 | } | 221 | } |
| 199 | 222 | ||
| 200 | static void genmii_setup_forced(struct ugeth_mii_info *mii_info) | 223 | static void genmii_setup_forced(struct ugeth_mii_info *mii_info) |
| @@ -204,7 +227,7 @@ static void genmii_setup_forced(struct ugeth_mii_info *mii_info) | |||
| 204 | 227 | ||
| 205 | ugphy_vdbg("%s: IN", __FUNCTION__); | 228 | ugphy_vdbg("%s: IN", __FUNCTION__); |
| 206 | 229 | ||
| 207 | ctrl = phy_read(mii_info, MII_BMCR); | 230 | ctrl = ucc_geth_phy_read(mii_info, MII_BMCR); |
| 208 | 231 | ||
| 209 | ctrl &= | 232 | ctrl &= |
| 210 | ~(BMCR_FULLDPLX | BMCR_SPEED100 | BMCR_SPEED1000 | BMCR_ANENABLE); | 233 | ~(BMCR_FULLDPLX | BMCR_SPEED100 | BMCR_SPEED1000 | BMCR_ANENABLE); |
| @@ -234,7 +257,7 @@ static void genmii_setup_forced(struct ugeth_mii_info *mii_info) | |||
| 234 | break; | 257 | break; |
| 235 | } | 258 | } |
| 236 | 259 | ||
| 237 | phy_write(mii_info, MII_BMCR, ctrl); | 260 | ucc_geth_phy_write(mii_info, MII_BMCR, ctrl); |
| 238 | } | 261 | } |
| 239 | 262 | ||
| 240 | /* Enable and Restart Autonegotiation */ | 263 | /* Enable and Restart Autonegotiation */ |
| @@ -244,9 +267,9 @@ static void genmii_restart_aneg(struct ugeth_mii_info *mii_info) | |||
| 244 | 267 | ||
| 245 | ugphy_vdbg("%s: IN", __FUNCTION__); | 268 | ugphy_vdbg("%s: IN", __FUNCTION__); |
| 246 | 269 | ||
| 247 | ctl = phy_read(mii_info, MII_BMCR); | 270 | ctl = ucc_geth_phy_read(mii_info, MII_BMCR); |
| 248 | ctl |= (BMCR_ANENABLE | BMCR_ANRESTART); | 271 | ctl |= (BMCR_ANENABLE | BMCR_ANRESTART); |
| 249 | phy_write(mii_info, MII_BMCR, ctl); | 272 | ucc_geth_phy_write(mii_info, MII_BMCR, ctl); |
| 250 | } | 273 | } |
| 251 | 274 | ||
| 252 | static int gbit_config_aneg(struct ugeth_mii_info *mii_info) | 275 | static int gbit_config_aneg(struct ugeth_mii_info *mii_info) |
| @@ -261,14 +284,14 @@ static int gbit_config_aneg(struct ugeth_mii_info *mii_info) | |||
| 261 | config_genmii_advert(mii_info); | 284 | config_genmii_advert(mii_info); |
| 262 | advertise = mii_info->advertising; | 285 | advertise = mii_info->advertising; |
| 263 | 286 | ||
| 264 | adv = phy_read(mii_info, MII_1000BASETCONTROL); | 287 | adv = ucc_geth_phy_read(mii_info, MII_1000BASETCONTROL); |
| 265 | adv &= ~(MII_1000BASETCONTROL_FULLDUPLEXCAP | | 288 | adv &= ~(MII_1000BASETCONTROL_FULLDUPLEXCAP | |
| 266 | MII_1000BASETCONTROL_HALFDUPLEXCAP); | 289 | MII_1000BASETCONTROL_HALFDUPLEXCAP); |
| 267 | if (advertise & SUPPORTED_1000baseT_Half) | 290 | if (advertise & SUPPORTED_1000baseT_Half) |
| 268 | adv |= MII_1000BASETCONTROL_HALFDUPLEXCAP; | 291 | adv |= MII_1000BASETCONTROL_HALFDUPLEXCAP; |
| 269 | if (advertise & SUPPORTED_1000baseT_Full) | 292 | if (advertise & SUPPORTED_1000baseT_Full) |
| 270 | adv |= MII_1000BASETCONTROL_FULLDUPLEXCAP; | 293 | adv |= MII_1000BASETCONTROL_FULLDUPLEXCAP; |
| 271 | phy_write(mii_info, MII_1000BASETCONTROL, adv); | 294 | ucc_geth_phy_write(mii_info, MII_1000BASETCONTROL, adv); |
| 272 | 295 | ||
| 273 | /* Start/Restart aneg */ | 296 | /* Start/Restart aneg */ |
| 274 | genmii_restart_aneg(mii_info); | 297 | genmii_restart_aneg(mii_info); |
| @@ -298,10 +321,10 @@ static int genmii_update_link(struct ugeth_mii_info *mii_info) | |||
| 298 | ugphy_vdbg("%s: IN", __FUNCTION__); | 321 | ugphy_vdbg("%s: IN", __FUNCTION__); |
| 299 | 322 | ||
| 300 | /* Do a fake read */ | 323 | /* Do a fake read */ |
| 301 | phy_read(mii_info, MII_BMSR); | 324 | ucc_geth_phy_read(mii_info, MII_BMSR); |
| 302 | 325 | ||
| 303 | /* Read link and autonegotiation status */ | 326 | /* Read link and autonegotiation status */ |
| 304 | status = phy_read(mii_info, MII_BMSR); | 327 | status = ucc_geth_phy_read(mii_info, MII_BMSR); |
| 305 | if ((status & BMSR_LSTATUS) == 0) | 328 | if ((status & BMSR_LSTATUS) == 0) |
| 306 | mii_info->link = 0; | 329 | mii_info->link = 0; |
| 307 | else | 330 | else |
| @@ -329,7 +352,7 @@ static int genmii_read_status(struct ugeth_mii_info *mii_info) | |||
| 329 | return err; | 352 | return err; |
| 330 | 353 | ||
| 331 | if (mii_info->autoneg) { | 354 | if (mii_info->autoneg) { |
| 332 | status = phy_read(mii_info, MII_LPA); | 355 | status = ucc_geth_phy_read(mii_info, MII_LPA); |
| 333 | 356 | ||
| 334 | if (status & (LPA_10FULL | LPA_100FULL)) | 357 | if (status & (LPA_10FULL | LPA_100FULL)) |
| 335 | mii_info->duplex = DUPLEX_FULL; | 358 | mii_info->duplex = DUPLEX_FULL; |
| @@ -352,9 +375,9 @@ static int marvell_init(struct ugeth_mii_info *mii_info) | |||
| 352 | { | 375 | { |
| 353 | ugphy_vdbg("%s: IN", __FUNCTION__); | 376 | ugphy_vdbg("%s: IN", __FUNCTION__); |
| 354 | 377 | ||
| 355 | phy_write(mii_info, 0x14, 0x0cd2); | 378 | ucc_geth_phy_write(mii_info, 0x14, 0x0cd2); |
| 356 | phy_write(mii_info, MII_BMCR, | 379 | ucc_geth_phy_write(mii_info, MII_BMCR, |
| 357 | phy_read(mii_info, MII_BMCR) | BMCR_RESET); | 380 | ucc_geth_phy_read(mii_info, MII_BMCR) | BMCR_RESET); |
| 358 | msleep(4000); | 381 | msleep(4000); |
| 359 | 382 | ||
| 360 | return 0; | 383 | return 0; |
| @@ -367,13 +390,13 @@ static int marvell_config_aneg(struct ugeth_mii_info *mii_info) | |||
| 367 | /* The Marvell PHY has an errata which requires | 390 | /* The Marvell PHY has an errata which requires |
| 368 | * that certain registers get written in order | 391 | * that certain registers get written in order |
| 369 | * to restart autonegotiation */ | 392 | * to restart autonegotiation */ |
| 370 | phy_write(mii_info, MII_BMCR, BMCR_RESET); | 393 | ucc_geth_phy_write(mii_info, MII_BMCR, BMCR_RESET); |
| 371 | 394 | ||
| 372 | phy_write(mii_info, 0x1d, 0x1f); | 395 | ucc_geth_phy_write(mii_info, 0x1d, 0x1f); |
| 373 | phy_write(mii_info, 0x1e, 0x200c); | 396 | ucc_geth_phy_write(mii_info, 0x1e, 0x200c); |
| 374 | phy_write(mii_info, 0x1d, 0x5); | 397 | ucc_geth_phy_write(mii_info, 0x1d, 0x5); |
| 375 | phy_write(mii_info, 0x1e, 0); | 398 | ucc_geth_phy_write(mii_info, 0x1e, 0); |
| 376 | phy_write(mii_info, 0x1e, 0x100); | 399 | ucc_geth_phy_write(mii_info, 0x1e, 0x100); |
| 377 | 400 | ||
| 378 | gbit_config_aneg(mii_info); | 401 | gbit_config_aneg(mii_info); |
| 379 | 402 | ||
| @@ -398,7 +421,7 @@ static int marvell_read_status(struct ugeth_mii_info *mii_info) | |||
| 398 | * are as set */ | 421 | * are as set */ |
| 399 | if (mii_info->autoneg && mii_info->link) { | 422 | if (mii_info->autoneg && mii_info->link) { |
| 400 | int speed; | 423 | int speed; |
| 401 | status = phy_read(mii_info, MII_M1011_PHY_SPEC_STATUS); | 424 | status = ucc_geth_phy_read(mii_info, MII_M1011_PHY_SPEC_STATUS); |
| 402 | 425 | ||
| 403 | /* Get the duplexity */ | 426 | /* Get the duplexity */ |
| 404 | if (status & MII_M1011_PHY_SPEC_STATUS_FULLDUPLEX) | 427 | if (status & MII_M1011_PHY_SPEC_STATUS_FULLDUPLEX) |
| @@ -430,7 +453,7 @@ static int marvell_ack_interrupt(struct ugeth_mii_info *mii_info) | |||
| 430 | ugphy_vdbg("%s: IN", __FUNCTION__); | 453 | ugphy_vdbg("%s: IN", __FUNCTION__); |
| 431 | 454 | ||
| 432 | /* Clear the interrupts by reading the reg */ | 455 | /* Clear the interrupts by reading the reg */ |
| 433 | phy_read(mii_info, MII_M1011_IEVENT); | 456 | ucc_geth_phy_read(mii_info, MII_M1011_IEVENT); |
| 434 | 457 | ||
| 435 | return 0; | 458 | return 0; |
| 436 | } | 459 | } |
| @@ -440,9 +463,9 @@ static int marvell_config_intr(struct ugeth_mii_info *mii_info) | |||
| 440 | ugphy_vdbg("%s: IN", __FUNCTION__); | 463 | ugphy_vdbg("%s: IN", __FUNCTION__); |
| 441 | 464 | ||
| 442 | if (mii_info->interrupts == MII_INTERRUPT_ENABLED) | 465 | if (mii_info->interrupts == MII_INTERRUPT_ENABLED) |
| 443 | phy_write(mii_info, MII_M1011_IMASK, MII_M1011_IMASK_INIT); | 466 | ucc_geth_phy_write(mii_info, MII_M1011_IMASK, MII_M1011_IMASK_INIT); |
| 444 | else | 467 | else |
| 445 | phy_write(mii_info, MII_M1011_IMASK, MII_M1011_IMASK_CLEAR); | 468 | ucc_geth_phy_write(mii_info, MII_M1011_IMASK, MII_M1011_IMASK_CLEAR); |
| 446 | 469 | ||
| 447 | return 0; | 470 | return 0; |
| 448 | } | 471 | } |
| @@ -451,9 +474,9 @@ static int cis820x_init(struct ugeth_mii_info *mii_info) | |||
| 451 | { | 474 | { |
| 452 | ugphy_vdbg("%s: IN", __FUNCTION__); | 475 | ugphy_vdbg("%s: IN", __FUNCTION__); |
| 453 | 476 | ||
| 454 | phy_write(mii_info, MII_CIS8201_AUX_CONSTAT, | 477 | ucc_geth_phy_write(mii_info, MII_CIS8201_AUX_CONSTAT, |
| 455 | MII_CIS8201_AUXCONSTAT_INIT); | 478 | MII_CIS8201_AUXCONSTAT_INIT); |
| 456 | phy_write(mii_info, MII_CIS8201_EXT_CON1, MII_CIS8201_EXTCON1_INIT); | 479 | ucc_geth_phy_write(mii_info, MII_CIS8201_EXT_CON1, MII_CIS8201_EXTCON1_INIT); |
| 457 | 480 | ||
| 458 | return 0; | 481 | return 0; |
| 459 | } | 482 | } |
| @@ -477,7 +500,7 @@ static int cis820x_read_status(struct ugeth_mii_info *mii_info) | |||
| 477 | if (mii_info->autoneg && mii_info->link) { | 500 | if (mii_info->autoneg && mii_info->link) { |
| 478 | int speed; | 501 | int speed; |
| 479 | 502 | ||
| 480 | status = phy_read(mii_info, MII_CIS8201_AUX_CONSTAT); | 503 | status = ucc_geth_phy_read(mii_info, MII_CIS8201_AUX_CONSTAT); |
| 481 | if (status & MII_CIS8201_AUXCONSTAT_DUPLEX) | 504 | if (status & MII_CIS8201_AUXCONSTAT_DUPLEX) |
| 482 | mii_info->duplex = DUPLEX_FULL; | 505 | mii_info->duplex = DUPLEX_FULL; |
| 483 | else | 506 | else |
| @@ -505,7 +528,7 @@ static int cis820x_ack_interrupt(struct ugeth_mii_info *mii_info) | |||
| 505 | { | 528 | { |
| 506 | ugphy_vdbg("%s: IN", __FUNCTION__); | 529 | ugphy_vdbg("%s: IN", __FUNCTION__); |
| 507 | 530 | ||
| 508 | phy_read(mii_info, MII_CIS8201_ISTAT); | 531 | ucc_geth_phy_read(mii_info, MII_CIS8201_ISTAT); |
| 509 | 532 | ||
| 510 | return 0; | 533 | return 0; |
| 511 | } | 534 | } |
| @@ -515,9 +538,9 @@ static int cis820x_config_intr(struct ugeth_mii_info *mii_info) | |||
| 515 | ugphy_vdbg("%s: IN", __FUNCTION__); | 538 | ugphy_vdbg("%s: IN", __FUNCTION__); |
| 516 | 539 | ||
| 517 | if (mii_info->interrupts == MII_INTERRUPT_ENABLED) | 540 | if (mii_info->interrupts == MII_INTERRUPT_ENABLED) |
| 518 | phy_write(mii_info, MII_CIS8201_IMASK, MII_CIS8201_IMASK_MASK); | 541 | ucc_geth_phy_write(mii_info, MII_CIS8201_IMASK, MII_CIS8201_IMASK_MASK); |
| 519 | else | 542 | else |
| 520 | phy_write(mii_info, MII_CIS8201_IMASK, 0); | 543 | ucc_geth_phy_write(mii_info, MII_CIS8201_IMASK, 0); |
| 521 | 544 | ||
| 522 | return 0; | 545 | return 0; |
| 523 | } | 546 | } |
| @@ -541,7 +564,7 @@ static int dm9161_read_status(struct ugeth_mii_info *mii_info) | |||
| 541 | /* If we aren't autonegotiating, assume speeds | 564 | /* If we aren't autonegotiating, assume speeds |
| 542 | * are as set */ | 565 | * are as set */ |
| 543 | if (mii_info->autoneg && mii_info->link) { | 566 | if (mii_info->autoneg && mii_info->link) { |
| 544 | status = phy_read(mii_info, MII_DM9161_SCSR); | 567 | status = ucc_geth_phy_read(mii_info, MII_DM9161_SCSR); |
| 545 | if (status & (MII_DM9161_SCSR_100F | MII_DM9161_SCSR_100H)) | 568 | if (status & (MII_DM9161_SCSR_100F | MII_DM9161_SCSR_100H)) |
| 546 | mii_info->speed = SPEED_100; | 569 | mii_info->speed = SPEED_100; |
| 547 | else | 570 | else |
| @@ -572,7 +595,7 @@ static void dm9161_timer(unsigned long data) | |||
| 572 | { | 595 | { |
| 573 | struct ugeth_mii_info *mii_info = (struct ugeth_mii_info *)data; | 596 | struct ugeth_mii_info *mii_info = (struct ugeth_mii_info *)data; |
| 574 | struct dm9161_private *priv = mii_info->priv; | 597 | struct dm9161_private *priv = mii_info->priv; |
| 575 | u16 status = phy_read(mii_info, MII_BMSR); | 598 | u16 status = ucc_geth_phy_read(mii_info, MII_BMSR); |
| 576 | 599 | ||
| 577 | ugphy_vdbg("%s: IN", __FUNCTION__); | 600 | ugphy_vdbg("%s: IN", __FUNCTION__); |
| 578 | 601 | ||
| @@ -599,11 +622,11 @@ static int dm9161_init(struct ugeth_mii_info *mii_info) | |||
| 599 | /* Reset is not done yet */ | 622 | /* Reset is not done yet */ |
| 600 | priv->resetdone = 0; | 623 | priv->resetdone = 0; |
| 601 | 624 | ||
| 602 | phy_write(mii_info, MII_BMCR, | 625 | ucc_geth_phy_write(mii_info, MII_BMCR, |
| 603 | phy_read(mii_info, MII_BMCR) | BMCR_RESET); | 626 | ucc_geth_phy_read(mii_info, MII_BMCR) | BMCR_RESET); |
| 604 | 627 | ||
| 605 | phy_write(mii_info, MII_BMCR, | 628 | ucc_geth_phy_write(mii_info, MII_BMCR, |
| 606 | phy_read(mii_info, MII_BMCR) & ~BMCR_ISOLATE); | 629 | ucc_geth_phy_read(mii_info, MII_BMCR) & ~BMCR_ISOLATE); |
| 607 | 630 | ||
| 608 | config_genmii_advert(mii_info); | 631 | config_genmii_advert(mii_info); |
| 609 | /* Start/Restart aneg */ | 632 | /* Start/Restart aneg */ |
| @@ -634,7 +657,7 @@ static int dm9161_ack_interrupt(struct ugeth_mii_info *mii_info) | |||
| 634 | ugphy_vdbg("%s: IN", __FUNCTION__); | 657 | ugphy_vdbg("%s: IN", __FUNCTION__); |
| 635 | 658 | ||
| 636 | /* Clear the interrupts by reading the reg */ | 659 | /* Clear the interrupts by reading the reg */ |
| 637 | phy_read(mii_info, MII_DM9161_INTR); | 660 | ucc_geth_phy_read(mii_info, MII_DM9161_INTR); |
| 638 | 661 | ||
| 639 | 662 | ||
| 640 | return 0; | 663 | return 0; |
| @@ -645,9 +668,9 @@ static int dm9161_config_intr(struct ugeth_mii_info *mii_info) | |||
| 645 | ugphy_vdbg("%s: IN", __FUNCTION__); | 668 | ugphy_vdbg("%s: IN", __FUNCTION__); |
| 646 | 669 | ||
| 647 | if (mii_info->interrupts == MII_INTERRUPT_ENABLED) | 670 | if (mii_info->interrupts == MII_INTERRUPT_ENABLED) |
| 648 | phy_write(mii_info, MII_DM9161_INTR, MII_DM9161_INTR_INIT); | 671 | ucc_geth_phy_write(mii_info, MII_DM9161_INTR, MII_DM9161_INTR_INIT); |
| 649 | else | 672 | else |
| 650 | phy_write(mii_info, MII_DM9161_INTR, MII_DM9161_INTR_STOP); | 673 | ucc_geth_phy_write(mii_info, MII_DM9161_INTR, MII_DM9161_INTR_STOP); |
| 651 | 674 | ||
| 652 | return 0; | 675 | return 0; |
| 653 | } | 676 | } |
| @@ -718,31 +741,6 @@ static struct phy_info *phy_info[] = { | |||
| 718 | NULL | 741 | NULL |
| 719 | }; | 742 | }; |
| 720 | 743 | ||
| 721 | u16 phy_read(struct ugeth_mii_info *mii_info, u16 regnum) | ||
| 722 | { | ||
| 723 | u16 retval; | ||
| 724 | unsigned long flags; | ||
| 725 | |||
| 726 | ugphy_vdbg("%s: IN", __FUNCTION__); | ||
| 727 | |||
| 728 | spin_lock_irqsave(&mii_info->mdio_lock, flags); | ||
| 729 | retval = mii_info->mdio_read(mii_info->dev, mii_info->mii_id, regnum); | ||
| 730 | spin_unlock_irqrestore(&mii_info->mdio_lock, flags); | ||
| 731 | |||
| 732 | return retval; | ||
| 733 | } | ||
| 734 | |||
| 735 | void phy_write(struct ugeth_mii_info *mii_info, u16 regnum, u16 val) | ||
| 736 | { | ||
| 737 | unsigned long flags; | ||
| 738 | |||
| 739 | ugphy_vdbg("%s: IN", __FUNCTION__); | ||
| 740 | |||
| 741 | spin_lock_irqsave(&mii_info->mdio_lock, flags); | ||
| 742 | mii_info->mdio_write(mii_info->dev, mii_info->mii_id, regnum, val); | ||
| 743 | spin_unlock_irqrestore(&mii_info->mdio_lock, flags); | ||
| 744 | } | ||
| 745 | |||
| 746 | /* Use the PHY ID registers to determine what type of PHY is attached | 744 | /* Use the PHY ID registers to determine what type of PHY is attached |
| 747 | * to device dev. return a struct phy_info structure describing that PHY | 745 | * to device dev. return a struct phy_info structure describing that PHY |
| 748 | */ | 746 | */ |
| @@ -757,11 +755,11 @@ struct phy_info *get_phy_info(struct ugeth_mii_info *mii_info) | |||
| 757 | ugphy_vdbg("%s: IN", __FUNCTION__); | 755 | ugphy_vdbg("%s: IN", __FUNCTION__); |
| 758 | 756 | ||
| 759 | /* Grab the bits from PHYIR1, and put them in the upper half */ | 757 | /* Grab the bits from PHYIR1, and put them in the upper half */ |
| 760 | phy_reg = phy_read(mii_info, MII_PHYSID1); | 758 | phy_reg = ucc_geth_phy_read(mii_info, MII_PHYSID1); |
| 761 | phy_ID = (phy_reg & 0xffff) << 16; | 759 | phy_ID = (phy_reg & 0xffff) << 16; |
| 762 | 760 | ||
| 763 | /* Grab the bits from PHYIR2, and put them in the lower half */ | 761 | /* Grab the bits from PHYIR2, and put them in the lower half */ |
| 764 | phy_reg = phy_read(mii_info, MII_PHYSID2); | 762 | phy_reg = ucc_geth_phy_read(mii_info, MII_PHYSID2); |
| 765 | phy_ID |= (phy_reg & 0xffff); | 763 | phy_ID |= (phy_reg & 0xffff); |
| 766 | 764 | ||
| 767 | /* loop through all the known PHY types, and find one that */ | 765 | /* loop through all the known PHY types, and find one that */ |
diff --git a/drivers/net/wireless/bcm43xx/bcm43xx_main.c b/drivers/net/wireless/bcm43xx/bcm43xx_main.c index 2ec2e5afce67..91b752e3d07e 100644 --- a/drivers/net/wireless/bcm43xx/bcm43xx_main.c +++ b/drivers/net/wireless/bcm43xx/bcm43xx_main.c | |||
| @@ -2701,8 +2701,8 @@ static int bcm43xx_probe_cores(struct bcm43xx_private *bcm) | |||
| 2701 | sb_id_hi = bcm43xx_read32(bcm, BCM43xx_CIR_SB_ID_HI); | 2701 | sb_id_hi = bcm43xx_read32(bcm, BCM43xx_CIR_SB_ID_HI); |
| 2702 | 2702 | ||
| 2703 | /* extract core_id, core_rev, core_vendor */ | 2703 | /* extract core_id, core_rev, core_vendor */ |
| 2704 | core_id = (sb_id_hi & 0xFFF0) >> 4; | 2704 | core_id = (sb_id_hi & 0x8FF0) >> 4; |
| 2705 | core_rev = (sb_id_hi & 0xF); | 2705 | core_rev = ((sb_id_hi & 0xF) | ((sb_id_hi & 0x7000) >> 8)); |
| 2706 | core_vendor = (sb_id_hi & 0xFFFF0000) >> 16; | 2706 | core_vendor = (sb_id_hi & 0xFFFF0000) >> 16; |
| 2707 | 2707 | ||
| 2708 | dprintk(KERN_INFO PFX "Core %d: ID 0x%x, rev 0x%x, vendor 0x%x\n", | 2708 | dprintk(KERN_INFO PFX "Core %d: ID 0x%x, rev 0x%x, vendor 0x%x\n", |
| @@ -2873,7 +2873,10 @@ static int bcm43xx_wireless_core_init(struct bcm43xx_private *bcm, | |||
| 2873 | sbimconfiglow = bcm43xx_read32(bcm, BCM43xx_CIR_SBIMCONFIGLOW); | 2873 | sbimconfiglow = bcm43xx_read32(bcm, BCM43xx_CIR_SBIMCONFIGLOW); |
| 2874 | sbimconfiglow &= ~ BCM43xx_SBIMCONFIGLOW_REQUEST_TOUT_MASK; | 2874 | sbimconfiglow &= ~ BCM43xx_SBIMCONFIGLOW_REQUEST_TOUT_MASK; |
| 2875 | sbimconfiglow &= ~ BCM43xx_SBIMCONFIGLOW_SERVICE_TOUT_MASK; | 2875 | sbimconfiglow &= ~ BCM43xx_SBIMCONFIGLOW_SERVICE_TOUT_MASK; |
| 2876 | sbimconfiglow |= 0x32; | 2876 | if (bcm->bustype == BCM43xx_BUSTYPE_PCI) |
| 2877 | sbimconfiglow |= 0x32; | ||
| 2878 | else | ||
| 2879 | sbimconfiglow |= 0x53; | ||
| 2877 | bcm43xx_write32(bcm, BCM43xx_CIR_SBIMCONFIGLOW, sbimconfiglow); | 2880 | bcm43xx_write32(bcm, BCM43xx_CIR_SBIMCONFIGLOW, sbimconfiglow); |
| 2878 | } | 2881 | } |
| 2879 | 2882 | ||
| @@ -3077,7 +3080,7 @@ static int bcm43xx_setup_backplane_pci_connection(struct bcm43xx_private *bcm, | |||
| 3077 | if (err) | 3080 | if (err) |
| 3078 | goto out; | 3081 | goto out; |
| 3079 | 3082 | ||
| 3080 | if (bcm->current_core->rev < 6 || | 3083 | if (bcm->current_core->rev < 6 && |
| 3081 | bcm->current_core->id == BCM43xx_COREID_PCI) { | 3084 | bcm->current_core->id == BCM43xx_COREID_PCI) { |
| 3082 | value = bcm43xx_read32(bcm, BCM43xx_CIR_SBINTVEC); | 3085 | value = bcm43xx_read32(bcm, BCM43xx_CIR_SBINTVEC); |
| 3083 | value |= (1 << backplane_flag_nr); | 3086 | value |= (1 << backplane_flag_nr); |
diff --git a/drivers/scsi/3w-xxxx.c b/drivers/scsi/3w-xxxx.c index 99a259c5a0c0..e1b44d6c0c32 100644 --- a/drivers/scsi/3w-xxxx.c +++ b/drivers/scsi/3w-xxxx.c | |||
| @@ -6,7 +6,7 @@ | |||
| 6 | Arnaldo Carvalho de Melo <acme@conectiva.com.br> | 6 | Arnaldo Carvalho de Melo <acme@conectiva.com.br> |
| 7 | Brad Strand <linux@3ware.com> | 7 | Brad Strand <linux@3ware.com> |
| 8 | 8 | ||
| 9 | Copyright (C) 1999-2005 3ware Inc. | 9 | Copyright (C) 1999-2007 3ware Inc. |
| 10 | 10 | ||
| 11 | Kernel compatiblity By: Andre Hedrick <andre@suse.com> | 11 | Kernel compatiblity By: Andre Hedrick <andre@suse.com> |
| 12 | Non-Copyright (C) 2000 Andre Hedrick <andre@suse.com> | 12 | Non-Copyright (C) 2000 Andre Hedrick <andre@suse.com> |
| @@ -191,6 +191,9 @@ | |||
| 191 | before shutting down card. | 191 | before shutting down card. |
| 192 | Change to new 'change_queue_depth' api. | 192 | Change to new 'change_queue_depth' api. |
| 193 | Fix 'handled=1' ISR usage, remove bogus IRQ check. | 193 | Fix 'handled=1' ISR usage, remove bogus IRQ check. |
| 194 | 1.26.02.002 - Free irq handler in __tw_shutdown(). | ||
| 195 | Turn on RCD bit for caching mode page. | ||
| 196 | Serialize reset code. | ||
| 194 | */ | 197 | */ |
| 195 | 198 | ||
| 196 | #include <linux/module.h> | 199 | #include <linux/module.h> |
| @@ -214,7 +217,7 @@ | |||
| 214 | #include "3w-xxxx.h" | 217 | #include "3w-xxxx.h" |
| 215 | 218 | ||
| 216 | /* Globals */ | 219 | /* Globals */ |
| 217 | #define TW_DRIVER_VERSION "1.26.02.001" | 220 | #define TW_DRIVER_VERSION "1.26.02.002" |
| 218 | static TW_Device_Extension *tw_device_extension_list[TW_MAX_SLOT]; | 221 | static TW_Device_Extension *tw_device_extension_list[TW_MAX_SLOT]; |
| 219 | static int tw_device_extension_count = 0; | 222 | static int tw_device_extension_count = 0; |
| 220 | static int twe_major = -1; | 223 | static int twe_major = -1; |
| @@ -226,7 +229,7 @@ MODULE_LICENSE("GPL"); | |||
| 226 | MODULE_VERSION(TW_DRIVER_VERSION); | 229 | MODULE_VERSION(TW_DRIVER_VERSION); |
| 227 | 230 | ||
| 228 | /* Function prototypes */ | 231 | /* Function prototypes */ |
| 229 | static int tw_reset_device_extension(TW_Device_Extension *tw_dev, int ioctl_reset); | 232 | static int tw_reset_device_extension(TW_Device_Extension *tw_dev); |
| 230 | 233 | ||
| 231 | /* Functions */ | 234 | /* Functions */ |
| 232 | 235 | ||
| @@ -984,24 +987,12 @@ static int tw_chrdev_ioctl(struct inode *inode, struct file *file, unsigned int | |||
| 984 | /* Now wait for the command to complete */ | 987 | /* Now wait for the command to complete */ |
| 985 | timeout = wait_event_timeout(tw_dev->ioctl_wqueue, tw_dev->chrdev_request_id == TW_IOCTL_CHRDEV_FREE, timeout); | 988 | timeout = wait_event_timeout(tw_dev->ioctl_wqueue, tw_dev->chrdev_request_id == TW_IOCTL_CHRDEV_FREE, timeout); |
| 986 | 989 | ||
| 987 | /* See if we reset while waiting for the ioctl to complete */ | ||
| 988 | if (test_bit(TW_IN_RESET, &tw_dev->flags)) { | ||
| 989 | clear_bit(TW_IN_RESET, &tw_dev->flags); | ||
| 990 | retval = -ERESTARTSYS; | ||
| 991 | goto out2; | ||
| 992 | } | ||
| 993 | |||
| 994 | /* We timed out, and didn't get an interrupt */ | 990 | /* We timed out, and didn't get an interrupt */ |
| 995 | if (tw_dev->chrdev_request_id != TW_IOCTL_CHRDEV_FREE) { | 991 | if (tw_dev->chrdev_request_id != TW_IOCTL_CHRDEV_FREE) { |
| 996 | /* Now we need to reset the board */ | 992 | /* Now we need to reset the board */ |
| 997 | printk(KERN_WARNING "3w-xxxx: scsi%d: Character ioctl (0x%x) timed out, resetting card.\n", tw_dev->host->host_no, cmd); | 993 | printk(KERN_WARNING "3w-xxxx: scsi%d: Character ioctl (0x%x) timed out, resetting card.\n", tw_dev->host->host_no, cmd); |
| 998 | retval = -EIO; | 994 | retval = -EIO; |
| 999 | spin_lock_irqsave(tw_dev->host->host_lock, flags); | 995 | if (tw_reset_device_extension(tw_dev)) { |
| 1000 | tw_dev->state[request_id] = TW_S_COMPLETED; | ||
| 1001 | tw_state_request_finish(tw_dev, request_id); | ||
| 1002 | tw_dev->posted_request_count--; | ||
| 1003 | spin_unlock_irqrestore(tw_dev->host->host_lock, flags); | ||
| 1004 | if (tw_reset_device_extension(tw_dev, 1)) { | ||
| 1005 | printk(KERN_WARNING "3w-xxxx: tw_chrdev_ioctl(): Reset failed for card %d.\n", tw_dev->host->host_no); | 996 | printk(KERN_WARNING "3w-xxxx: tw_chrdev_ioctl(): Reset failed for card %d.\n", tw_dev->host->host_no); |
| 1006 | } | 997 | } |
| 1007 | goto out2; | 998 | goto out2; |
| @@ -1336,7 +1327,7 @@ static void tw_unmap_scsi_data(struct pci_dev *pdev, struct scsi_cmnd *cmd) | |||
| 1336 | } /* End tw_unmap_scsi_data() */ | 1327 | } /* End tw_unmap_scsi_data() */ |
| 1337 | 1328 | ||
| 1338 | /* This function will reset a device extension */ | 1329 | /* This function will reset a device extension */ |
| 1339 | static int tw_reset_device_extension(TW_Device_Extension *tw_dev, int ioctl_reset) | 1330 | static int tw_reset_device_extension(TW_Device_Extension *tw_dev) |
| 1340 | { | 1331 | { |
| 1341 | int i = 0; | 1332 | int i = 0; |
| 1342 | struct scsi_cmnd *srb; | 1333 | struct scsi_cmnd *srb; |
| @@ -1382,15 +1373,10 @@ static int tw_reset_device_extension(TW_Device_Extension *tw_dev, int ioctl_rese | |||
| 1382 | printk(KERN_WARNING "3w-xxxx: scsi%d: Reset sequence failed.\n", tw_dev->host->host_no); | 1373 | printk(KERN_WARNING "3w-xxxx: scsi%d: Reset sequence failed.\n", tw_dev->host->host_no); |
| 1383 | return 1; | 1374 | return 1; |
| 1384 | } | 1375 | } |
| 1385 | TW_ENABLE_AND_CLEAR_INTERRUPTS(tw_dev); | ||
| 1386 | 1376 | ||
| 1387 | /* Wake up any ioctl that was pending before the reset */ | 1377 | TW_ENABLE_AND_CLEAR_INTERRUPTS(tw_dev); |
| 1388 | if ((tw_dev->chrdev_request_id == TW_IOCTL_CHRDEV_FREE) || (ioctl_reset)) { | 1378 | clear_bit(TW_IN_RESET, &tw_dev->flags); |
| 1389 | clear_bit(TW_IN_RESET, &tw_dev->flags); | 1379 | tw_dev->chrdev_request_id = TW_IOCTL_CHRDEV_FREE; |
| 1390 | } else { | ||
| 1391 | tw_dev->chrdev_request_id = TW_IOCTL_CHRDEV_FREE; | ||
| 1392 | wake_up(&tw_dev->ioctl_wqueue); | ||
| 1393 | } | ||
| 1394 | 1380 | ||
| 1395 | return 0; | 1381 | return 0; |
| 1396 | } /* End tw_reset_device_extension() */ | 1382 | } /* End tw_reset_device_extension() */ |
| @@ -1437,14 +1423,18 @@ static int tw_scsi_eh_reset(struct scsi_cmnd *SCpnt) | |||
| 1437 | "WARNING: Command (0x%x) timed out, resetting card.\n", | 1423 | "WARNING: Command (0x%x) timed out, resetting card.\n", |
| 1438 | SCpnt->cmnd[0]); | 1424 | SCpnt->cmnd[0]); |
| 1439 | 1425 | ||
| 1426 | /* Make sure we are not issuing an ioctl or resetting from ioctl */ | ||
| 1427 | mutex_lock(&tw_dev->ioctl_lock); | ||
| 1428 | |||
| 1440 | /* Now reset the card and some of the device extension data */ | 1429 | /* Now reset the card and some of the device extension data */ |
| 1441 | if (tw_reset_device_extension(tw_dev, 0)) { | 1430 | if (tw_reset_device_extension(tw_dev)) { |
| 1442 | printk(KERN_WARNING "3w-xxxx: scsi%d: Reset failed.\n", tw_dev->host->host_no); | 1431 | printk(KERN_WARNING "3w-xxxx: scsi%d: Reset failed.\n", tw_dev->host->host_no); |
| 1443 | goto out; | 1432 | goto out; |
| 1444 | } | 1433 | } |
| 1445 | 1434 | ||
| 1446 | retval = SUCCESS; | 1435 | retval = SUCCESS; |
| 1447 | out: | 1436 | out: |
| 1437 | mutex_unlock(&tw_dev->ioctl_lock); | ||
| 1448 | return retval; | 1438 | return retval; |
| 1449 | } /* End tw_scsi_eh_reset() */ | 1439 | } /* End tw_scsi_eh_reset() */ |
| 1450 | 1440 | ||
| @@ -1660,9 +1650,9 @@ static int tw_scsiop_mode_sense_complete(TW_Device_Extension *tw_dev, int reques | |||
| 1660 | request_buffer[4] = 0x8; /* caching page */ | 1650 | request_buffer[4] = 0x8; /* caching page */ |
| 1661 | request_buffer[5] = 0xa; /* page length */ | 1651 | request_buffer[5] = 0xa; /* page length */ |
| 1662 | if (*flags & 0x1) | 1652 | if (*flags & 0x1) |
| 1663 | request_buffer[6] = 0x4; /* WCE on */ | 1653 | request_buffer[6] = 0x5; /* WCE on, RCD on */ |
| 1664 | else | 1654 | else |
| 1665 | request_buffer[6] = 0x0; /* WCE off */ | 1655 | request_buffer[6] = 0x1; /* WCE off, RCD on */ |
| 1666 | tw_transfer_internal(tw_dev, request_id, request_buffer, | 1656 | tw_transfer_internal(tw_dev, request_id, request_buffer, |
| 1667 | sizeof(request_buffer)); | 1657 | sizeof(request_buffer)); |
| 1668 | 1658 | ||
| @@ -2012,6 +2002,10 @@ static int tw_scsi_queue(struct scsi_cmnd *SCpnt, void (*done)(struct scsi_cmnd | |||
| 2012 | int retval = 1; | 2002 | int retval = 1; |
| 2013 | TW_Device_Extension *tw_dev = (TW_Device_Extension *)SCpnt->device->host->hostdata; | 2003 | TW_Device_Extension *tw_dev = (TW_Device_Extension *)SCpnt->device->host->hostdata; |
| 2014 | 2004 | ||
| 2005 | /* If we are resetting due to timed out ioctl, report as busy */ | ||
| 2006 | if (test_bit(TW_IN_RESET, &tw_dev->flags)) | ||
| 2007 | return SCSI_MLQUEUE_HOST_BUSY; | ||
| 2008 | |||
| 2015 | /* Save done function into Scsi_Cmnd struct */ | 2009 | /* Save done function into Scsi_Cmnd struct */ |
| 2016 | SCpnt->scsi_done = done; | 2010 | SCpnt->scsi_done = done; |
| 2017 | 2011 | ||
| @@ -2100,6 +2094,10 @@ static irqreturn_t tw_interrupt(int irq, void *dev_instance) | |||
| 2100 | 2094 | ||
| 2101 | handled = 1; | 2095 | handled = 1; |
| 2102 | 2096 | ||
| 2097 | /* If we are resetting, bail */ | ||
| 2098 | if (test_bit(TW_IN_RESET, &tw_dev->flags)) | ||
| 2099 | goto tw_interrupt_bail; | ||
| 2100 | |||
| 2103 | /* Check controller for errors */ | 2101 | /* Check controller for errors */ |
| 2104 | if (tw_check_bits(status_reg_value)) { | 2102 | if (tw_check_bits(status_reg_value)) { |
| 2105 | dprintk(KERN_WARNING "3w-xxxx: tw_interrupt(): Unexpected bits.\n"); | 2103 | dprintk(KERN_WARNING "3w-xxxx: tw_interrupt(): Unexpected bits.\n"); |
| @@ -2276,6 +2274,9 @@ static void __tw_shutdown(TW_Device_Extension *tw_dev) | |||
| 2276 | /* Disable interrupts */ | 2274 | /* Disable interrupts */ |
| 2277 | TW_DISABLE_INTERRUPTS(tw_dev); | 2275 | TW_DISABLE_INTERRUPTS(tw_dev); |
| 2278 | 2276 | ||
| 2277 | /* Free up the IRQ */ | ||
| 2278 | free_irq(tw_dev->tw_pci_dev->irq, tw_dev); | ||
| 2279 | |||
| 2279 | printk(KERN_WARNING "3w-xxxx: Shutting down host %d.\n", tw_dev->host->host_no); | 2280 | printk(KERN_WARNING "3w-xxxx: Shutting down host %d.\n", tw_dev->host->host_no); |
| 2280 | 2281 | ||
| 2281 | /* Tell the card we are shutting down */ | 2282 | /* Tell the card we are shutting down */ |
| @@ -2444,9 +2445,6 @@ static void tw_remove(struct pci_dev *pdev) | |||
| 2444 | twe_major = -1; | 2445 | twe_major = -1; |
| 2445 | } | 2446 | } |
| 2446 | 2447 | ||
| 2447 | /* Free up the IRQ */ | ||
| 2448 | free_irq(tw_dev->tw_pci_dev->irq, tw_dev); | ||
| 2449 | |||
| 2450 | /* Shutdown the card */ | 2448 | /* Shutdown the card */ |
| 2451 | __tw_shutdown(tw_dev); | 2449 | __tw_shutdown(tw_dev); |
| 2452 | 2450 | ||
diff --git a/drivers/scsi/3w-xxxx.h b/drivers/scsi/3w-xxxx.h index bbd654a2b9b1..0742e6846656 100644 --- a/drivers/scsi/3w-xxxx.h +++ b/drivers/scsi/3w-xxxx.h | |||
| @@ -6,7 +6,7 @@ | |||
| 6 | Arnaldo Carvalho de Melo <acme@conectiva.com.br> | 6 | Arnaldo Carvalho de Melo <acme@conectiva.com.br> |
| 7 | Brad Strand <linux@3ware.com> | 7 | Brad Strand <linux@3ware.com> |
| 8 | 8 | ||
| 9 | Copyright (C) 1999-2005 3ware Inc. | 9 | Copyright (C) 1999-2007 3ware Inc. |
| 10 | 10 | ||
| 11 | Kernel compatiblity By: Andre Hedrick <andre@suse.com> | 11 | Kernel compatiblity By: Andre Hedrick <andre@suse.com> |
| 12 | Non-Copyright (C) 2000 Andre Hedrick <andre@suse.com> | 12 | Non-Copyright (C) 2000 Andre Hedrick <andre@suse.com> |
diff --git a/drivers/scsi/Kconfig b/drivers/scsi/Kconfig index 60f582727185..7869c34a4a3e 100644 --- a/drivers/scsi/Kconfig +++ b/drivers/scsi/Kconfig | |||
| @@ -1303,7 +1303,7 @@ config SCSI_LPFC | |||
| 1303 | 1303 | ||
| 1304 | config SCSI_SEAGATE | 1304 | config SCSI_SEAGATE |
| 1305 | tristate "Seagate ST-02 and Future Domain TMC-8xx SCSI support" | 1305 | tristate "Seagate ST-02 and Future Domain TMC-8xx SCSI support" |
| 1306 | depends on X86 && ISA && SCSI && BROKEN | 1306 | depends on X86 && ISA && SCSI |
| 1307 | ---help--- | 1307 | ---help--- |
| 1308 | These are 8-bit SCSI controllers; the ST-01 is also supported by | 1308 | These are 8-bit SCSI controllers; the ST-01 is also supported by |
| 1309 | this driver. It is explained in section 3.9 of the SCSI-HOWTO, | 1309 | this driver. It is explained in section 3.9 of the SCSI-HOWTO, |
diff --git a/drivers/scsi/aacraid/linit.c b/drivers/scsi/aacraid/linit.c index 359e7ddfdb47..d2cf875af59b 100644 --- a/drivers/scsi/aacraid/linit.c +++ b/drivers/scsi/aacraid/linit.c | |||
| @@ -117,8 +117,8 @@ static struct pci_device_id aac_pci_tbl[] = { | |||
| 117 | { 0x9005, 0x0286, 0x9005, 0x029b, 0, 0, 22 }, /* AAR-2820SA (Intruder) */ | 117 | { 0x9005, 0x0286, 0x9005, 0x029b, 0, 0, 22 }, /* AAR-2820SA (Intruder) */ |
| 118 | { 0x9005, 0x0286, 0x9005, 0x029c, 0, 0, 23 }, /* AAR-2620SA (Intruder) */ | 118 | { 0x9005, 0x0286, 0x9005, 0x029c, 0, 0, 23 }, /* AAR-2620SA (Intruder) */ |
| 119 | { 0x9005, 0x0286, 0x9005, 0x029d, 0, 0, 24 }, /* AAR-2420SA (Intruder) */ | 119 | { 0x9005, 0x0286, 0x9005, 0x029d, 0, 0, 24 }, /* AAR-2420SA (Intruder) */ |
| 120 | { 0x9005, 0x0286, 0x9005, 0x029e, 0, 0, 25 }, /* ICP9024R0 (Lancer) */ | 120 | { 0x9005, 0x0286, 0x9005, 0x029e, 0, 0, 25 }, /* ICP9024RO (Lancer) */ |
| 121 | { 0x9005, 0x0286, 0x9005, 0x029f, 0, 0, 26 }, /* ICP9014R0 (Lancer) */ | 121 | { 0x9005, 0x0286, 0x9005, 0x029f, 0, 0, 26 }, /* ICP9014RO (Lancer) */ |
| 122 | { 0x9005, 0x0286, 0x9005, 0x02a0, 0, 0, 27 }, /* ICP9047MA (Lancer) */ | 122 | { 0x9005, 0x0286, 0x9005, 0x02a0, 0, 0, 27 }, /* ICP9047MA (Lancer) */ |
| 123 | { 0x9005, 0x0286, 0x9005, 0x02a1, 0, 0, 28 }, /* ICP9087MA (Lancer) */ | 123 | { 0x9005, 0x0286, 0x9005, 0x02a1, 0, 0, 28 }, /* ICP9087MA (Lancer) */ |
| 124 | { 0x9005, 0x0286, 0x9005, 0x02a3, 0, 0, 29 }, /* ICP5445AU (Hurricane44) */ | 124 | { 0x9005, 0x0286, 0x9005, 0x02a3, 0, 0, 29 }, /* ICP5445AU (Hurricane44) */ |
| @@ -137,15 +137,15 @@ static struct pci_device_id aac_pci_tbl[] = { | |||
| 137 | { 0x9005, 0x0285, 0x9005, 0x0294, 0, 0, 41 }, /* ESD SO-DIMM PCI-X SATA ZCR (Prowler) */ | 137 | { 0x9005, 0x0285, 0x9005, 0x0294, 0, 0, 41 }, /* ESD SO-DIMM PCI-X SATA ZCR (Prowler) */ |
| 138 | { 0x9005, 0x0285, 0x103C, 0x3227, 0, 0, 42 }, /* AAR-2610SA PCI SATA 6ch */ | 138 | { 0x9005, 0x0285, 0x103C, 0x3227, 0, 0, 42 }, /* AAR-2610SA PCI SATA 6ch */ |
| 139 | { 0x9005, 0x0285, 0x9005, 0x0296, 0, 0, 43 }, /* ASR-2240S (SabreExpress) */ | 139 | { 0x9005, 0x0285, 0x9005, 0x0296, 0, 0, 43 }, /* ASR-2240S (SabreExpress) */ |
| 140 | { 0x9005, 0x0285, 0x9005, 0x0297, 0, 0, 44 }, /* ASR-4005SAS */ | 140 | { 0x9005, 0x0285, 0x9005, 0x0297, 0, 0, 44 }, /* ASR-4005 */ |
| 141 | { 0x9005, 0x0285, 0x1014, 0x02F2, 0, 0, 45 }, /* IBM 8i (AvonPark) */ | 141 | { 0x9005, 0x0285, 0x1014, 0x02F2, 0, 0, 45 }, /* IBM 8i (AvonPark) */ |
| 142 | { 0x9005, 0x0285, 0x1014, 0x0312, 0, 0, 45 }, /* IBM 8i (AvonPark Lite) */ | 142 | { 0x9005, 0x0285, 0x1014, 0x0312, 0, 0, 45 }, /* IBM 8i (AvonPark Lite) */ |
| 143 | { 0x9005, 0x0286, 0x1014, 0x9580, 0, 0, 46 }, /* IBM 8k/8k-l8 (Aurora) */ | 143 | { 0x9005, 0x0286, 0x1014, 0x9580, 0, 0, 46 }, /* IBM 8k/8k-l8 (Aurora) */ |
| 144 | { 0x9005, 0x0286, 0x1014, 0x9540, 0, 0, 47 }, /* IBM 8k/8k-l4 (Aurora Lite) */ | 144 | { 0x9005, 0x0286, 0x1014, 0x9540, 0, 0, 47 }, /* IBM 8k/8k-l4 (Aurora Lite) */ |
| 145 | { 0x9005, 0x0285, 0x9005, 0x0298, 0, 0, 48 }, /* ASR-4000SAS (BlackBird) */ | 145 | { 0x9005, 0x0285, 0x9005, 0x0298, 0, 0, 48 }, /* ASR-4000 (BlackBird) */ |
| 146 | { 0x9005, 0x0285, 0x9005, 0x0299, 0, 0, 49 }, /* ASR-4800SAS (Marauder-X) */ | 146 | { 0x9005, 0x0285, 0x9005, 0x0299, 0, 0, 49 }, /* ASR-4800SAS (Marauder-X) */ |
| 147 | { 0x9005, 0x0285, 0x9005, 0x029a, 0, 0, 50 }, /* ASR-4805SAS (Marauder-E) */ | 147 | { 0x9005, 0x0285, 0x9005, 0x029a, 0, 0, 50 }, /* ASR-4805SAS (Marauder-E) */ |
| 148 | { 0x9005, 0x0286, 0x9005, 0x02a2, 0, 0, 51 }, /* ASR-3800SAS (Hurricane44) */ | 148 | { 0x9005, 0x0286, 0x9005, 0x02a2, 0, 0, 51 }, /* ASR-3800 (Hurricane44) */ |
| 149 | 149 | ||
| 150 | { 0x9005, 0x0285, 0x1028, 0x0287, 0, 0, 52 }, /* Perc 320/DC*/ | 150 | { 0x9005, 0x0285, 0x1028, 0x0287, 0, 0, 52 }, /* Perc 320/DC*/ |
| 151 | { 0x1011, 0x0046, 0x9005, 0x0365, 0, 0, 53 }, /* Adaptec 5400S (Mustang)*/ | 151 | { 0x1011, 0x0046, 0x9005, 0x0365, 0, 0, 53 }, /* Adaptec 5400S (Mustang)*/ |
| @@ -193,8 +193,8 @@ static struct aac_driver_ident aac_drivers[] = { | |||
| 193 | { aac_rkt_init, "aacraid", "ADAPTEC ", "AAR-2820SA ", 1 }, /* AAR-2820SA (Intruder) */ | 193 | { aac_rkt_init, "aacraid", "ADAPTEC ", "AAR-2820SA ", 1 }, /* AAR-2820SA (Intruder) */ |
| 194 | { aac_rkt_init, "aacraid", "ADAPTEC ", "AAR-2620SA ", 1 }, /* AAR-2620SA (Intruder) */ | 194 | { aac_rkt_init, "aacraid", "ADAPTEC ", "AAR-2620SA ", 1 }, /* AAR-2620SA (Intruder) */ |
| 195 | { aac_rkt_init, "aacraid", "ADAPTEC ", "AAR-2420SA ", 1 }, /* AAR-2420SA (Intruder) */ | 195 | { aac_rkt_init, "aacraid", "ADAPTEC ", "AAR-2420SA ", 1 }, /* AAR-2420SA (Intruder) */ |
| 196 | { aac_rkt_init, "aacraid", "ICP ", "ICP9024R0 ", 2 }, /* ICP9024R0 (Lancer) */ | 196 | { aac_rkt_init, "aacraid", "ICP ", "ICP9024RO ", 2 }, /* ICP9024RO (Lancer) */ |
| 197 | { aac_rkt_init, "aacraid", "ICP ", "ICP9014R0 ", 1 }, /* ICP9014R0 (Lancer) */ | 197 | { aac_rkt_init, "aacraid", "ICP ", "ICP9014RO ", 1 }, /* ICP9014RO (Lancer) */ |
| 198 | { aac_rkt_init, "aacraid", "ICP ", "ICP9047MA ", 1 }, /* ICP9047MA (Lancer) */ | 198 | { aac_rkt_init, "aacraid", "ICP ", "ICP9047MA ", 1 }, /* ICP9047MA (Lancer) */ |
| 199 | { aac_rkt_init, "aacraid", "ICP ", "ICP9087MA ", 1 }, /* ICP9087MA (Lancer) */ | 199 | { aac_rkt_init, "aacraid", "ICP ", "ICP9087MA ", 1 }, /* ICP9087MA (Lancer) */ |
| 200 | { aac_rkt_init, "aacraid", "ICP ", "ICP5445AU ", 1 }, /* ICP5445AU (Hurricane44) */ | 200 | { aac_rkt_init, "aacraid", "ICP ", "ICP5445AU ", 1 }, /* ICP5445AU (Hurricane44) */ |
| @@ -212,14 +212,14 @@ static struct aac_driver_ident aac_drivers[] = { | |||
| 212 | { aac_rx_init, "aacraid", "ADAPTEC ", "ASR-2026ZCR ", 1 }, /* ESD SO-DIMM PCI-X SATA ZCR (Prowler) */ | 212 | { aac_rx_init, "aacraid", "ADAPTEC ", "ASR-2026ZCR ", 1 }, /* ESD SO-DIMM PCI-X SATA ZCR (Prowler) */ |
| 213 | { aac_rx_init, "aacraid", "ADAPTEC ", "AAR-2610SA ", 1 }, /* SATA 6Ch (Bearcat) */ | 213 | { aac_rx_init, "aacraid", "ADAPTEC ", "AAR-2610SA ", 1 }, /* SATA 6Ch (Bearcat) */ |
| 214 | { aac_rx_init, "aacraid", "ADAPTEC ", "ASR-2240S ", 1 }, /* ASR-2240S (SabreExpress) */ | 214 | { aac_rx_init, "aacraid", "ADAPTEC ", "ASR-2240S ", 1 }, /* ASR-2240S (SabreExpress) */ |
| 215 | { aac_rx_init, "aacraid", "ADAPTEC ", "ASR-4005SAS ", 1 }, /* ASR-4005SAS */ | 215 | { aac_rx_init, "aacraid", "ADAPTEC ", "ASR-4005 ", 1 }, /* ASR-4005 */ |
| 216 | { aac_rx_init, "ServeRAID","IBM ", "ServeRAID 8i ", 1 }, /* IBM 8i (AvonPark) */ | 216 | { aac_rx_init, "ServeRAID","IBM ", "ServeRAID 8i ", 1 }, /* IBM 8i (AvonPark) */ |
| 217 | { aac_rkt_init, "ServeRAID","IBM ", "ServeRAID 8k-l8 ", 1 }, /* IBM 8k/8k-l8 (Aurora) */ | 217 | { aac_rkt_init, "ServeRAID","IBM ", "ServeRAID 8k-l8 ", 1 }, /* IBM 8k/8k-l8 (Aurora) */ |
| 218 | { aac_rkt_init, "ServeRAID","IBM ", "ServeRAID 8k-l4 ", 1 }, /* IBM 8k/8k-l4 (Aurora Lite) */ | 218 | { aac_rkt_init, "ServeRAID","IBM ", "ServeRAID 8k-l4 ", 1 }, /* IBM 8k/8k-l4 (Aurora Lite) */ |
| 219 | { aac_rx_init, "aacraid", "ADAPTEC ", "ASR-4000SAS ", 1 }, /* ASR-4000SAS (BlackBird & AvonPark) */ | 219 | { aac_rx_init, "aacraid", "ADAPTEC ", "ASR-4000 ", 1 }, /* ASR-4000 (BlackBird & AvonPark) */ |
| 220 | { aac_rx_init, "aacraid", "ADAPTEC ", "ASR-4800SAS ", 1 }, /* ASR-4800SAS (Marauder-X) */ | 220 | { aac_rx_init, "aacraid", "ADAPTEC ", "ASR-4800SAS ", 1 }, /* ASR-4800SAS (Marauder-X) */ |
| 221 | { aac_rx_init, "aacraid", "ADAPTEC ", "ASR-4805SAS ", 1 }, /* ASR-4805SAS (Marauder-E) */ | 221 | { aac_rx_init, "aacraid", "ADAPTEC ", "ASR-4805SAS ", 1 }, /* ASR-4805SAS (Marauder-E) */ |
| 222 | { aac_rkt_init, "aacraid", "ADAPTEC ", "ASR-3800SAS ", 1 }, /* ASR-3800SAS (Hurricane44) */ | 222 | { aac_rkt_init, "aacraid", "ADAPTEC ", "ASR-3800 ", 1 }, /* ASR-3800 (Hurricane44) */ |
| 223 | 223 | ||
| 224 | { aac_rx_init, "percraid", "DELL ", "PERC 320/DC ", 2, AAC_QUIRK_31BIT | AAC_QUIRK_34SG }, /* Perc 320/DC*/ | 224 | { aac_rx_init, "percraid", "DELL ", "PERC 320/DC ", 2, AAC_QUIRK_31BIT | AAC_QUIRK_34SG }, /* Perc 320/DC*/ |
| 225 | { aac_sa_init, "aacraid", "ADAPTEC ", "Adaptec 5400S ", 4, AAC_QUIRK_34SG }, /* Adaptec 5400S (Mustang)*/ | 225 | { aac_sa_init, "aacraid", "ADAPTEC ", "Adaptec 5400S ", 4, AAC_QUIRK_34SG }, /* Adaptec 5400S (Mustang)*/ |
diff --git a/drivers/scsi/advansys.c b/drivers/scsi/advansys.c index 2b344356a29e..306bec355e45 100644 --- a/drivers/scsi/advansys.c +++ b/drivers/scsi/advansys.c | |||
| @@ -18215,6 +18215,7 @@ AdvInquiryHandling( | |||
| 18215 | } | 18215 | } |
| 18216 | MODULE_LICENSE("Dual BSD/GPL"); | 18216 | MODULE_LICENSE("Dual BSD/GPL"); |
| 18217 | 18217 | ||
| 18218 | #ifdef CONFIG_PCI | ||
| 18218 | /* PCI Devices supported by this driver */ | 18219 | /* PCI Devices supported by this driver */ |
| 18219 | static struct pci_device_id advansys_pci_tbl[] __devinitdata = { | 18220 | static struct pci_device_id advansys_pci_tbl[] __devinitdata = { |
| 18220 | { PCI_VENDOR_ID_ASP, PCI_DEVICE_ID_ASP_1200A, | 18221 | { PCI_VENDOR_ID_ASP, PCI_DEVICE_ID_ASP_1200A, |
| @@ -18232,4 +18233,4 @@ static struct pci_device_id advansys_pci_tbl[] __devinitdata = { | |||
| 18232 | { } | 18233 | { } |
| 18233 | }; | 18234 | }; |
| 18234 | MODULE_DEVICE_TABLE(pci, advansys_pci_tbl); | 18235 | MODULE_DEVICE_TABLE(pci, advansys_pci_tbl); |
| 18235 | 18236 | #endif /* CONFIG_PCI */ | |
diff --git a/drivers/scsi/iscsi_tcp.c b/drivers/scsi/iscsi_tcp.c index d0b139cccbbc..437684084377 100644 --- a/drivers/scsi/iscsi_tcp.c +++ b/drivers/scsi/iscsi_tcp.c | |||
| @@ -749,7 +749,7 @@ static int iscsi_scsi_data_in(struct iscsi_conn *conn) | |||
| 749 | if (!offset) | 749 | if (!offset) |
| 750 | crypto_hash_update( | 750 | crypto_hash_update( |
| 751 | &tcp_conn->rx_hash, | 751 | &tcp_conn->rx_hash, |
| 752 | &sg[i], 1); | 752 | &sg[i], sg[i].length); |
| 753 | else | 753 | else |
| 754 | partial_sg_digest_update( | 754 | partial_sg_digest_update( |
| 755 | &tcp_conn->rx_hash, | 755 | &tcp_conn->rx_hash, |
| @@ -1777,13 +1777,13 @@ iscsi_tcp_conn_create(struct iscsi_cls_session *cls_session, uint32_t conn_idx) | |||
| 1777 | tcp_conn->tx_hash.tfm = crypto_alloc_hash("crc32c", 0, | 1777 | tcp_conn->tx_hash.tfm = crypto_alloc_hash("crc32c", 0, |
| 1778 | CRYPTO_ALG_ASYNC); | 1778 | CRYPTO_ALG_ASYNC); |
| 1779 | tcp_conn->tx_hash.flags = 0; | 1779 | tcp_conn->tx_hash.flags = 0; |
| 1780 | if (!tcp_conn->tx_hash.tfm) | 1780 | if (IS_ERR(tcp_conn->tx_hash.tfm)) |
| 1781 | goto free_tcp_conn; | 1781 | goto free_tcp_conn; |
| 1782 | 1782 | ||
| 1783 | tcp_conn->rx_hash.tfm = crypto_alloc_hash("crc32c", 0, | 1783 | tcp_conn->rx_hash.tfm = crypto_alloc_hash("crc32c", 0, |
| 1784 | CRYPTO_ALG_ASYNC); | 1784 | CRYPTO_ALG_ASYNC); |
| 1785 | tcp_conn->rx_hash.flags = 0; | 1785 | tcp_conn->rx_hash.flags = 0; |
| 1786 | if (!tcp_conn->rx_hash.tfm) | 1786 | if (IS_ERR(tcp_conn->rx_hash.tfm)) |
| 1787 | goto free_tx_tfm; | 1787 | goto free_tx_tfm; |
| 1788 | 1788 | ||
| 1789 | return cls_conn; | 1789 | return cls_conn; |
| @@ -2044,13 +2044,11 @@ iscsi_tcp_conn_get_param(struct iscsi_cls_conn *cls_conn, | |||
| 2044 | sk = tcp_conn->sock->sk; | 2044 | sk = tcp_conn->sock->sk; |
| 2045 | if (sk->sk_family == PF_INET) { | 2045 | if (sk->sk_family == PF_INET) { |
| 2046 | inet = inet_sk(sk); | 2046 | inet = inet_sk(sk); |
| 2047 | len = sprintf(buf, "%u.%u.%u.%u\n", | 2047 | len = sprintf(buf, NIPQUAD_FMT "\n", |
| 2048 | NIPQUAD(inet->daddr)); | 2048 | NIPQUAD(inet->daddr)); |
| 2049 | } else { | 2049 | } else { |
| 2050 | np = inet6_sk(sk); | 2050 | np = inet6_sk(sk); |
| 2051 | len = sprintf(buf, | 2051 | len = sprintf(buf, NIP6_FMT "\n", NIP6(np->daddr)); |
| 2052 | "%04x:%04x:%04x:%04x:%04x:%04x:%04x:%04x\n", | ||
| 2053 | NIP6(np->daddr)); | ||
| 2054 | } | 2052 | } |
| 2055 | mutex_unlock(&conn->xmitmutex); | 2053 | mutex_unlock(&conn->xmitmutex); |
| 2056 | break; | 2054 | break; |
diff --git a/drivers/scsi/libiscsi.c b/drivers/scsi/libiscsi.c index e11b23c641e2..d37048c96eab 100644 --- a/drivers/scsi/libiscsi.c +++ b/drivers/scsi/libiscsi.c | |||
| @@ -260,7 +260,7 @@ static int iscsi_scsi_cmd_rsp(struct iscsi_conn *conn, struct iscsi_hdr *hdr, | |||
| 260 | } | 260 | } |
| 261 | 261 | ||
| 262 | if (rhdr->cmd_status == SAM_STAT_CHECK_CONDITION) { | 262 | if (rhdr->cmd_status == SAM_STAT_CHECK_CONDITION) { |
| 263 | int senselen; | 263 | uint16_t senselen; |
| 264 | 264 | ||
| 265 | if (datalen < 2) { | 265 | if (datalen < 2) { |
| 266 | invalid_datalen: | 266 | invalid_datalen: |
| @@ -270,12 +270,12 @@ invalid_datalen: | |||
| 270 | goto out; | 270 | goto out; |
| 271 | } | 271 | } |
| 272 | 272 | ||
| 273 | senselen = (data[0] << 8) | data[1]; | 273 | senselen = be16_to_cpu(*(uint16_t *)data); |
| 274 | if (datalen < senselen) | 274 | if (datalen < senselen) |
| 275 | goto invalid_datalen; | 275 | goto invalid_datalen; |
| 276 | 276 | ||
| 277 | memcpy(sc->sense_buffer, data + 2, | 277 | memcpy(sc->sense_buffer, data + 2, |
| 278 | min(senselen, SCSI_SENSE_BUFFERSIZE)); | 278 | min_t(uint16_t, senselen, SCSI_SENSE_BUFFERSIZE)); |
| 279 | debug_scsi("copied %d bytes of sense\n", | 279 | debug_scsi("copied %d bytes of sense\n", |
| 280 | min(senselen, SCSI_SENSE_BUFFERSIZE)); | 280 | min(senselen, SCSI_SENSE_BUFFERSIZE)); |
| 281 | } | 281 | } |
diff --git a/drivers/scsi/lpfc/lpfc_mem.c b/drivers/scsi/lpfc/lpfc_mem.c index 066292d3995a..ec3bbbde6f7a 100644 --- a/drivers/scsi/lpfc/lpfc_mem.c +++ b/drivers/scsi/lpfc/lpfc_mem.c | |||
| @@ -56,6 +56,9 @@ lpfc_mem_alloc(struct lpfc_hba * phba) | |||
| 56 | 56 | ||
| 57 | pool->elements = kmalloc(sizeof(struct lpfc_dmabuf) * | 57 | pool->elements = kmalloc(sizeof(struct lpfc_dmabuf) * |
| 58 | LPFC_MBUF_POOL_SIZE, GFP_KERNEL); | 58 | LPFC_MBUF_POOL_SIZE, GFP_KERNEL); |
| 59 | if (!pool->elements) | ||
| 60 | goto fail_free_lpfc_mbuf_pool; | ||
| 61 | |||
| 59 | pool->max_count = 0; | 62 | pool->max_count = 0; |
| 60 | pool->current_count = 0; | 63 | pool->current_count = 0; |
| 61 | for ( i = 0; i < LPFC_MBUF_POOL_SIZE; i++) { | 64 | for ( i = 0; i < LPFC_MBUF_POOL_SIZE; i++) { |
| @@ -82,10 +85,11 @@ lpfc_mem_alloc(struct lpfc_hba * phba) | |||
| 82 | fail_free_mbox_pool: | 85 | fail_free_mbox_pool: |
| 83 | mempool_destroy(phba->mbox_mem_pool); | 86 | mempool_destroy(phba->mbox_mem_pool); |
| 84 | fail_free_mbuf_pool: | 87 | fail_free_mbuf_pool: |
| 85 | while (--i) | 88 | while (i--) |
| 86 | pci_pool_free(phba->lpfc_mbuf_pool, pool->elements[i].virt, | 89 | pci_pool_free(phba->lpfc_mbuf_pool, pool->elements[i].virt, |
| 87 | pool->elements[i].phys); | 90 | pool->elements[i].phys); |
| 88 | kfree(pool->elements); | 91 | kfree(pool->elements); |
| 92 | fail_free_lpfc_mbuf_pool: | ||
| 89 | pci_pool_destroy(phba->lpfc_mbuf_pool); | 93 | pci_pool_destroy(phba->lpfc_mbuf_pool); |
| 90 | fail_free_dma_buf_pool: | 94 | fail_free_dma_buf_pool: |
| 91 | pci_pool_destroy(phba->lpfc_scsi_dma_buf_pool); | 95 | pci_pool_destroy(phba->lpfc_scsi_dma_buf_pool); |
diff --git a/drivers/scsi/megaraid/megaraid_sas.c b/drivers/scsi/megaraid/megaraid_sas.c index 046223b4ae57..b5bdd0d7a8bf 100644 --- a/drivers/scsi/megaraid/megaraid_sas.c +++ b/drivers/scsi/megaraid/megaraid_sas.c | |||
| @@ -13,8 +13,8 @@ | |||
| 13 | * Version : v00.00.03.05 | 13 | * Version : v00.00.03.05 |
| 14 | * | 14 | * |
| 15 | * Authors: | 15 | * Authors: |
| 16 | * Sreenivas Bagalkote <Sreenivas.Bagalkote@lsil.com> | 16 | * Sreenivas Bagalkote <Sreenivas.Bagalkote@lsi.com> |
| 17 | * Sumant Patro <Sumant.Patro@lsil.com> | 17 | * Sumant Patro <Sumant.Patro@lsi.com> |
| 18 | * | 18 | * |
| 19 | * List of supported controllers | 19 | * List of supported controllers |
| 20 | * | 20 | * |
| @@ -45,7 +45,7 @@ | |||
| 45 | 45 | ||
| 46 | MODULE_LICENSE("GPL"); | 46 | MODULE_LICENSE("GPL"); |
| 47 | MODULE_VERSION(MEGASAS_VERSION); | 47 | MODULE_VERSION(MEGASAS_VERSION); |
| 48 | MODULE_AUTHOR("sreenivas.bagalkote@lsil.com"); | 48 | MODULE_AUTHOR("megaraidlinux@lsi.com"); |
| 49 | MODULE_DESCRIPTION("LSI Logic MegaRAID SAS Driver"); | 49 | MODULE_DESCRIPTION("LSI Logic MegaRAID SAS Driver"); |
| 50 | 50 | ||
| 51 | /* | 51 | /* |
diff --git a/drivers/scsi/qla1280.c b/drivers/scsi/qla1280.c index 16af5b79e587..1548d42a3b43 100644 --- a/drivers/scsi/qla1280.c +++ b/drivers/scsi/qla1280.c | |||
| @@ -1341,7 +1341,7 @@ qla1280_return_status(struct response * sts, struct scsi_cmnd *cp) | |||
| 1341 | int host_status = DID_ERROR; | 1341 | int host_status = DID_ERROR; |
| 1342 | uint16_t comp_status = le16_to_cpu(sts->comp_status); | 1342 | uint16_t comp_status = le16_to_cpu(sts->comp_status); |
| 1343 | uint16_t state_flags = le16_to_cpu(sts->state_flags); | 1343 | uint16_t state_flags = le16_to_cpu(sts->state_flags); |
| 1344 | uint16_t residual_length = le32_to_cpu(sts->residual_length); | 1344 | uint32_t residual_length = le32_to_cpu(sts->residual_length); |
| 1345 | uint16_t scsi_status = le16_to_cpu(sts->scsi_status); | 1345 | uint16_t scsi_status = le16_to_cpu(sts->scsi_status); |
| 1346 | #if DEBUG_QLA1280_INTR | 1346 | #if DEBUG_QLA1280_INTR |
| 1347 | static char *reason[] = { | 1347 | static char *reason[] = { |
| @@ -1413,8 +1413,10 @@ qla1280_return_status(struct response * sts, struct scsi_cmnd *cp) | |||
| 1413 | "scsi: Underflow detected - retrying " | 1413 | "scsi: Underflow detected - retrying " |
| 1414 | "command.\n"); | 1414 | "command.\n"); |
| 1415 | host_status = DID_ERROR; | 1415 | host_status = DID_ERROR; |
| 1416 | } else | 1416 | } else { |
| 1417 | cp->resid = residual_length; | ||
| 1417 | host_status = DID_OK; | 1418 | host_status = DID_OK; |
| 1419 | } | ||
| 1418 | break; | 1420 | break; |
| 1419 | 1421 | ||
| 1420 | default: | 1422 | default: |
diff --git a/drivers/scsi/qla2xxx/qla_def.h b/drivers/scsi/qla2xxx/qla_def.h index c4fc40f8e8ca..2c10130d9e03 100644 --- a/drivers/scsi/qla2xxx/qla_def.h +++ b/drivers/scsi/qla2xxx/qla_def.h | |||
| @@ -1602,6 +1602,7 @@ typedef struct fc_port { | |||
| 1602 | 1602 | ||
| 1603 | #define CT_REJECT_RESPONSE 0x8001 | 1603 | #define CT_REJECT_RESPONSE 0x8001 |
| 1604 | #define CT_ACCEPT_RESPONSE 0x8002 | 1604 | #define CT_ACCEPT_RESPONSE 0x8002 |
| 1605 | #define CT_REASON_INVALID_COMMAND_CODE 0x01 | ||
| 1605 | #define CT_REASON_CANNOT_PERFORM 0x09 | 1606 | #define CT_REASON_CANNOT_PERFORM 0x09 |
| 1606 | #define CT_EXPL_ALREADY_REGISTERED 0x10 | 1607 | #define CT_EXPL_ALREADY_REGISTERED 0x10 |
| 1607 | 1608 | ||
| @@ -2079,6 +2080,7 @@ typedef struct scsi_qla_host { | |||
| 2079 | uint32_t msi_enabled :1; | 2080 | uint32_t msi_enabled :1; |
| 2080 | uint32_t msix_enabled :1; | 2081 | uint32_t msix_enabled :1; |
| 2081 | uint32_t disable_serdes :1; | 2082 | uint32_t disable_serdes :1; |
| 2083 | uint32_t gpsc_supported :1; | ||
| 2082 | } flags; | 2084 | } flags; |
| 2083 | 2085 | ||
| 2084 | atomic_t loop_state; | 2086 | atomic_t loop_state; |
diff --git a/drivers/scsi/qla2xxx/qla_gbl.h b/drivers/scsi/qla2xxx/qla_gbl.h index 32ebeec45ff0..e4dd12f4b80e 100644 --- a/drivers/scsi/qla2xxx/qla_gbl.h +++ b/drivers/scsi/qla2xxx/qla_gbl.h | |||
| @@ -45,7 +45,6 @@ extern void qla2x00_update_fcports(scsi_qla_host_t *); | |||
| 45 | extern int qla2x00_abort_isp(scsi_qla_host_t *); | 45 | extern int qla2x00_abort_isp(scsi_qla_host_t *); |
| 46 | 46 | ||
| 47 | extern void qla2x00_update_fcport(scsi_qla_host_t *, fc_port_t *); | 47 | extern void qla2x00_update_fcport(scsi_qla_host_t *, fc_port_t *); |
| 48 | extern void qla2x00_reg_remote_port(scsi_qla_host_t *, fc_port_t *); | ||
| 49 | 48 | ||
| 50 | extern void qla2x00_alloc_fw_dump(scsi_qla_host_t *); | 49 | extern void qla2x00_alloc_fw_dump(scsi_qla_host_t *); |
| 51 | extern void qla2x00_try_to_stop_firmware(scsi_qla_host_t *); | 50 | extern void qla2x00_try_to_stop_firmware(scsi_qla_host_t *); |
diff --git a/drivers/scsi/qla2xxx/qla_gs.c b/drivers/scsi/qla2xxx/qla_gs.c index 97fbc62ec669..ec5b2dd90d6a 100644 --- a/drivers/scsi/qla2xxx/qla_gs.c +++ b/drivers/scsi/qla2xxx/qla_gs.c | |||
| @@ -127,8 +127,8 @@ qla2x00_chk_ms_status(scsi_qla_host_t *ha, ms_iocb_entry_t *ms_pkt, | |||
| 127 | ha->host_no, routine, ms_pkt->entry_status)); | 127 | ha->host_no, routine, ms_pkt->entry_status)); |
| 128 | } else { | 128 | } else { |
| 129 | if (IS_QLA24XX(ha) || IS_QLA54XX(ha)) | 129 | if (IS_QLA24XX(ha) || IS_QLA54XX(ha)) |
| 130 | comp_status = | 130 | comp_status = le16_to_cpu( |
| 131 | ((struct ct_entry_24xx *)ms_pkt)->comp_status; | 131 | ((struct ct_entry_24xx *)ms_pkt)->comp_status); |
| 132 | else | 132 | else |
| 133 | comp_status = le16_to_cpu(ms_pkt->status); | 133 | comp_status = le16_to_cpu(ms_pkt->status); |
| 134 | switch (comp_status) { | 134 | switch (comp_status) { |
| @@ -143,6 +143,7 @@ qla2x00_chk_ms_status(scsi_qla_host_t *ha, ms_iocb_entry_t *ms_pkt, | |||
| 143 | DEBUG2_3(qla2x00_dump_buffer( | 143 | DEBUG2_3(qla2x00_dump_buffer( |
| 144 | (uint8_t *)&ct_rsp->header, | 144 | (uint8_t *)&ct_rsp->header, |
| 145 | sizeof(struct ct_rsp_hdr))); | 145 | sizeof(struct ct_rsp_hdr))); |
| 146 | rval = QLA_INVALID_COMMAND; | ||
| 146 | } else | 147 | } else |
| 147 | rval = QLA_SUCCESS; | 148 | rval = QLA_SUCCESS; |
| 148 | break; | 149 | break; |
| @@ -1683,7 +1684,7 @@ qla2x00_gfpn_id(scsi_qla_host_t *ha, sw_info_t *list) | |||
| 1683 | memset(list[i].fabric_port_name, 0, WWN_SIZE); | 1684 | memset(list[i].fabric_port_name, 0, WWN_SIZE); |
| 1684 | 1685 | ||
| 1685 | /* Prepare common MS IOCB */ | 1686 | /* Prepare common MS IOCB */ |
| 1686 | ms_pkt = qla2x00_prep_ms_iocb(ha, GFPN_ID_REQ_SIZE, | 1687 | ms_pkt = ha->isp_ops.prep_ms_iocb(ha, GFPN_ID_REQ_SIZE, |
| 1687 | GFPN_ID_RSP_SIZE); | 1688 | GFPN_ID_RSP_SIZE); |
| 1688 | 1689 | ||
| 1689 | /* Prepare CT request */ | 1690 | /* Prepare CT request */ |
| @@ -1784,6 +1785,8 @@ qla2x00_gpsc(scsi_qla_host_t *ha, sw_info_t *list) | |||
| 1784 | 1785 | ||
| 1785 | if (!IS_QLA24XX(ha) && !IS_QLA54XX(ha)) | 1786 | if (!IS_QLA24XX(ha) && !IS_QLA54XX(ha)) |
| 1786 | return QLA_FUNCTION_FAILED; | 1787 | return QLA_FUNCTION_FAILED; |
| 1788 | if (!ha->flags.gpsc_supported) | ||
| 1789 | return QLA_FUNCTION_FAILED; | ||
| 1787 | 1790 | ||
| 1788 | rval = qla2x00_mgmt_svr_login(ha); | 1791 | rval = qla2x00_mgmt_svr_login(ha); |
| 1789 | if (rval) | 1792 | if (rval) |
| @@ -1813,8 +1816,19 @@ qla2x00_gpsc(scsi_qla_host_t *ha, sw_info_t *list) | |||
| 1813 | /*EMPTY*/ | 1816 | /*EMPTY*/ |
| 1814 | DEBUG2_3(printk("scsi(%ld): GPSC issue IOCB " | 1817 | DEBUG2_3(printk("scsi(%ld): GPSC issue IOCB " |
| 1815 | "failed (%d).\n", ha->host_no, rval)); | 1818 | "failed (%d).\n", ha->host_no, rval)); |
| 1816 | } else if (qla2x00_chk_ms_status(ha, ms_pkt, ct_rsp, | 1819 | } else if ((rval = qla2x00_chk_ms_status(ha, ms_pkt, ct_rsp, |
| 1817 | "GPSC") != QLA_SUCCESS) { | 1820 | "GPSC")) != QLA_SUCCESS) { |
| 1821 | /* FM command unsupported? */ | ||
| 1822 | if (rval == QLA_INVALID_COMMAND && | ||
| 1823 | ct_rsp->header.reason_code == | ||
| 1824 | CT_REASON_INVALID_COMMAND_CODE) { | ||
| 1825 | DEBUG2(printk("scsi(%ld): GPSC command " | ||
| 1826 | "unsupported, disabling query...\n", | ||
| 1827 | ha->host_no)); | ||
| 1828 | ha->flags.gpsc_supported = 0; | ||
| 1829 | rval = QLA_FUNCTION_FAILED; | ||
| 1830 | break; | ||
| 1831 | } | ||
| 1818 | rval = QLA_FUNCTION_FAILED; | 1832 | rval = QLA_FUNCTION_FAILED; |
| 1819 | } else { | 1833 | } else { |
| 1820 | /* Save portname */ | 1834 | /* Save portname */ |
diff --git a/drivers/scsi/qla2xxx/qla_init.c b/drivers/scsi/qla2xxx/qla_init.c index a823f0bc519d..b3dac26ddba3 100644 --- a/drivers/scsi/qla2xxx/qla_init.c +++ b/drivers/scsi/qla2xxx/qla_init.c | |||
| @@ -2103,40 +2103,7 @@ qla2x00_iidma_fcport(scsi_qla_host_t *ha, fc_port_t *fcport) | |||
| 2103 | } | 2103 | } |
| 2104 | } | 2104 | } |
| 2105 | 2105 | ||
| 2106 | /* | 2106 | static void |
| 2107 | * qla2x00_update_fcport | ||
| 2108 | * Updates device on list. | ||
| 2109 | * | ||
| 2110 | * Input: | ||
| 2111 | * ha = adapter block pointer. | ||
| 2112 | * fcport = port structure pointer. | ||
| 2113 | * | ||
| 2114 | * Return: | ||
| 2115 | * 0 - Success | ||
| 2116 | * BIT_0 - error | ||
| 2117 | * | ||
| 2118 | * Context: | ||
| 2119 | * Kernel context. | ||
| 2120 | */ | ||
| 2121 | void | ||
| 2122 | qla2x00_update_fcport(scsi_qla_host_t *ha, fc_port_t *fcport) | ||
| 2123 | { | ||
| 2124 | fcport->ha = ha; | ||
| 2125 | fcport->login_retry = 0; | ||
| 2126 | fcport->port_login_retry_count = ha->port_down_retry_count * | ||
| 2127 | PORT_RETRY_TIME; | ||
| 2128 | atomic_set(&fcport->port_down_timer, ha->port_down_retry_count * | ||
| 2129 | PORT_RETRY_TIME); | ||
| 2130 | fcport->flags &= ~FCF_LOGIN_NEEDED; | ||
| 2131 | |||
| 2132 | qla2x00_iidma_fcport(ha, fcport); | ||
| 2133 | |||
| 2134 | atomic_set(&fcport->state, FCS_ONLINE); | ||
| 2135 | |||
| 2136 | qla2x00_reg_remote_port(ha, fcport); | ||
| 2137 | } | ||
| 2138 | |||
| 2139 | void | ||
| 2140 | qla2x00_reg_remote_port(scsi_qla_host_t *ha, fc_port_t *fcport) | 2107 | qla2x00_reg_remote_port(scsi_qla_host_t *ha, fc_port_t *fcport) |
| 2141 | { | 2108 | { |
| 2142 | struct fc_rport_identifiers rport_ids; | 2109 | struct fc_rport_identifiers rport_ids; |
| @@ -2179,6 +2146,39 @@ qla2x00_reg_remote_port(scsi_qla_host_t *ha, fc_port_t *fcport) | |||
| 2179 | } | 2146 | } |
| 2180 | 2147 | ||
| 2181 | /* | 2148 | /* |
| 2149 | * qla2x00_update_fcport | ||
| 2150 | * Updates device on list. | ||
| 2151 | * | ||
| 2152 | * Input: | ||
| 2153 | * ha = adapter block pointer. | ||
| 2154 | * fcport = port structure pointer. | ||
| 2155 | * | ||
| 2156 | * Return: | ||
| 2157 | * 0 - Success | ||
| 2158 | * BIT_0 - error | ||
| 2159 | * | ||
| 2160 | * Context: | ||
| 2161 | * Kernel context. | ||
| 2162 | */ | ||
| 2163 | void | ||
| 2164 | qla2x00_update_fcport(scsi_qla_host_t *ha, fc_port_t *fcport) | ||
| 2165 | { | ||
| 2166 | fcport->ha = ha; | ||
| 2167 | fcport->login_retry = 0; | ||
| 2168 | fcport->port_login_retry_count = ha->port_down_retry_count * | ||
| 2169 | PORT_RETRY_TIME; | ||
| 2170 | atomic_set(&fcport->port_down_timer, ha->port_down_retry_count * | ||
| 2171 | PORT_RETRY_TIME); | ||
| 2172 | fcport->flags &= ~FCF_LOGIN_NEEDED; | ||
| 2173 | |||
| 2174 | qla2x00_iidma_fcport(ha, fcport); | ||
| 2175 | |||
| 2176 | atomic_set(&fcport->state, FCS_ONLINE); | ||
| 2177 | |||
| 2178 | qla2x00_reg_remote_port(ha, fcport); | ||
| 2179 | } | ||
| 2180 | |||
| 2181 | /* | ||
| 2182 | * qla2x00_configure_fabric | 2182 | * qla2x00_configure_fabric |
| 2183 | * Setup SNS devices with loop ID's. | 2183 | * Setup SNS devices with loop ID's. |
| 2184 | * | 2184 | * |
| @@ -3476,9 +3476,11 @@ qla24xx_nvram_config(scsi_qla_host_t *ha) | |||
| 3476 | 3476 | ||
| 3477 | /* Set host adapter parameters. */ | 3477 | /* Set host adapter parameters. */ |
| 3478 | ha->flags.disable_risc_code_load = 0; | 3478 | ha->flags.disable_risc_code_load = 0; |
| 3479 | ha->flags.enable_lip_reset = 1; | 3479 | ha->flags.enable_lip_reset = 0; |
| 3480 | ha->flags.enable_lip_full_login = 1; | 3480 | ha->flags.enable_lip_full_login = |
| 3481 | ha->flags.enable_target_reset = 1; | 3481 | le32_to_cpu(nv->host_p) & BIT_10 ? 1: 0; |
| 3482 | ha->flags.enable_target_reset = | ||
| 3483 | le32_to_cpu(nv->host_p) & BIT_11 ? 1: 0; | ||
| 3482 | ha->flags.enable_led_scheme = 0; | 3484 | ha->flags.enable_led_scheme = 0; |
| 3483 | ha->flags.disable_serdes = le32_to_cpu(nv->host_p) & BIT_5 ? 1: 0; | 3485 | ha->flags.disable_serdes = le32_to_cpu(nv->host_p) & BIT_5 ? 1: 0; |
| 3484 | 3486 | ||
diff --git a/drivers/scsi/qla2xxx/qla_isr.c b/drivers/scsi/qla2xxx/qla_isr.c index d3b6df4d55c8..39fd17b05be5 100644 --- a/drivers/scsi/qla2xxx/qla_isr.c +++ b/drivers/scsi/qla2xxx/qla_isr.c | |||
| @@ -134,11 +134,11 @@ qla2300_intr_handler(int irq, void *dev_id) | |||
| 134 | if (stat & HSR_RISC_PAUSED) { | 134 | if (stat & HSR_RISC_PAUSED) { |
| 135 | hccr = RD_REG_WORD(®->hccr); | 135 | hccr = RD_REG_WORD(®->hccr); |
| 136 | if (hccr & (BIT_15 | BIT_13 | BIT_11 | BIT_8)) | 136 | if (hccr & (BIT_15 | BIT_13 | BIT_11 | BIT_8)) |
| 137 | qla_printk(KERN_INFO, ha, | 137 | qla_printk(KERN_INFO, ha, "Parity error -- " |
| 138 | "Parity error -- HCCR=%x.\n", hccr); | 138 | "HCCR=%x, Dumping firmware!\n", hccr); |
| 139 | else | 139 | else |
| 140 | qla_printk(KERN_INFO, ha, | 140 | qla_printk(KERN_INFO, ha, "RISC paused -- " |
| 141 | "RISC paused -- HCCR=%x.\n", hccr); | 141 | "HCCR=%x, Dumping firmware!\n", hccr); |
| 142 | 142 | ||
| 143 | /* | 143 | /* |
| 144 | * Issue a "HARD" reset in order for the RISC | 144 | * Issue a "HARD" reset in order for the RISC |
| @@ -147,6 +147,8 @@ qla2300_intr_handler(int irq, void *dev_id) | |||
| 147 | */ | 147 | */ |
| 148 | WRT_REG_WORD(®->hccr, HCCR_RESET_RISC); | 148 | WRT_REG_WORD(®->hccr, HCCR_RESET_RISC); |
| 149 | RD_REG_WORD(®->hccr); | 149 | RD_REG_WORD(®->hccr); |
| 150 | |||
| 151 | ha->isp_ops.fw_dump(ha, 1); | ||
| 150 | set_bit(ISP_ABORT_NEEDED, &ha->dpc_flags); | 152 | set_bit(ISP_ABORT_NEEDED, &ha->dpc_flags); |
| 151 | break; | 153 | break; |
| 152 | } else if ((stat & HSR_RISC_INT) == 0) | 154 | } else if ((stat & HSR_RISC_INT) == 0) |
| @@ -475,6 +477,8 @@ qla2x00_async_event(scsi_qla_host_t *ha, uint16_t *mb) | |||
| 475 | set_bit(RESET_MARKER_NEEDED, &ha->dpc_flags); | 477 | set_bit(RESET_MARKER_NEEDED, &ha->dpc_flags); |
| 476 | } | 478 | } |
| 477 | set_bit(REGISTER_FC4_NEEDED, &ha->dpc_flags); | 479 | set_bit(REGISTER_FC4_NEEDED, &ha->dpc_flags); |
| 480 | |||
| 481 | ha->flags.gpsc_supported = 1; | ||
| 478 | break; | 482 | break; |
| 479 | 483 | ||
| 480 | case MBA_CHG_IN_CONNECTION: /* Change in connection mode */ | 484 | case MBA_CHG_IN_CONNECTION: /* Change in connection mode */ |
| @@ -1440,8 +1444,7 @@ qla24xx_intr_handler(int irq, void *dev_id) | |||
| 1440 | 1444 | ||
| 1441 | qla_printk(KERN_INFO, ha, "RISC paused -- HCCR=%x, " | 1445 | qla_printk(KERN_INFO, ha, "RISC paused -- HCCR=%x, " |
| 1442 | "Dumping firmware!\n", hccr); | 1446 | "Dumping firmware!\n", hccr); |
| 1443 | qla24xx_fw_dump(ha, 1); | 1447 | ha->isp_ops.fw_dump(ha, 1); |
| 1444 | |||
| 1445 | set_bit(ISP_ABORT_NEEDED, &ha->dpc_flags); | 1448 | set_bit(ISP_ABORT_NEEDED, &ha->dpc_flags); |
| 1446 | break; | 1449 | break; |
| 1447 | } else if ((stat & HSRX_RISC_INT) == 0) | 1450 | } else if ((stat & HSRX_RISC_INT) == 0) |
diff --git a/drivers/scsi/qla2xxx/qla_mbx.c b/drivers/scsi/qla2xxx/qla_mbx.c index 4cde76c85cb3..077e5789beeb 100644 --- a/drivers/scsi/qla2xxx/qla_mbx.c +++ b/drivers/scsi/qla2xxx/qla_mbx.c | |||
| @@ -1339,9 +1339,9 @@ qla2x00_lip_reset(scsi_qla_host_t *ha) | |||
| 1339 | 1339 | ||
| 1340 | if (IS_QLA24XX(ha) || IS_QLA54XX(ha)) { | 1340 | if (IS_QLA24XX(ha) || IS_QLA54XX(ha)) { |
| 1341 | mcp->mb[0] = MBC_LIP_FULL_LOGIN; | 1341 | mcp->mb[0] = MBC_LIP_FULL_LOGIN; |
| 1342 | mcp->mb[1] = BIT_0; | 1342 | mcp->mb[1] = BIT_6; |
| 1343 | mcp->mb[2] = 0xff; | 1343 | mcp->mb[2] = 0; |
| 1344 | mcp->mb[3] = 0; | 1344 | mcp->mb[3] = ha->loop_reset_delay; |
| 1345 | mcp->out_mb = MBX_3|MBX_2|MBX_1|MBX_0; | 1345 | mcp->out_mb = MBX_3|MBX_2|MBX_1|MBX_0; |
| 1346 | } else { | 1346 | } else { |
| 1347 | mcp->mb[0] = MBC_LIP_RESET; | 1347 | mcp->mb[0] = MBC_LIP_RESET; |
| @@ -1823,8 +1823,8 @@ qla2x00_full_login_lip(scsi_qla_host_t *ha) | |||
| 1823 | ha->host_no)); | 1823 | ha->host_no)); |
| 1824 | 1824 | ||
| 1825 | mcp->mb[0] = MBC_LIP_FULL_LOGIN; | 1825 | mcp->mb[0] = MBC_LIP_FULL_LOGIN; |
| 1826 | mcp->mb[1] = 0; | 1826 | mcp->mb[1] = IS_QLA24XX(ha) || IS_QLA54XX(ha) ? BIT_3: 0; |
| 1827 | mcp->mb[2] = 0xff; | 1827 | mcp->mb[2] = 0; |
| 1828 | mcp->mb[3] = 0; | 1828 | mcp->mb[3] = 0; |
| 1829 | mcp->out_mb = MBX_3|MBX_2|MBX_1|MBX_0; | 1829 | mcp->out_mb = MBX_3|MBX_2|MBX_1|MBX_0; |
| 1830 | mcp->in_mb = MBX_0; | 1830 | mcp->in_mb = MBX_0; |
| @@ -2486,7 +2486,7 @@ qla2x00_trace_control(scsi_qla_host_t *ha, uint16_t ctrl, dma_addr_t eft_dma, | |||
| 2486 | mcp->mb[4] = LSW(MSD(eft_dma)); | 2486 | mcp->mb[4] = LSW(MSD(eft_dma)); |
| 2487 | mcp->mb[5] = MSW(MSD(eft_dma)); | 2487 | mcp->mb[5] = MSW(MSD(eft_dma)); |
| 2488 | mcp->mb[6] = buffers; | 2488 | mcp->mb[6] = buffers; |
| 2489 | mcp->mb[7] = buffers; | 2489 | mcp->mb[7] = 0; |
| 2490 | mcp->out_mb |= MBX_7|MBX_6|MBX_5|MBX_4|MBX_3|MBX_2; | 2490 | mcp->out_mb |= MBX_7|MBX_6|MBX_5|MBX_4|MBX_3|MBX_2; |
| 2491 | } | 2491 | } |
| 2492 | mcp->tov = 30; | 2492 | mcp->tov = 30; |
diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c index d03523d3bf38..d6445ae841ba 100644 --- a/drivers/scsi/qla2xxx/qla_os.c +++ b/drivers/scsi/qla2xxx/qla_os.c | |||
| @@ -1037,48 +1037,49 @@ eh_host_reset_lock: | |||
| 1037 | static int | 1037 | static int |
| 1038 | qla2x00_loop_reset(scsi_qla_host_t *ha) | 1038 | qla2x00_loop_reset(scsi_qla_host_t *ha) |
| 1039 | { | 1039 | { |
| 1040 | int status = QLA_SUCCESS; | 1040 | int ret; |
| 1041 | struct fc_port *fcport; | 1041 | struct fc_port *fcport; |
| 1042 | 1042 | ||
| 1043 | if (ha->flags.enable_lip_full_login) { | ||
| 1044 | ret = qla2x00_full_login_lip(ha); | ||
| 1045 | if (ret != QLA_SUCCESS) { | ||
| 1046 | DEBUG2_3(printk("%s(%ld): bus_reset failed: " | ||
| 1047 | "full_login_lip=%d.\n", __func__, ha->host_no, | ||
| 1048 | ret)); | ||
| 1049 | } | ||
| 1050 | atomic_set(&ha->loop_state, LOOP_DOWN); | ||
| 1051 | atomic_set(&ha->loop_down_timer, LOOP_DOWN_TIME); | ||
| 1052 | qla2x00_mark_all_devices_lost(ha, 0); | ||
| 1053 | qla2x00_wait_for_loop_ready(ha); | ||
| 1054 | } | ||
| 1055 | |||
| 1043 | if (ha->flags.enable_lip_reset) { | 1056 | if (ha->flags.enable_lip_reset) { |
| 1044 | status = qla2x00_lip_reset(ha); | 1057 | ret = qla2x00_lip_reset(ha); |
| 1058 | if (ret != QLA_SUCCESS) { | ||
| 1059 | DEBUG2_3(printk("%s(%ld): bus_reset failed: " | ||
| 1060 | "lip_reset=%d.\n", __func__, ha->host_no, ret)); | ||
| 1061 | } | ||
| 1062 | qla2x00_wait_for_loop_ready(ha); | ||
| 1045 | } | 1063 | } |
| 1046 | 1064 | ||
| 1047 | if (status == QLA_SUCCESS && ha->flags.enable_target_reset) { | 1065 | if (ha->flags.enable_target_reset) { |
| 1048 | list_for_each_entry(fcport, &ha->fcports, list) { | 1066 | list_for_each_entry(fcport, &ha->fcports, list) { |
| 1049 | if (fcport->port_type != FCT_TARGET) | 1067 | if (fcport->port_type != FCT_TARGET) |
| 1050 | continue; | 1068 | continue; |
| 1051 | 1069 | ||
| 1052 | status = qla2x00_device_reset(ha, fcport); | 1070 | ret = qla2x00_device_reset(ha, fcport); |
| 1053 | if (status != QLA_SUCCESS) | 1071 | if (ret != QLA_SUCCESS) { |
| 1054 | break; | 1072 | DEBUG2_3(printk("%s(%ld): bus_reset failed: " |
| 1073 | "target_reset=%d d_id=%x.\n", __func__, | ||
| 1074 | ha->host_no, ret, fcport->d_id.b24)); | ||
| 1075 | } | ||
| 1055 | } | 1076 | } |
| 1056 | } | 1077 | } |
| 1057 | 1078 | ||
| 1058 | if (status == QLA_SUCCESS && | ||
| 1059 | ((!ha->flags.enable_target_reset && | ||
| 1060 | !ha->flags.enable_lip_reset) || | ||
| 1061 | ha->flags.enable_lip_full_login)) { | ||
| 1062 | |||
| 1063 | status = qla2x00_full_login_lip(ha); | ||
| 1064 | } | ||
| 1065 | |||
| 1066 | /* Issue marker command only when we are going to start the I/O */ | 1079 | /* Issue marker command only when we are going to start the I/O */ |
| 1067 | ha->marker_needed = 1; | 1080 | ha->marker_needed = 1; |
| 1068 | 1081 | ||
| 1069 | if (status) { | 1082 | return QLA_SUCCESS; |
| 1070 | /* Empty */ | ||
| 1071 | DEBUG2_3(printk("%s(%ld): **** FAILED ****\n", | ||
| 1072 | __func__, | ||
| 1073 | ha->host_no)); | ||
| 1074 | } else { | ||
| 1075 | /* Empty */ | ||
| 1076 | DEBUG3(printk("%s(%ld): exiting normally.\n", | ||
| 1077 | __func__, | ||
| 1078 | ha->host_no)); | ||
| 1079 | } | ||
| 1080 | |||
| 1081 | return(status); | ||
| 1082 | } | 1083 | } |
| 1083 | 1084 | ||
| 1084 | /* | 1085 | /* |
| @@ -1413,7 +1414,9 @@ qla2x00_probe_one(struct pci_dev *pdev, const struct pci_device_id *id) | |||
| 1413 | 1414 | ||
| 1414 | sht = &qla2x00_driver_template; | 1415 | sht = &qla2x00_driver_template; |
| 1415 | if (pdev->device == PCI_DEVICE_ID_QLOGIC_ISP2422 || | 1416 | if (pdev->device == PCI_DEVICE_ID_QLOGIC_ISP2422 || |
| 1416 | pdev->device == PCI_DEVICE_ID_QLOGIC_ISP2432) | 1417 | pdev->device == PCI_DEVICE_ID_QLOGIC_ISP2432 || |
| 1418 | pdev->device == PCI_DEVICE_ID_QLOGIC_ISP5422 || | ||
| 1419 | pdev->device == PCI_DEVICE_ID_QLOGIC_ISP5432) | ||
| 1417 | sht = &qla24xx_driver_template; | 1420 | sht = &qla24xx_driver_template; |
| 1418 | host = scsi_host_alloc(sht, sizeof(scsi_qla_host_t)); | 1421 | host = scsi_host_alloc(sht, sizeof(scsi_qla_host_t)); |
| 1419 | if (host == NULL) { | 1422 | if (host == NULL) { |
diff --git a/drivers/scsi/qla2xxx/qla_version.h b/drivers/scsi/qla2xxx/qla_version.h index 1fa0bce6b24e..459e0d6bd2b4 100644 --- a/drivers/scsi/qla2xxx/qla_version.h +++ b/drivers/scsi/qla2xxx/qla_version.h | |||
| @@ -7,7 +7,7 @@ | |||
| 7 | /* | 7 | /* |
| 8 | * Driver version | 8 | * Driver version |
| 9 | */ | 9 | */ |
| 10 | #define QLA2XXX_VERSION "8.01.07-k3" | 10 | #define QLA2XXX_VERSION "8.01.07-k4" |
| 11 | 11 | ||
| 12 | #define QLA_DRIVER_MAJOR_VER 8 | 12 | #define QLA_DRIVER_MAJOR_VER 8 |
| 13 | #define QLA_DRIVER_MINOR_VER 1 | 13 | #define QLA_DRIVER_MINOR_VER 1 |
diff --git a/drivers/scsi/scsi_scan.c b/drivers/scsi/scsi_scan.c index 14e635aa44ce..b83d03c4deef 100644 --- a/drivers/scsi/scsi_scan.c +++ b/drivers/scsi/scsi_scan.c | |||
| @@ -133,12 +133,10 @@ struct async_scan_data { | |||
| 133 | /** | 133 | /** |
| 134 | * scsi_complete_async_scans - Wait for asynchronous scans to complete | 134 | * scsi_complete_async_scans - Wait for asynchronous scans to complete |
| 135 | * | 135 | * |
| 136 | * Asynchronous scans add themselves to the scanning_hosts list. Once | 136 | * When this function returns, any host which started scanning before |
| 137 | * that list is empty, we know that the scans are complete. Rather than | 137 | * this function was called will have finished its scan. Hosts which |
| 138 | * waking up periodically to check the state of the list, we pretend to be | 138 | * started scanning after this function was called may or may not have |
| 139 | * a scanning task by adding ourselves at the end of the list and going to | 139 | * finished. |
| 140 | * sleep. When the task before us wakes us up, we take ourselves off the | ||
| 141 | * list and return. | ||
| 142 | */ | 140 | */ |
| 143 | int scsi_complete_async_scans(void) | 141 | int scsi_complete_async_scans(void) |
| 144 | { | 142 | { |
| @@ -171,6 +169,11 @@ int scsi_complete_async_scans(void) | |||
| 171 | 169 | ||
| 172 | spin_lock(&async_scan_lock); | 170 | spin_lock(&async_scan_lock); |
| 173 | list_del(&data->list); | 171 | list_del(&data->list); |
| 172 | if (!list_empty(&scanning_hosts)) { | ||
| 173 | struct async_scan_data *next = list_entry(scanning_hosts.next, | ||
| 174 | struct async_scan_data, list); | ||
| 175 | complete(&next->prev_finished); | ||
| 176 | } | ||
| 174 | done: | 177 | done: |
| 175 | spin_unlock(&async_scan_lock); | 178 | spin_unlock(&async_scan_lock); |
| 176 | 179 | ||
| @@ -739,6 +742,14 @@ static int scsi_add_lun(struct scsi_device *sdev, unsigned char *inq_result, | |||
| 739 | sdev->no_uld_attach = 1; | 742 | sdev->no_uld_attach = 1; |
| 740 | 743 | ||
| 741 | switch (sdev->type = (inq_result[0] & 0x1f)) { | 744 | switch (sdev->type = (inq_result[0] & 0x1f)) { |
| 745 | case TYPE_RBC: | ||
| 746 | /* RBC devices can return SCSI-3 compliance and yet | ||
| 747 | * still not support REPORT LUNS, so make them act as | ||
| 748 | * BLIST_NOREPORTLUN unless BLIST_REPORTLUN2 is | ||
| 749 | * specifically set */ | ||
| 750 | if ((*bflags & BLIST_REPORTLUN2) == 0) | ||
| 751 | *bflags |= BLIST_NOREPORTLUN; | ||
| 752 | /* fall through */ | ||
| 742 | case TYPE_TAPE: | 753 | case TYPE_TAPE: |
| 743 | case TYPE_DISK: | 754 | case TYPE_DISK: |
| 744 | case TYPE_PRINTER: | 755 | case TYPE_PRINTER: |
| @@ -749,11 +760,17 @@ static int scsi_add_lun(struct scsi_device *sdev, unsigned char *inq_result, | |||
| 749 | case TYPE_ENCLOSURE: | 760 | case TYPE_ENCLOSURE: |
| 750 | case TYPE_COMM: | 761 | case TYPE_COMM: |
| 751 | case TYPE_RAID: | 762 | case TYPE_RAID: |
| 752 | case TYPE_RBC: | ||
| 753 | sdev->writeable = 1; | 763 | sdev->writeable = 1; |
| 754 | break; | 764 | break; |
| 755 | case TYPE_WORM: | ||
| 756 | case TYPE_ROM: | 765 | case TYPE_ROM: |
| 766 | /* MMC devices can return SCSI-3 compliance and yet | ||
| 767 | * still not support REPORT LUNS, so make them act as | ||
| 768 | * BLIST_NOREPORTLUN unless BLIST_REPORTLUN2 is | ||
| 769 | * specifically set */ | ||
| 770 | if ((*bflags & BLIST_REPORTLUN2) == 0) | ||
| 771 | *bflags |= BLIST_NOREPORTLUN; | ||
| 772 | /* fall through */ | ||
| 773 | case TYPE_WORM: | ||
| 757 | sdev->writeable = 0; | 774 | sdev->writeable = 0; |
| 758 | break; | 775 | break; |
| 759 | default: | 776 | default: |
diff --git a/drivers/scsi/scsi_transport_iscsi.c b/drivers/scsi/scsi_transport_iscsi.c index 9c22f1342715..ce0d14af33c8 100644 --- a/drivers/scsi/scsi_transport_iscsi.c +++ b/drivers/scsi/scsi_transport_iscsi.c | |||
| @@ -1416,7 +1416,7 @@ static __init int iscsi_transport_init(void) | |||
| 1416 | { | 1416 | { |
| 1417 | int err; | 1417 | int err; |
| 1418 | 1418 | ||
| 1419 | printk(KERN_INFO "Loading iSCSI transport class v%s.", | 1419 | printk(KERN_INFO "Loading iSCSI transport class v%s.\n", |
| 1420 | ISCSI_TRANSPORT_VERSION); | 1420 | ISCSI_TRANSPORT_VERSION); |
| 1421 | 1421 | ||
| 1422 | err = class_register(&iscsi_transport_class); | 1422 | err = class_register(&iscsi_transport_class); |
diff --git a/drivers/scsi/scsi_transport_spi.c b/drivers/scsi/scsi_transport_spi.c index 3fded4831460..014d7fea1ff3 100644 --- a/drivers/scsi/scsi_transport_spi.c +++ b/drivers/scsi/scsi_transport_spi.c | |||
| @@ -122,7 +122,7 @@ static int spi_execute(struct scsi_device *sdev, const void *cmd, | |||
| 122 | if (!sshdr) | 122 | if (!sshdr) |
| 123 | sshdr = &sshdr_tmp; | 123 | sshdr = &sshdr_tmp; |
| 124 | 124 | ||
| 125 | if (scsi_normalize_sense(sense, sizeof(*sense), | 125 | if (scsi_normalize_sense(sense, SCSI_SENSE_BUFFERSIZE, |
| 126 | sshdr) | 126 | sshdr) |
| 127 | && sshdr->sense_key == UNIT_ATTENTION) | 127 | && sshdr->sense_key == UNIT_ATTENTION) |
| 128 | continue; | 128 | continue; |
diff --git a/drivers/scsi/seagate.c b/drivers/scsi/seagate.c index 5ffec2721b28..ff62e9708e1c 100644 --- a/drivers/scsi/seagate.c +++ b/drivers/scsi/seagate.c | |||
| @@ -114,6 +114,7 @@ | |||
| 114 | #define DPRINTK( when, msg... ) do { if ( (DEBUG & (when)) == (when) ) printk( msg ); } while (0) | 114 | #define DPRINTK( when, msg... ) do { if ( (DEBUG & (when)) == (when) ) printk( msg ); } while (0) |
| 115 | #else | 115 | #else |
| 116 | #define DPRINTK( when, msg... ) do { } while (0) | 116 | #define DPRINTK( when, msg... ) do { } while (0) |
| 117 | #define DEBUG 0 | ||
| 117 | #endif | 118 | #endif |
| 118 | #define DANY( msg... ) DPRINTK( 0xffff, msg ); | 119 | #define DANY( msg... ) DPRINTK( 0xffff, msg ); |
| 119 | 120 | ||
| @@ -523,7 +524,7 @@ int __init seagate_st0x_detect (struct scsi_host_template * tpnt) | |||
| 523 | #ifdef ARBITRATE | 524 | #ifdef ARBITRATE |
| 524 | " ARBITRATE" | 525 | " ARBITRATE" |
| 525 | #endif | 526 | #endif |
| 526 | #ifdef DEBUG | 527 | #if DEBUG |
| 527 | " DEBUG" | 528 | " DEBUG" |
| 528 | #endif | 529 | #endif |
| 529 | #ifdef FAST | 530 | #ifdef FAST |
| @@ -733,7 +734,7 @@ static int internal_command (unsigned char target, unsigned char lun, | |||
| 733 | unsigned char *data = NULL; | 734 | unsigned char *data = NULL; |
| 734 | struct scatterlist *buffer = NULL; | 735 | struct scatterlist *buffer = NULL; |
| 735 | int clock, temp, nobuffs = 0, done = 0, len = 0; | 736 | int clock, temp, nobuffs = 0, done = 0, len = 0; |
| 736 | #ifdef DEBUG | 737 | #if DEBUG |
| 737 | int transfered = 0, phase = 0, newphase; | 738 | int transfered = 0, phase = 0, newphase; |
| 738 | #endif | 739 | #endif |
| 739 | register unsigned char status_read; | 740 | register unsigned char status_read; |
diff --git a/drivers/scsi/sr.c b/drivers/scsi/sr.c index fae6e95a6298..89e9b36b1788 100644 --- a/drivers/scsi/sr.c +++ b/drivers/scsi/sr.c | |||
| @@ -468,7 +468,7 @@ static int sr_block_ioctl(struct inode *inode, struct file *file, unsigned cmd, | |||
| 468 | } | 468 | } |
| 469 | 469 | ||
| 470 | ret = cdrom_ioctl(file, &cd->cdi, inode, cmd, arg); | 470 | ret = cdrom_ioctl(file, &cd->cdi, inode, cmd, arg); |
| 471 | if (ret != ENOSYS) | 471 | if (ret != -ENOSYS) |
| 472 | return ret; | 472 | return ret; |
| 473 | 473 | ||
| 474 | /* | 474 | /* |
diff --git a/drivers/usb/input/Kconfig b/drivers/usb/input/Kconfig index 258a5d09d3dc..c7d887540d8d 100644 --- a/drivers/usb/input/Kconfig +++ b/drivers/usb/input/Kconfig | |||
| @@ -7,7 +7,7 @@ comment "USB Input Devices" | |||
| 7 | config USB_HID | 7 | config USB_HID |
| 8 | tristate "USB Human Interface Device (full HID) support" | 8 | tristate "USB Human Interface Device (full HID) support" |
| 9 | default y | 9 | default y |
| 10 | depends on USB | 10 | depends on USB && INPUT |
| 11 | select HID | 11 | select HID |
| 12 | ---help--- | 12 | ---help--- |
| 13 | Say Y here if you want full HID support to connect USB keyboards, | 13 | Say Y here if you want full HID support to connect USB keyboards, |
diff --git a/drivers/usb/input/hid-core.c b/drivers/usb/input/hid-core.c index 89fa6885709b..6e739efee6f7 100644 --- a/drivers/usb/input/hid-core.c +++ b/drivers/usb/input/hid-core.c | |||
| @@ -106,18 +106,18 @@ static void hid_reset(struct work_struct *work) | |||
| 106 | 106 | ||
| 107 | if (test_bit(HID_CLEAR_HALT, &usbhid->iofl)) { | 107 | if (test_bit(HID_CLEAR_HALT, &usbhid->iofl)) { |
| 108 | dev_dbg(&usbhid->intf->dev, "clear halt\n"); | 108 | dev_dbg(&usbhid->intf->dev, "clear halt\n"); |
| 109 | rc = usb_clear_halt(to_usb_device(hid->dev), usbhid->urbin->pipe); | 109 | rc = usb_clear_halt(hid_to_usb_dev(hid), usbhid->urbin->pipe); |
| 110 | clear_bit(HID_CLEAR_HALT, &usbhid->iofl); | 110 | clear_bit(HID_CLEAR_HALT, &usbhid->iofl); |
| 111 | hid_start_in(hid); | 111 | hid_start_in(hid); |
| 112 | } | 112 | } |
| 113 | 113 | ||
| 114 | else if (test_bit(HID_RESET_PENDING, &usbhid->iofl)) { | 114 | else if (test_bit(HID_RESET_PENDING, &usbhid->iofl)) { |
| 115 | dev_dbg(&usbhid->intf->dev, "resetting device\n"); | 115 | dev_dbg(&usbhid->intf->dev, "resetting device\n"); |
| 116 | rc = rc_lock = usb_lock_device_for_reset(to_usb_device(hid->dev), usbhid->intf); | 116 | rc = rc_lock = usb_lock_device_for_reset(hid_to_usb_dev(hid), usbhid->intf); |
| 117 | if (rc_lock >= 0) { | 117 | if (rc_lock >= 0) { |
| 118 | rc = usb_reset_composite_device(to_usb_device(hid->dev), usbhid->intf); | 118 | rc = usb_reset_composite_device(hid_to_usb_dev(hid), usbhid->intf); |
| 119 | if (rc_lock) | 119 | if (rc_lock) |
| 120 | usb_unlock_device(to_usb_device(hid->dev)); | 120 | usb_unlock_device(hid_to_usb_dev(hid)); |
| 121 | } | 121 | } |
| 122 | clear_bit(HID_RESET_PENDING, &usbhid->iofl); | 122 | clear_bit(HID_RESET_PENDING, &usbhid->iofl); |
| 123 | } | 123 | } |
| @@ -129,8 +129,8 @@ static void hid_reset(struct work_struct *work) | |||
| 129 | break; | 129 | break; |
| 130 | default: | 130 | default: |
| 131 | err("can't reset device, %s-%s/input%d, status %d", | 131 | err("can't reset device, %s-%s/input%d, status %d", |
| 132 | to_usb_device(hid->dev)->bus->bus_name, | 132 | hid_to_usb_dev(hid)->bus->bus_name, |
| 133 | to_usb_device(hid->dev)->devpath, | 133 | hid_to_usb_dev(hid)->devpath, |
| 134 | usbhid->ifnum, rc); | 134 | usbhid->ifnum, rc); |
| 135 | /* FALLTHROUGH */ | 135 | /* FALLTHROUGH */ |
| 136 | case -EHOSTUNREACH: | 136 | case -EHOSTUNREACH: |
| @@ -217,8 +217,8 @@ static void hid_irq_in(struct urb *urb) | |||
| 217 | clear_bit(HID_IN_RUNNING, &usbhid->iofl); | 217 | clear_bit(HID_IN_RUNNING, &usbhid->iofl); |
| 218 | if (status != -EPERM) { | 218 | if (status != -EPERM) { |
| 219 | err("can't resubmit intr, %s-%s/input%d, status %d", | 219 | err("can't resubmit intr, %s-%s/input%d, status %d", |
| 220 | to_usb_device(hid->dev)->bus->bus_name, | 220 | hid_to_usb_dev(hid)->bus->bus_name, |
| 221 | to_usb_device(hid->dev)->devpath, | 221 | hid_to_usb_dev(hid)->devpath, |
| 222 | usbhid->ifnum, status); | 222 | usbhid->ifnum, status); |
| 223 | hid_io_error(hid); | 223 | hid_io_error(hid); |
| 224 | } | 224 | } |
| @@ -251,7 +251,7 @@ static int hid_submit_out(struct hid_device *hid) | |||
| 251 | 251 | ||
| 252 | hid_output_report(report, usbhid->outbuf); | 252 | hid_output_report(report, usbhid->outbuf); |
| 253 | usbhid->urbout->transfer_buffer_length = ((report->size - 1) >> 3) + 1 + (report->id > 0); | 253 | usbhid->urbout->transfer_buffer_length = ((report->size - 1) >> 3) + 1 + (report->id > 0); |
| 254 | usbhid->urbout->dev = to_usb_device(hid->dev); | 254 | usbhid->urbout->dev = hid_to_usb_dev(hid); |
| 255 | 255 | ||
| 256 | dbg("submitting out urb"); | 256 | dbg("submitting out urb"); |
| 257 | 257 | ||
| @@ -276,13 +276,13 @@ static int hid_submit_ctrl(struct hid_device *hid) | |||
| 276 | len = ((report->size - 1) >> 3) + 1 + (report->id > 0); | 276 | len = ((report->size - 1) >> 3) + 1 + (report->id > 0); |
| 277 | if (dir == USB_DIR_OUT) { | 277 | if (dir == USB_DIR_OUT) { |
| 278 | hid_output_report(report, usbhid->ctrlbuf); | 278 | hid_output_report(report, usbhid->ctrlbuf); |
| 279 | usbhid->urbctrl->pipe = usb_sndctrlpipe(to_usb_device(hid->dev), 0); | 279 | usbhid->urbctrl->pipe = usb_sndctrlpipe(hid_to_usb_dev(hid), 0); |
| 280 | usbhid->urbctrl->transfer_buffer_length = len; | 280 | usbhid->urbctrl->transfer_buffer_length = len; |
| 281 | } else { | 281 | } else { |
| 282 | int maxpacket, padlen; | 282 | int maxpacket, padlen; |
| 283 | 283 | ||
| 284 | usbhid->urbctrl->pipe = usb_rcvctrlpipe(to_usb_device(hid->dev), 0); | 284 | usbhid->urbctrl->pipe = usb_rcvctrlpipe(hid_to_usb_dev(hid), 0); |
| 285 | maxpacket = usb_maxpacket(to_usb_device(hid->dev), usbhid->urbctrl->pipe, 0); | 285 | maxpacket = usb_maxpacket(hid_to_usb_dev(hid), usbhid->urbctrl->pipe, 0); |
| 286 | if (maxpacket > 0) { | 286 | if (maxpacket > 0) { |
| 287 | padlen = (len + maxpacket - 1) / maxpacket; | 287 | padlen = (len + maxpacket - 1) / maxpacket; |
| 288 | padlen *= maxpacket; | 288 | padlen *= maxpacket; |
| @@ -292,7 +292,7 @@ static int hid_submit_ctrl(struct hid_device *hid) | |||
| 292 | padlen = 0; | 292 | padlen = 0; |
| 293 | usbhid->urbctrl->transfer_buffer_length = padlen; | 293 | usbhid->urbctrl->transfer_buffer_length = padlen; |
| 294 | } | 294 | } |
| 295 | usbhid->urbctrl->dev = to_usb_device(hid->dev); | 295 | usbhid->urbctrl->dev = hid_to_usb_dev(hid); |
| 296 | 296 | ||
| 297 | usbhid->cr->bRequestType = USB_TYPE_CLASS | USB_RECIP_INTERFACE | dir; | 297 | usbhid->cr->bRequestType = USB_TYPE_CLASS | USB_RECIP_INTERFACE | dir; |
| 298 | usbhid->cr->bRequest = (dir == USB_DIR_OUT) ? HID_REQ_SET_REPORT : HID_REQ_GET_REPORT; | 298 | usbhid->cr->bRequest = (dir == USB_DIR_OUT) ? HID_REQ_SET_REPORT : HID_REQ_GET_REPORT; |
| @@ -582,6 +582,8 @@ void usbhid_init_reports(struct hid_device *hid) | |||
| 582 | } | 582 | } |
| 583 | 583 | ||
| 584 | #define USB_VENDOR_ID_GTCO 0x078c | 584 | #define USB_VENDOR_ID_GTCO 0x078c |
| 585 | #define USB_VENDOR_ID_GTCO_IPANEL_1 0x08ca | ||
| 586 | #define USB_VENDOR_ID_GTCO_IPANEL_2 0x5543 | ||
| 585 | #define USB_DEVICE_ID_GTCO_90 0x0090 | 587 | #define USB_DEVICE_ID_GTCO_90 0x0090 |
| 586 | #define USB_DEVICE_ID_GTCO_100 0x0100 | 588 | #define USB_DEVICE_ID_GTCO_100 0x0100 |
| 587 | #define USB_DEVICE_ID_GTCO_101 0x0101 | 589 | #define USB_DEVICE_ID_GTCO_101 0x0101 |
| @@ -627,6 +629,9 @@ void usbhid_init_reports(struct hid_device *hid) | |||
| 627 | #define USB_DEVICE_ID_GTCO_1004 0x1004 | 629 | #define USB_DEVICE_ID_GTCO_1004 0x1004 |
| 628 | #define USB_DEVICE_ID_GTCO_1005 0x1005 | 630 | #define USB_DEVICE_ID_GTCO_1005 0x1005 |
| 629 | #define USB_DEVICE_ID_GTCO_1006 0x1006 | 631 | #define USB_DEVICE_ID_GTCO_1006 0x1006 |
| 632 | #define USB_DEVICE_ID_GTCO_10 0x0010 | ||
| 633 | #define USB_DEVICE_ID_GTCO_8 0x0008 | ||
| 634 | #define USB_DEVICE_ID_GTCO_d 0x000d | ||
| 630 | 635 | ||
| 631 | #define USB_VENDOR_ID_WACOM 0x056a | 636 | #define USB_VENDOR_ID_WACOM 0x056a |
| 632 | 637 | ||
| @@ -875,6 +880,9 @@ static const struct hid_blacklist { | |||
| 875 | { USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_1004, HID_QUIRK_IGNORE }, | 880 | { USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_1004, HID_QUIRK_IGNORE }, |
| 876 | { USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_1005, HID_QUIRK_IGNORE }, | 881 | { USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_1005, HID_QUIRK_IGNORE }, |
| 877 | { USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_1006, HID_QUIRK_IGNORE }, | 882 | { USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_1006, HID_QUIRK_IGNORE }, |
| 883 | { USB_VENDOR_ID_GTCO_IPANEL_1, USB_DEVICE_ID_GTCO_10, HID_QUIRK_IGNORE }, | ||
| 884 | { USB_VENDOR_ID_GTCO_IPANEL_2, USB_DEVICE_ID_GTCO_8, HID_QUIRK_IGNORE }, | ||
| 885 | { USB_VENDOR_ID_GTCO_IPANEL_2, USB_DEVICE_ID_GTCO_d, HID_QUIRK_IGNORE }, | ||
| 878 | { USB_VENDOR_ID_KBGEAR, USB_DEVICE_ID_KBGEAR_JAMSTUDIO, HID_QUIRK_IGNORE }, | 886 | { USB_VENDOR_ID_KBGEAR, USB_DEVICE_ID_KBGEAR_JAMSTUDIO, HID_QUIRK_IGNORE }, |
| 879 | { USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_CASSY, HID_QUIRK_IGNORE }, | 887 | { USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_CASSY, HID_QUIRK_IGNORE }, |
| 880 | { USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_POCKETCASSY, HID_QUIRK_IGNORE }, | 888 | { USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_POCKETCASSY, HID_QUIRK_IGNORE }, |
| @@ -951,7 +959,7 @@ static const struct hid_blacklist { | |||
| 951 | { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER3_ISO, HID_QUIRK_POWERBOOK_HAS_FN | HID_QUIRK_POWERBOOK_ISO_KEYBOARD}, | 959 | { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER3_ISO, HID_QUIRK_POWERBOOK_HAS_FN | HID_QUIRK_POWERBOOK_ISO_KEYBOARD}, |
| 952 | { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER3_JIS, HID_QUIRK_POWERBOOK_HAS_FN }, | 960 | { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER3_JIS, HID_QUIRK_POWERBOOK_HAS_FN }, |
| 953 | { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER4_ANSI, HID_QUIRK_POWERBOOK_HAS_FN }, | 961 | { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER4_ANSI, HID_QUIRK_POWERBOOK_HAS_FN }, |
| 954 | { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER4_ISO, HID_QUIRK_POWERBOOK_HAS_FN }, | 962 | { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER4_ISO, HID_QUIRK_POWERBOOK_HAS_FN | HID_QUIRK_POWERBOOK_ISO_KEYBOARD}, |
| 955 | { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER4_JIS, HID_QUIRK_POWERBOOK_HAS_FN }, | 963 | { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER4_JIS, HID_QUIRK_POWERBOOK_HAS_FN }, |
| 956 | { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_FOUNTAIN_TP_ONLY, HID_QUIRK_POWERBOOK_HAS_FN }, | 964 | { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_FOUNTAIN_TP_ONLY, HID_QUIRK_POWERBOOK_HAS_FN }, |
| 957 | { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER1_TP_ONLY, HID_QUIRK_POWERBOOK_HAS_FN }, | 965 | { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER1_TP_ONLY, HID_QUIRK_POWERBOOK_HAS_FN }, |
| @@ -1187,7 +1195,7 @@ static struct hid_device *usb_hid_configure(struct usb_interface *intf) | |||
| 1187 | 1195 | ||
| 1188 | hid->version = le16_to_cpu(hdesc->bcdHID); | 1196 | hid->version = le16_to_cpu(hdesc->bcdHID); |
| 1189 | hid->country = hdesc->bCountryCode; | 1197 | hid->country = hdesc->bCountryCode; |
| 1190 | hid->dev = &dev->dev; | 1198 | hid->dev = &intf->dev; |
| 1191 | usbhid->intf = intf; | 1199 | usbhid->intf = intf; |
| 1192 | usbhid->ifnum = interface->desc.bInterfaceNumber; | 1200 | usbhid->ifnum = interface->desc.bInterfaceNumber; |
| 1193 | 1201 | ||
| @@ -1282,7 +1290,7 @@ static void hid_disconnect(struct usb_interface *intf) | |||
| 1282 | usb_free_urb(usbhid->urbctrl); | 1290 | usb_free_urb(usbhid->urbctrl); |
| 1283 | usb_free_urb(usbhid->urbout); | 1291 | usb_free_urb(usbhid->urbout); |
| 1284 | 1292 | ||
| 1285 | hid_free_buffers(to_usb_device(hid->dev), hid); | 1293 | hid_free_buffers(hid_to_usb_dev(hid), hid); |
| 1286 | hid_free_device(hid); | 1294 | hid_free_device(hid); |
| 1287 | } | 1295 | } |
| 1288 | 1296 | ||
diff --git a/drivers/usb/input/hid-ff.c b/drivers/usb/input/hid-ff.c index f8f660ee3fac..59ed65e7a621 100644 --- a/drivers/usb/input/hid-ff.c +++ b/drivers/usb/input/hid-ff.c | |||
| @@ -33,6 +33,7 @@ | |||
| 33 | #include <linux/usb.h> | 33 | #include <linux/usb.h> |
| 34 | 34 | ||
| 35 | #include <linux/hid.h> | 35 | #include <linux/hid.h> |
| 36 | #include "usbhid.h" | ||
| 36 | 37 | ||
| 37 | /* | 38 | /* |
| 38 | * This table contains pointers to initializers. To add support for new | 39 | * This table contains pointers to initializers. To add support for new |
| @@ -70,8 +71,8 @@ static struct hid_ff_initializer inits[] = { | |||
| 70 | int hid_ff_init(struct hid_device* hid) | 71 | int hid_ff_init(struct hid_device* hid) |
| 71 | { | 72 | { |
| 72 | struct hid_ff_initializer *init; | 73 | struct hid_ff_initializer *init; |
| 73 | int vendor = le16_to_cpu(to_usb_device(hid->dev)->descriptor.idVendor); | 74 | int vendor = le16_to_cpu(hid_to_usb_dev(hid)->descriptor.idVendor); |
| 74 | int product = le16_to_cpu(to_usb_device(hid->dev)->descriptor.idProduct); | 75 | int product = le16_to_cpu(hid_to_usb_dev(hid)->descriptor.idProduct); |
| 75 | 76 | ||
| 76 | for (init = inits; init->idVendor; init++) | 77 | for (init = inits; init->idVendor; init++) |
| 77 | if (init->idVendor == vendor && init->idProduct == product) | 78 | if (init->idVendor == vendor && init->idProduct == product) |
diff --git a/drivers/usb/input/hiddev.c b/drivers/usb/input/hiddev.c index 114d6c9f64b1..a8b3d66cd498 100644 --- a/drivers/usb/input/hiddev.c +++ b/drivers/usb/input/hiddev.c | |||
| @@ -384,7 +384,7 @@ static int hiddev_ioctl(struct inode *inode, struct file *file, unsigned int cmd | |||
| 384 | struct hiddev_list *list = file->private_data; | 384 | struct hiddev_list *list = file->private_data; |
| 385 | struct hiddev *hiddev = list->hiddev; | 385 | struct hiddev *hiddev = list->hiddev; |
| 386 | struct hid_device *hid = hiddev->hid; | 386 | struct hid_device *hid = hiddev->hid; |
| 387 | struct usb_device *dev = to_usb_device(hid->dev); | 387 | struct usb_device *dev = hid_to_usb_dev(hid); |
| 388 | struct hiddev_collection_info cinfo; | 388 | struct hiddev_collection_info cinfo; |
| 389 | struct hiddev_report_info rinfo; | 389 | struct hiddev_report_info rinfo; |
| 390 | struct hiddev_field_info finfo; | 390 | struct hiddev_field_info finfo; |
diff --git a/drivers/usb/input/usbhid.h b/drivers/usb/input/usbhid.h index 830107e5251f..0023f96d4294 100644 --- a/drivers/usb/input/usbhid.h +++ b/drivers/usb/input/usbhid.h | |||
| @@ -80,5 +80,8 @@ struct usbhid_device { | |||
| 80 | 80 | ||
| 81 | }; | 81 | }; |
| 82 | 82 | ||
| 83 | #define hid_to_usb_dev(hid_dev) \ | ||
| 84 | container_of(hid_dev->dev->parent, struct usb_device, dev) | ||
| 85 | |||
| 83 | #endif | 86 | #endif |
| 84 | 87 | ||
diff --git a/fs/ntfs/ChangeLog b/fs/ntfs/ChangeLog index 35cc4b1d60f7..af4ef808fa94 100644 --- a/fs/ntfs/ChangeLog +++ b/fs/ntfs/ChangeLog | |||
| @@ -17,6 +17,13 @@ ToDo/Notes: | |||
| 17 | happen is unclear however so it is worth waiting until someone hits | 17 | happen is unclear however so it is worth waiting until someone hits |
| 18 | the problem. | 18 | the problem. |
| 19 | 19 | ||
| 20 | 2.1.28 - Fix a deadlock. | ||
| 21 | |||
| 22 | - Fix deadlock in fs/ntfs/inode.c::ntfs_put_inode(). Thanks to Sergey | ||
| 23 | Vlasov for the report and detailed analysis of the deadlock. The fix | ||
| 24 | involved getting rid of ntfs_put_inode() altogether and hence NTFS no | ||
| 25 | longer has a ->put_inode super operation. | ||
| 26 | |||
| 20 | 2.1.27 - Various bug fixes and cleanups. | 27 | 2.1.27 - Various bug fixes and cleanups. |
| 21 | 28 | ||
| 22 | - Fix two compiler warnings on Alpha. Thanks to Andrew Morton for | 29 | - Fix two compiler warnings on Alpha. Thanks to Andrew Morton for |
diff --git a/fs/ntfs/Makefile b/fs/ntfs/Makefile index e27b4eacffbf..825508385565 100644 --- a/fs/ntfs/Makefile +++ b/fs/ntfs/Makefile | |||
| @@ -6,7 +6,7 @@ ntfs-objs := aops.o attrib.o collate.o compress.o debug.o dir.o file.o \ | |||
| 6 | index.o inode.o mft.o mst.o namei.o runlist.o super.o sysctl.o \ | 6 | index.o inode.o mft.o mst.o namei.o runlist.o super.o sysctl.o \ |
| 7 | unistr.o upcase.o | 7 | unistr.o upcase.o |
| 8 | 8 | ||
| 9 | EXTRA_CFLAGS = -DNTFS_VERSION=\"2.1.27\" | 9 | EXTRA_CFLAGS = -DNTFS_VERSION=\"2.1.28\" |
| 10 | 10 | ||
| 11 | ifeq ($(CONFIG_NTFS_DEBUG),y) | 11 | ifeq ($(CONFIG_NTFS_DEBUG),y) |
| 12 | EXTRA_CFLAGS += -DDEBUG | 12 | EXTRA_CFLAGS += -DDEBUG |
diff --git a/fs/ntfs/dir.c b/fs/ntfs/dir.c index 8296c29ae3b8..74f99a6a369b 100644 --- a/fs/ntfs/dir.c +++ b/fs/ntfs/dir.c | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | /** | 1 | /** |
| 2 | * dir.c - NTFS kernel directory operations. Part of the Linux-NTFS project. | 2 | * dir.c - NTFS kernel directory operations. Part of the Linux-NTFS project. |
| 3 | * | 3 | * |
| 4 | * Copyright (c) 2001-2005 Anton Altaparmakov | 4 | * Copyright (c) 2001-2007 Anton Altaparmakov |
| 5 | * Copyright (c) 2002 Richard Russon | 5 | * Copyright (c) 2002 Richard Russon |
| 6 | * | 6 | * |
| 7 | * This program/include file is free software; you can redistribute it and/or | 7 | * This program/include file is free software; you can redistribute it and/or |
| @@ -1249,16 +1249,12 @@ skip_index_root: | |||
| 1249 | /* Get the offset into the index allocation attribute. */ | 1249 | /* Get the offset into the index allocation attribute. */ |
| 1250 | ia_pos = (s64)fpos - vol->mft_record_size; | 1250 | ia_pos = (s64)fpos - vol->mft_record_size; |
| 1251 | ia_mapping = vdir->i_mapping; | 1251 | ia_mapping = vdir->i_mapping; |
| 1252 | bmp_vi = ndir->itype.index.bmp_ino; | 1252 | ntfs_debug("Inode 0x%lx, getting index bitmap.", vdir->i_ino); |
| 1253 | if (unlikely(!bmp_vi)) { | 1253 | bmp_vi = ntfs_attr_iget(vdir, AT_BITMAP, I30, 4); |
| 1254 | ntfs_debug("Inode 0x%lx, regetting index bitmap.", vdir->i_ino); | 1254 | if (IS_ERR(bmp_vi)) { |
| 1255 | bmp_vi = ntfs_attr_iget(vdir, AT_BITMAP, I30, 4); | 1255 | ntfs_error(sb, "Failed to get bitmap attribute."); |
| 1256 | if (IS_ERR(bmp_vi)) { | 1256 | err = PTR_ERR(bmp_vi); |
| 1257 | ntfs_error(sb, "Failed to get bitmap attribute."); | 1257 | goto err_out; |
| 1258 | err = PTR_ERR(bmp_vi); | ||
| 1259 | goto err_out; | ||
| 1260 | } | ||
| 1261 | ndir->itype.index.bmp_ino = bmp_vi; | ||
| 1262 | } | 1258 | } |
| 1263 | bmp_mapping = bmp_vi->i_mapping; | 1259 | bmp_mapping = bmp_vi->i_mapping; |
| 1264 | /* Get the starting bitmap bit position and sanity check it. */ | 1260 | /* Get the starting bitmap bit position and sanity check it. */ |
| @@ -1266,7 +1262,7 @@ skip_index_root: | |||
| 1266 | if (unlikely(bmp_pos >> 3 >= i_size_read(bmp_vi))) { | 1262 | if (unlikely(bmp_pos >> 3 >= i_size_read(bmp_vi))) { |
| 1267 | ntfs_error(sb, "Current index allocation position exceeds " | 1263 | ntfs_error(sb, "Current index allocation position exceeds " |
| 1268 | "index bitmap size."); | 1264 | "index bitmap size."); |
| 1269 | goto err_out; | 1265 | goto iput_err_out; |
| 1270 | } | 1266 | } |
| 1271 | /* Get the starting bit position in the current bitmap page. */ | 1267 | /* Get the starting bit position in the current bitmap page. */ |
| 1272 | cur_bmp_pos = bmp_pos & ((PAGE_CACHE_SIZE * 8) - 1); | 1268 | cur_bmp_pos = bmp_pos & ((PAGE_CACHE_SIZE * 8) - 1); |
| @@ -1282,7 +1278,7 @@ get_next_bmp_page: | |||
| 1282 | ntfs_error(sb, "Reading index bitmap failed."); | 1278 | ntfs_error(sb, "Reading index bitmap failed."); |
| 1283 | err = PTR_ERR(bmp_page); | 1279 | err = PTR_ERR(bmp_page); |
| 1284 | bmp_page = NULL; | 1280 | bmp_page = NULL; |
| 1285 | goto err_out; | 1281 | goto iput_err_out; |
| 1286 | } | 1282 | } |
| 1287 | bmp = (u8*)page_address(bmp_page); | 1283 | bmp = (u8*)page_address(bmp_page); |
| 1288 | /* Find next index block in use. */ | 1284 | /* Find next index block in use. */ |
| @@ -1429,6 +1425,7 @@ find_next_index_buffer: | |||
| 1429 | /* @ia_page is already unlocked in this case. */ | 1425 | /* @ia_page is already unlocked in this case. */ |
| 1430 | ntfs_unmap_page(ia_page); | 1426 | ntfs_unmap_page(ia_page); |
| 1431 | ntfs_unmap_page(bmp_page); | 1427 | ntfs_unmap_page(bmp_page); |
| 1428 | iput(bmp_vi); | ||
| 1432 | goto abort; | 1429 | goto abort; |
| 1433 | } | 1430 | } |
| 1434 | } | 1431 | } |
| @@ -1439,6 +1436,7 @@ unm_EOD: | |||
| 1439 | ntfs_unmap_page(ia_page); | 1436 | ntfs_unmap_page(ia_page); |
| 1440 | } | 1437 | } |
| 1441 | ntfs_unmap_page(bmp_page); | 1438 | ntfs_unmap_page(bmp_page); |
| 1439 | iput(bmp_vi); | ||
| 1442 | EOD: | 1440 | EOD: |
| 1443 | /* We are finished, set fpos to EOD. */ | 1441 | /* We are finished, set fpos to EOD. */ |
| 1444 | fpos = i_size + vol->mft_record_size; | 1442 | fpos = i_size + vol->mft_record_size; |
| @@ -1455,8 +1453,11 @@ done: | |||
| 1455 | filp->f_pos = fpos; | 1453 | filp->f_pos = fpos; |
| 1456 | return 0; | 1454 | return 0; |
| 1457 | err_out: | 1455 | err_out: |
| 1458 | if (bmp_page) | 1456 | if (bmp_page) { |
| 1459 | ntfs_unmap_page(bmp_page); | 1457 | ntfs_unmap_page(bmp_page); |
| 1458 | iput_err_out: | ||
| 1459 | iput(bmp_vi); | ||
| 1460 | } | ||
| 1460 | if (ia_page) { | 1461 | if (ia_page) { |
| 1461 | unlock_page(ia_page); | 1462 | unlock_page(ia_page); |
| 1462 | ntfs_unmap_page(ia_page); | 1463 | ntfs_unmap_page(ia_page); |
| @@ -1529,14 +1530,22 @@ static int ntfs_dir_open(struct inode *vi, struct file *filp) | |||
| 1529 | static int ntfs_dir_fsync(struct file *filp, struct dentry *dentry, | 1530 | static int ntfs_dir_fsync(struct file *filp, struct dentry *dentry, |
| 1530 | int datasync) | 1531 | int datasync) |
| 1531 | { | 1532 | { |
| 1532 | struct inode *vi = dentry->d_inode; | 1533 | struct inode *bmp_vi, *vi = dentry->d_inode; |
| 1533 | ntfs_inode *ni = NTFS_I(vi); | ||
| 1534 | int err, ret; | 1534 | int err, ret; |
| 1535 | ntfs_attr na; | ||
| 1535 | 1536 | ||
| 1536 | ntfs_debug("Entering for inode 0x%lx.", vi->i_ino); | 1537 | ntfs_debug("Entering for inode 0x%lx.", vi->i_ino); |
| 1537 | BUG_ON(!S_ISDIR(vi->i_mode)); | 1538 | BUG_ON(!S_ISDIR(vi->i_mode)); |
| 1538 | if (NInoIndexAllocPresent(ni) && ni->itype.index.bmp_ino) | 1539 | /* If the bitmap attribute inode is in memory sync it, too. */ |
| 1539 | write_inode_now(ni->itype.index.bmp_ino, !datasync); | 1540 | na.mft_no = vi->i_ino; |
| 1541 | na.type = AT_BITMAP; | ||
| 1542 | na.name = I30; | ||
| 1543 | na.name_len = 4; | ||
| 1544 | bmp_vi = ilookup5(vi->i_sb, vi->i_ino, (test_t)ntfs_test_inode, &na); | ||
| 1545 | if (bmp_vi) { | ||
| 1546 | write_inode_now(bmp_vi, !datasync); | ||
| 1547 | iput(bmp_vi); | ||
| 1548 | } | ||
| 1540 | ret = ntfs_write_inode(vi, 1); | 1549 | ret = ntfs_write_inode(vi, 1); |
| 1541 | write_inode_now(vi, !datasync); | 1550 | write_inode_now(vi, !datasync); |
| 1542 | err = sync_blockdev(vi->i_sb->s_bdev); | 1551 | err = sync_blockdev(vi->i_sb->s_bdev); |
diff --git a/fs/ntfs/inode.c b/fs/ntfs/inode.c index 247989891b4b..f8bf8da67ee8 100644 --- a/fs/ntfs/inode.c +++ b/fs/ntfs/inode.c | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | /** | 1 | /** |
| 2 | * inode.c - NTFS kernel inode handling. Part of the Linux-NTFS project. | 2 | * inode.c - NTFS kernel inode handling. Part of the Linux-NTFS project. |
| 3 | * | 3 | * |
| 4 | * Copyright (c) 2001-2006 Anton Altaparmakov | 4 | * Copyright (c) 2001-2007 Anton Altaparmakov |
| 5 | * | 5 | * |
| 6 | * This program/include file is free software; you can redistribute it and/or | 6 | * This program/include file is free software; you can redistribute it and/or |
| 7 | * modify it under the terms of the GNU General Public License as published | 7 | * modify it under the terms of the GNU General Public License as published |
| @@ -95,7 +95,7 @@ int ntfs_test_inode(struct inode *vi, ntfs_attr *na) | |||
| 95 | * If initializing the normal file/directory inode, set @na->type to AT_UNUSED. | 95 | * If initializing the normal file/directory inode, set @na->type to AT_UNUSED. |
| 96 | * In that case, @na->name and @na->name_len should be set to NULL and 0, | 96 | * In that case, @na->name and @na->name_len should be set to NULL and 0, |
| 97 | * respectively. Although that is not strictly necessary as | 97 | * respectively. Although that is not strictly necessary as |
| 98 | * ntfs_read_inode_locked() will fill them in later. | 98 | * ntfs_read_locked_inode() will fill them in later. |
| 99 | * | 99 | * |
| 100 | * Return 0 on success and -errno on error. | 100 | * Return 0 on success and -errno on error. |
| 101 | * | 101 | * |
| @@ -171,8 +171,8 @@ static int ntfs_read_locked_index_inode(struct inode *base_vi, | |||
| 171 | struct inode *ntfs_iget(struct super_block *sb, unsigned long mft_no) | 171 | struct inode *ntfs_iget(struct super_block *sb, unsigned long mft_no) |
| 172 | { | 172 | { |
| 173 | struct inode *vi; | 173 | struct inode *vi; |
| 174 | ntfs_attr na; | ||
| 175 | int err; | 174 | int err; |
| 175 | ntfs_attr na; | ||
| 176 | 176 | ||
| 177 | na.mft_no = mft_no; | 177 | na.mft_no = mft_no; |
| 178 | na.type = AT_UNUSED; | 178 | na.type = AT_UNUSED; |
| @@ -229,8 +229,8 @@ struct inode *ntfs_attr_iget(struct inode *base_vi, ATTR_TYPE type, | |||
| 229 | ntfschar *name, u32 name_len) | 229 | ntfschar *name, u32 name_len) |
| 230 | { | 230 | { |
| 231 | struct inode *vi; | 231 | struct inode *vi; |
| 232 | ntfs_attr na; | ||
| 233 | int err; | 232 | int err; |
| 233 | ntfs_attr na; | ||
| 234 | 234 | ||
| 235 | /* Make sure no one calls ntfs_attr_iget() for indices. */ | 235 | /* Make sure no one calls ntfs_attr_iget() for indices. */ |
| 236 | BUG_ON(type == AT_INDEX_ALLOCATION); | 236 | BUG_ON(type == AT_INDEX_ALLOCATION); |
| @@ -287,8 +287,8 @@ struct inode *ntfs_index_iget(struct inode *base_vi, ntfschar *name, | |||
| 287 | u32 name_len) | 287 | u32 name_len) |
| 288 | { | 288 | { |
| 289 | struct inode *vi; | 289 | struct inode *vi; |
| 290 | ntfs_attr na; | ||
| 291 | int err; | 290 | int err; |
| 291 | ntfs_attr na; | ||
| 292 | 292 | ||
| 293 | na.mft_no = base_vi->i_ino; | 293 | na.mft_no = base_vi->i_ino; |
| 294 | na.type = AT_INDEX_ALLOCATION; | 294 | na.type = AT_INDEX_ALLOCATION; |
| @@ -402,7 +402,6 @@ void __ntfs_init_inode(struct super_block *sb, ntfs_inode *ni) | |||
| 402 | ntfs_init_runlist(&ni->attr_list_rl); | 402 | ntfs_init_runlist(&ni->attr_list_rl); |
| 403 | lockdep_set_class(&ni->attr_list_rl.lock, | 403 | lockdep_set_class(&ni->attr_list_rl.lock, |
| 404 | &attr_list_rl_lock_class); | 404 | &attr_list_rl_lock_class); |
| 405 | ni->itype.index.bmp_ino = NULL; | ||
| 406 | ni->itype.index.block_size = 0; | 405 | ni->itype.index.block_size = 0; |
| 407 | ni->itype.index.vcn_size = 0; | 406 | ni->itype.index.vcn_size = 0; |
| 408 | ni->itype.index.collation_rule = 0; | 407 | ni->itype.index.collation_rule = 0; |
| @@ -546,6 +545,7 @@ static int ntfs_read_locked_inode(struct inode *vi) | |||
| 546 | { | 545 | { |
| 547 | ntfs_volume *vol = NTFS_SB(vi->i_sb); | 546 | ntfs_volume *vol = NTFS_SB(vi->i_sb); |
| 548 | ntfs_inode *ni; | 547 | ntfs_inode *ni; |
| 548 | struct inode *bvi; | ||
| 549 | MFT_RECORD *m; | 549 | MFT_RECORD *m; |
| 550 | ATTR_RECORD *a; | 550 | ATTR_RECORD *a; |
| 551 | STANDARD_INFORMATION *si; | 551 | STANDARD_INFORMATION *si; |
| @@ -780,7 +780,6 @@ skip_attr_list_load: | |||
| 780 | */ | 780 | */ |
| 781 | if (S_ISDIR(vi->i_mode)) { | 781 | if (S_ISDIR(vi->i_mode)) { |
| 782 | loff_t bvi_size; | 782 | loff_t bvi_size; |
| 783 | struct inode *bvi; | ||
| 784 | ntfs_inode *bni; | 783 | ntfs_inode *bni; |
| 785 | INDEX_ROOT *ir; | 784 | INDEX_ROOT *ir; |
| 786 | u8 *ir_end, *index_end; | 785 | u8 *ir_end, *index_end; |
| @@ -985,13 +984,12 @@ skip_attr_list_load: | |||
| 985 | err = PTR_ERR(bvi); | 984 | err = PTR_ERR(bvi); |
| 986 | goto unm_err_out; | 985 | goto unm_err_out; |
| 987 | } | 986 | } |
| 988 | ni->itype.index.bmp_ino = bvi; | ||
| 989 | bni = NTFS_I(bvi); | 987 | bni = NTFS_I(bvi); |
| 990 | if (NInoCompressed(bni) || NInoEncrypted(bni) || | 988 | if (NInoCompressed(bni) || NInoEncrypted(bni) || |
| 991 | NInoSparse(bni)) { | 989 | NInoSparse(bni)) { |
| 992 | ntfs_error(vi->i_sb, "$BITMAP attribute is compressed " | 990 | ntfs_error(vi->i_sb, "$BITMAP attribute is compressed " |
| 993 | "and/or encrypted and/or sparse."); | 991 | "and/or encrypted and/or sparse."); |
| 994 | goto unm_err_out; | 992 | goto iput_unm_err_out; |
| 995 | } | 993 | } |
| 996 | /* Consistency check bitmap size vs. index allocation size. */ | 994 | /* Consistency check bitmap size vs. index allocation size. */ |
| 997 | bvi_size = i_size_read(bvi); | 995 | bvi_size = i_size_read(bvi); |
| @@ -1000,8 +998,10 @@ skip_attr_list_load: | |||
| 1000 | ntfs_error(vi->i_sb, "Index bitmap too small (0x%llx) " | 998 | ntfs_error(vi->i_sb, "Index bitmap too small (0x%llx) " |
| 1001 | "for index allocation (0x%llx).", | 999 | "for index allocation (0x%llx).", |
| 1002 | bvi_size << 3, vi->i_size); | 1000 | bvi_size << 3, vi->i_size); |
| 1003 | goto unm_err_out; | 1001 | goto iput_unm_err_out; |
| 1004 | } | 1002 | } |
| 1003 | /* No longer need the bitmap attribute inode. */ | ||
| 1004 | iput(bvi); | ||
| 1005 | skip_large_dir_stuff: | 1005 | skip_large_dir_stuff: |
| 1006 | /* Setup the operations for this inode. */ | 1006 | /* Setup the operations for this inode. */ |
| 1007 | vi->i_op = &ntfs_dir_inode_ops; | 1007 | vi->i_op = &ntfs_dir_inode_ops; |
| @@ -1176,7 +1176,8 @@ no_data_attr_special_case: | |||
| 1176 | vi->i_blocks = ni->allocated_size >> 9; | 1176 | vi->i_blocks = ni->allocated_size >> 9; |
| 1177 | ntfs_debug("Done."); | 1177 | ntfs_debug("Done."); |
| 1178 | return 0; | 1178 | return 0; |
| 1179 | 1179 | iput_unm_err_out: | |
| 1180 | iput(bvi); | ||
| 1180 | unm_err_out: | 1181 | unm_err_out: |
| 1181 | if (!err) | 1182 | if (!err) |
| 1182 | err = -EIO; | 1183 | err = -EIO; |
| @@ -1697,7 +1698,7 @@ static int ntfs_read_locked_index_inode(struct inode *base_vi, struct inode *vi) | |||
| 1697 | vi->i_size); | 1698 | vi->i_size); |
| 1698 | goto iput_unm_err_out; | 1699 | goto iput_unm_err_out; |
| 1699 | } | 1700 | } |
| 1700 | ni->itype.index.bmp_ino = bvi; | 1701 | iput(bvi); |
| 1701 | skip_large_index_stuff: | 1702 | skip_large_index_stuff: |
| 1702 | /* Setup the operations for this index inode. */ | 1703 | /* Setup the operations for this index inode. */ |
| 1703 | vi->i_op = NULL; | 1704 | vi->i_op = NULL; |
| @@ -1714,7 +1715,6 @@ skip_large_index_stuff: | |||
| 1714 | 1715 | ||
| 1715 | ntfs_debug("Done."); | 1716 | ntfs_debug("Done."); |
| 1716 | return 0; | 1717 | return 0; |
| 1717 | |||
| 1718 | iput_unm_err_out: | 1718 | iput_unm_err_out: |
| 1719 | iput(bvi); | 1719 | iput(bvi); |
| 1720 | unm_err_out: | 1720 | unm_err_out: |
| @@ -2191,37 +2191,6 @@ err_out: | |||
| 2191 | return -1; | 2191 | return -1; |
| 2192 | } | 2192 | } |
| 2193 | 2193 | ||
| 2194 | /** | ||
| 2195 | * ntfs_put_inode - handler for when the inode reference count is decremented | ||
| 2196 | * @vi: vfs inode | ||
| 2197 | * | ||
| 2198 | * The VFS calls ntfs_put_inode() every time the inode reference count (i_count) | ||
| 2199 | * is about to be decremented (but before the decrement itself. | ||
| 2200 | * | ||
| 2201 | * If the inode @vi is a directory with two references, one of which is being | ||
| 2202 | * dropped, we need to put the attribute inode for the directory index bitmap, | ||
| 2203 | * if it is present, otherwise the directory inode would remain pinned for | ||
| 2204 | * ever. | ||
| 2205 | */ | ||
| 2206 | void ntfs_put_inode(struct inode *vi) | ||
| 2207 | { | ||
| 2208 | if (S_ISDIR(vi->i_mode) && atomic_read(&vi->i_count) == 2) { | ||
| 2209 | ntfs_inode *ni = NTFS_I(vi); | ||
| 2210 | if (NInoIndexAllocPresent(ni)) { | ||
| 2211 | struct inode *bvi = NULL; | ||
| 2212 | mutex_lock(&vi->i_mutex); | ||
| 2213 | if (atomic_read(&vi->i_count) == 2) { | ||
| 2214 | bvi = ni->itype.index.bmp_ino; | ||
| 2215 | if (bvi) | ||
| 2216 | ni->itype.index.bmp_ino = NULL; | ||
| 2217 | } | ||
| 2218 | mutex_unlock(&vi->i_mutex); | ||
| 2219 | if (bvi) | ||
| 2220 | iput(bvi); | ||
| 2221 | } | ||
| 2222 | } | ||
| 2223 | } | ||
| 2224 | |||
| 2225 | static void __ntfs_clear_inode(ntfs_inode *ni) | 2194 | static void __ntfs_clear_inode(ntfs_inode *ni) |
| 2226 | { | 2195 | { |
| 2227 | /* Free all alocated memory. */ | 2196 | /* Free all alocated memory. */ |
| @@ -2287,18 +2256,6 @@ void ntfs_clear_big_inode(struct inode *vi) | |||
| 2287 | { | 2256 | { |
| 2288 | ntfs_inode *ni = NTFS_I(vi); | 2257 | ntfs_inode *ni = NTFS_I(vi); |
| 2289 | 2258 | ||
| 2290 | /* | ||
| 2291 | * If the inode @vi is an index inode we need to put the attribute | ||
| 2292 | * inode for the index bitmap, if it is present, otherwise the index | ||
| 2293 | * inode would disappear and the attribute inode for the index bitmap | ||
| 2294 | * would no longer be referenced from anywhere and thus it would remain | ||
| 2295 | * pinned for ever. | ||
| 2296 | */ | ||
| 2297 | if (NInoAttr(ni) && (ni->type == AT_INDEX_ALLOCATION) && | ||
| 2298 | NInoIndexAllocPresent(ni) && ni->itype.index.bmp_ino) { | ||
| 2299 | iput(ni->itype.index.bmp_ino); | ||
| 2300 | ni->itype.index.bmp_ino = NULL; | ||
| 2301 | } | ||
| 2302 | #ifdef NTFS_RW | 2259 | #ifdef NTFS_RW |
| 2303 | if (NInoDirty(ni)) { | 2260 | if (NInoDirty(ni)) { |
| 2304 | bool was_bad = (is_bad_inode(vi)); | 2261 | bool was_bad = (is_bad_inode(vi)); |
diff --git a/fs/ntfs/inode.h b/fs/ntfs/inode.h index f088291e017c..117eaf8032a3 100644 --- a/fs/ntfs/inode.h +++ b/fs/ntfs/inode.h | |||
| @@ -2,7 +2,7 @@ | |||
| 2 | * inode.h - Defines for inode structures NTFS Linux kernel driver. Part of | 2 | * inode.h - Defines for inode structures NTFS Linux kernel driver. Part of |
| 3 | * the Linux-NTFS project. | 3 | * the Linux-NTFS project. |
| 4 | * | 4 | * |
| 5 | * Copyright (c) 2001-2005 Anton Altaparmakov | 5 | * Copyright (c) 2001-2007 Anton Altaparmakov |
| 6 | * Copyright (c) 2002 Richard Russon | 6 | * Copyright (c) 2002 Richard Russon |
| 7 | * | 7 | * |
| 8 | * This program/include file is free software; you can redistribute it and/or | 8 | * This program/include file is free software; you can redistribute it and/or |
| @@ -101,8 +101,6 @@ struct _ntfs_inode { | |||
| 101 | runlist attr_list_rl; /* Run list for the attribute list value. */ | 101 | runlist attr_list_rl; /* Run list for the attribute list value. */ |
| 102 | union { | 102 | union { |
| 103 | struct { /* It is a directory, $MFT, or an index inode. */ | 103 | struct { /* It is a directory, $MFT, or an index inode. */ |
| 104 | struct inode *bmp_ino; /* Attribute inode for the | ||
| 105 | index $BITMAP. */ | ||
| 106 | u32 block_size; /* Size of an index block. */ | 104 | u32 block_size; /* Size of an index block. */ |
| 107 | u32 vcn_size; /* Size of a vcn in this | 105 | u32 vcn_size; /* Size of a vcn in this |
| 108 | index. */ | 106 | index. */ |
| @@ -300,8 +298,6 @@ extern void ntfs_clear_extent_inode(ntfs_inode *ni); | |||
| 300 | 298 | ||
| 301 | extern int ntfs_read_inode_mount(struct inode *vi); | 299 | extern int ntfs_read_inode_mount(struct inode *vi); |
| 302 | 300 | ||
| 303 | extern void ntfs_put_inode(struct inode *vi); | ||
| 304 | |||
| 305 | extern int ntfs_show_options(struct seq_file *sf, struct vfsmount *mnt); | 301 | extern int ntfs_show_options(struct seq_file *sf, struct vfsmount *mnt); |
| 306 | 302 | ||
| 307 | #ifdef NTFS_RW | 303 | #ifdef NTFS_RW |
diff --git a/fs/ntfs/super.c b/fs/ntfs/super.c index 03a391ac7145..babf94d90def 100644 --- a/fs/ntfs/super.c +++ b/fs/ntfs/super.c | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * super.c - NTFS kernel super block handling. Part of the Linux-NTFS project. | 2 | * super.c - NTFS kernel super block handling. Part of the Linux-NTFS project. |
| 3 | * | 3 | * |
| 4 | * Copyright (c) 2001-2006 Anton Altaparmakov | 4 | * Copyright (c) 2001-2007 Anton Altaparmakov |
| 5 | * Copyright (c) 2001,2002 Richard Russon | 5 | * Copyright (c) 2001,2002 Richard Russon |
| 6 | * | 6 | * |
| 7 | * This program/include file is free software; you can redistribute it and/or | 7 | * This program/include file is free software; you can redistribute it and/or |
| @@ -2702,9 +2702,6 @@ static int ntfs_statfs(struct dentry *dentry, struct kstatfs *sfs) | |||
| 2702 | static struct super_operations ntfs_sops = { | 2702 | static struct super_operations ntfs_sops = { |
| 2703 | .alloc_inode = ntfs_alloc_big_inode, /* VFS: Allocate new inode. */ | 2703 | .alloc_inode = ntfs_alloc_big_inode, /* VFS: Allocate new inode. */ |
| 2704 | .destroy_inode = ntfs_destroy_big_inode, /* VFS: Deallocate inode. */ | 2704 | .destroy_inode = ntfs_destroy_big_inode, /* VFS: Deallocate inode. */ |
| 2705 | .put_inode = ntfs_put_inode, /* VFS: Called just before | ||
| 2706 | the inode reference count | ||
| 2707 | is decreased. */ | ||
| 2708 | #ifdef NTFS_RW | 2705 | #ifdef NTFS_RW |
| 2709 | //.dirty_inode = NULL, /* VFS: Called from | 2706 | //.dirty_inode = NULL, /* VFS: Called from |
| 2710 | // __mark_inode_dirty(). */ | 2707 | // __mark_inode_dirty(). */ |
| @@ -3261,7 +3258,7 @@ static void __exit exit_ntfs_fs(void) | |||
| 3261 | } | 3258 | } |
| 3262 | 3259 | ||
| 3263 | MODULE_AUTHOR("Anton Altaparmakov <aia21@cantab.net>"); | 3260 | MODULE_AUTHOR("Anton Altaparmakov <aia21@cantab.net>"); |
| 3264 | MODULE_DESCRIPTION("NTFS 1.2/3.x driver - Copyright (c) 2001-2006 Anton Altaparmakov"); | 3261 | MODULE_DESCRIPTION("NTFS 1.2/3.x driver - Copyright (c) 2001-2007 Anton Altaparmakov"); |
| 3265 | MODULE_VERSION(NTFS_VERSION); | 3262 | MODULE_VERSION(NTFS_VERSION); |
| 3266 | MODULE_LICENSE("GPL"); | 3263 | MODULE_LICENSE("GPL"); |
| 3267 | #ifdef DEBUG | 3264 | #ifdef DEBUG |
diff --git a/include/asm-powerpc/atomic.h b/include/asm-powerpc/atomic.h index 53283e2540b3..f038e33e6d48 100644 --- a/include/asm-powerpc/atomic.h +++ b/include/asm-powerpc/atomic.h | |||
| @@ -207,7 +207,8 @@ static __inline__ int atomic_add_unless(atomic_t *v, int a, int u) | |||
| 207 | 207 | ||
| 208 | /* | 208 | /* |
| 209 | * Atomically test *v and decrement if it is greater than 0. | 209 | * Atomically test *v and decrement if it is greater than 0. |
| 210 | * The function returns the old value of *v minus 1. | 210 | * The function returns the old value of *v minus 1, even if |
| 211 | * the atomic variable, v, was not decremented. | ||
| 211 | */ | 212 | */ |
| 212 | static __inline__ int atomic_dec_if_positive(atomic_t *v) | 213 | static __inline__ int atomic_dec_if_positive(atomic_t *v) |
| 213 | { | 214 | { |
| @@ -216,14 +217,15 @@ static __inline__ int atomic_dec_if_positive(atomic_t *v) | |||
| 216 | __asm__ __volatile__( | 217 | __asm__ __volatile__( |
| 217 | LWSYNC_ON_SMP | 218 | LWSYNC_ON_SMP |
| 218 | "1: lwarx %0,0,%1 # atomic_dec_if_positive\n\ | 219 | "1: lwarx %0,0,%1 # atomic_dec_if_positive\n\ |
| 219 | addic. %0,%0,-1\n\ | 220 | cmpwi %0,1\n\ |
| 221 | addi %0,%0,-1\n\ | ||
| 220 | blt- 2f\n" | 222 | blt- 2f\n" |
| 221 | PPC405_ERR77(0,%1) | 223 | PPC405_ERR77(0,%1) |
| 222 | " stwcx. %0,0,%1\n\ | 224 | " stwcx. %0,0,%1\n\ |
| 223 | bne- 1b" | 225 | bne- 1b" |
| 224 | ISYNC_ON_SMP | 226 | ISYNC_ON_SMP |
| 225 | "\n\ | 227 | "\n\ |
| 226 | 2:" : "=&r" (t) | 228 | 2:" : "=&b" (t) |
| 227 | : "r" (&v->counter) | 229 | : "r" (&v->counter) |
| 228 | : "cc", "memory"); | 230 | : "cc", "memory"); |
| 229 | 231 | ||
diff --git a/include/linux/hid-debug.h b/include/linux/hid-debug.h index f04d6d75c098..8e4dbb51fc70 100644 --- a/include/linux/hid-debug.h +++ b/include/linux/hid-debug.h | |||
| @@ -700,9 +700,10 @@ static char *keys[KEY_MAX + 1] = { | |||
| 700 | 700 | ||
| 701 | static char *relatives[REL_MAX + 1] = { | 701 | static char *relatives[REL_MAX + 1] = { |
| 702 | [REL_X] = "X", [REL_Y] = "Y", | 702 | [REL_X] = "X", [REL_Y] = "Y", |
| 703 | [REL_Z] = "Z", [REL_HWHEEL] = "HWheel", | 703 | [REL_Z] = "Z", [REL_RX] = "Rx", |
| 704 | [REL_DIAL] = "Dial", [REL_WHEEL] = "Wheel", | 704 | [REL_RY] = "Ry", [REL_RZ] = "Rz", |
| 705 | [REL_MISC] = "Misc", | 705 | [REL_HWHEEL] = "HWheel", [REL_DIAL] = "Dial", |
| 706 | [REL_WHEEL] = "Wheel", [REL_MISC] = "Misc", | ||
| 706 | }; | 707 | }; |
| 707 | 708 | ||
| 708 | static char *absolutes[ABS_MAX + 1] = { | 709 | static char *absolutes[ABS_MAX + 1] = { |
diff --git a/include/linux/libata.h b/include/linux/libata.h index ab2754830322..e53a13ba7f78 100644 --- a/include/linux/libata.h +++ b/include/linux/libata.h | |||
| @@ -1143,6 +1143,7 @@ static inline void ata_tf_init(struct ata_device *dev, struct ata_taskfile *tf) | |||
| 1143 | 1143 | ||
| 1144 | static inline void ata_qc_reinit(struct ata_queued_cmd *qc) | 1144 | static inline void ata_qc_reinit(struct ata_queued_cmd *qc) |
| 1145 | { | 1145 | { |
| 1146 | qc->dma_dir = DMA_NONE; | ||
| 1146 | qc->__sg = NULL; | 1147 | qc->__sg = NULL; |
| 1147 | qc->flags = 0; | 1148 | qc->flags = 0; |
| 1148 | qc->cursect = qc->cursg = qc->cursg_ofs = 0; | 1149 | qc->cursect = qc->cursg = qc->cursg_ofs = 0; |
diff --git a/include/linux/mmc/mmc.h b/include/linux/mmc/mmc.h index a3594dfd6963..bcf24909d677 100644 --- a/include/linux/mmc/mmc.h +++ b/include/linux/mmc/mmc.h | |||
| @@ -42,7 +42,7 @@ struct mmc_command { | |||
| 42 | #define MMC_RSP_R1B (MMC_RSP_PRESENT|MMC_RSP_CRC|MMC_RSP_OPCODE|MMC_RSP_BUSY) | 42 | #define MMC_RSP_R1B (MMC_RSP_PRESENT|MMC_RSP_CRC|MMC_RSP_OPCODE|MMC_RSP_BUSY) |
| 43 | #define MMC_RSP_R2 (MMC_RSP_PRESENT|MMC_RSP_136|MMC_RSP_CRC) | 43 | #define MMC_RSP_R2 (MMC_RSP_PRESENT|MMC_RSP_136|MMC_RSP_CRC) |
| 44 | #define MMC_RSP_R3 (MMC_RSP_PRESENT) | 44 | #define MMC_RSP_R3 (MMC_RSP_PRESENT) |
| 45 | #define MMC_RSP_R6 (MMC_RSP_PRESENT|MMC_RSP_CRC) | 45 | #define MMC_RSP_R6 (MMC_RSP_PRESENT|MMC_RSP_CRC|MMC_RSP_OPCODE) |
| 46 | 46 | ||
| 47 | #define mmc_resp_type(cmd) ((cmd)->flags & (MMC_RSP_PRESENT|MMC_RSP_136|MMC_RSP_CRC|MMC_RSP_BUSY|MMC_RSP_OPCODE)) | 47 | #define mmc_resp_type(cmd) ((cmd)->flags & (MMC_RSP_PRESENT|MMC_RSP_136|MMC_RSP_CRC|MMC_RSP_BUSY|MMC_RSP_OPCODE)) |
| 48 | 48 | ||
diff --git a/include/linux/videodev2.h b/include/linux/videodev2.h index 5cb380a559fd..d94e2683be52 100644 --- a/include/linux/videodev2.h +++ b/include/linux/videodev2.h | |||
| @@ -662,6 +662,15 @@ typedef __u64 v4l2_std_id; | |||
| 662 | #define V4L2_STD_ATSC_8_VSB ((v4l2_std_id)0x01000000) | 662 | #define V4L2_STD_ATSC_8_VSB ((v4l2_std_id)0x01000000) |
| 663 | #define V4L2_STD_ATSC_16_VSB ((v4l2_std_id)0x02000000) | 663 | #define V4L2_STD_ATSC_16_VSB ((v4l2_std_id)0x02000000) |
| 664 | 664 | ||
| 665 | /* FIXME: | ||
| 666 | Although std_id is 64 bits, there is an issue on PPC32 architecture that | ||
| 667 | makes switch(__u64) to break. So, there's a hack on v4l2-common.c rounding | ||
| 668 | this value to 32 bits. | ||
| 669 | As, currently, the max value is for V4L2_STD_ATSC_16_VSB (30 bits wide), | ||
| 670 | it should work fine. However, if needed to add more than two standards, | ||
| 671 | v4l2-common.c should be fixed. | ||
| 672 | */ | ||
| 673 | |||
| 665 | /* some merged standards */ | 674 | /* some merged standards */ |
| 666 | #define V4L2_STD_MN (V4L2_STD_PAL_M|V4L2_STD_PAL_N|V4L2_STD_PAL_Nc|V4L2_STD_NTSC) | 675 | #define V4L2_STD_MN (V4L2_STD_PAL_M|V4L2_STD_PAL_N|V4L2_STD_PAL_Nc|V4L2_STD_NTSC) |
| 667 | #define V4L2_STD_B (V4L2_STD_PAL_B|V4L2_STD_PAL_B1|V4L2_STD_SECAM_B) | 676 | #define V4L2_STD_B (V4L2_STD_PAL_B|V4L2_STD_PAL_B1|V4L2_STD_SECAM_B) |