tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge branch 'merge' of git://git.secretlab.ca/git/linux-2.6

* 'merge' of git://git.secretlab.ca/git/linux-2.6:
powerpc/5200: Build fix for mpc52xx watchdog timer code
of: Fix comparison of "compatible" properties
powerpc/52xx: update defconfigs
spi/omap2_mcspi: Use transaction speed if provided
spi/omap2_mcspi: fix NULL pointer dereference
uartlite: Fix build on sparc.

Linus Torvalds 9d20593a 9b59a0a4

+183 -119
+12 -12
arch/powerpc/configs/52xx/cm5200_defconfig
··· 1 1 # 2 2 # Automatically generated make config: don't edit 3 - # Linux kernel version: 2.6.33-rc2 4 - # Wed Dec 30 14:45:07 2009 3 + # Linux kernel version: 2.6.34-rc1 4 + # Wed Mar 10 14:34:22 2010 5 5 # 6 6 # CONFIG_PPC64 is not set 7 7 ··· 94 94 # CONFIG_TREE_RCU_TRACE is not set 95 95 # CONFIG_IKCONFIG is not set 96 96 CONFIG_LOG_BUF_SHIFT=14 97 - CONFIG_GROUP_SCHED=y 98 - CONFIG_FAIR_GROUP_SCHED=y 99 - # CONFIG_RT_GROUP_SCHED is not set 100 - CONFIG_USER_SCHED=y 101 - # CONFIG_CGROUP_SCHED is not set 102 97 # CONFIG_CGROUPS is not set 103 98 CONFIG_SYSFS_DEPRECATED=y 104 99 CONFIG_SYSFS_DEPRECATED_V2=y ··· 104 109 CONFIG_RD_GZIP=y 105 110 # CONFIG_RD_BZIP2 is not set 106 111 # CONFIG_RD_LZMA is not set 112 + # CONFIG_RD_LZO is not set 107 113 # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 108 114 CONFIG_SYSCTL=y 109 115 CONFIG_ANON_INODES=y ··· 336 340 # Networking options 337 341 # 338 342 CONFIG_PACKET=y 339 - # CONFIG_PACKET_MMAP is not set 340 343 CONFIG_UNIX=y 341 344 CONFIG_XFRM=y 342 345 CONFIG_XFRM_USER=y ··· 512 517 # UBI - Unsorted block images 513 518 # 514 519 # CONFIG_MTD_UBI is not set 520 + CONFIG_OF_FLATTREE=y 521 + CONFIG_OF_DYNAMIC=y 515 522 CONFIG_OF_DEVICE=y 516 523 CONFIG_OF_I2C=y 517 524 CONFIG_OF_MDIO=y ··· 681 684 CONFIG_SERIAL_MPC52xx=y 682 685 CONFIG_SERIAL_MPC52xx_CONSOLE=y 683 686 CONFIG_SERIAL_MPC52xx_CONSOLE_BAUD=57600 687 + # CONFIG_SERIAL_TIMBERDALE is not set 684 688 # CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set 685 689 CONFIG_UNIX98_PTYS=y 686 690 # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set ··· 712 714 CONFIG_I2C_MPC=y 713 715 # CONFIG_I2C_OCORES is not set 714 716 # CONFIG_I2C_SIMTEC is not set 717 + # CONFIG_I2C_XILINX is not set 715 718 716 719 # 717 720 # External I2C/SMBus adapter drivers ··· 753 754 # Watchdog Device Drivers 754 755 # 755 756 # CONFIG_SOFT_WATCHDOG is not set 757 + # CONFIG_MAX63XX_WATCHDOG is not set 756 758 # CONFIG_MPC5200_WDT is not set 757 759 758 760 # ··· 771 771 # Multifunction device drivers 772 772 # 773 773 # CONFIG_MFD_CORE is not set 774 + # CONFIG_MFD_88PM860X is not set 774 775 # CONFIG_MFD_SM501 is not set 775 776 # CONFIG_HTC_PASIC3 is not set 776 777 # CONFIG_TWL4030_CORE is not set 777 778 # CONFIG_MFD_TMIO is not set 778 779 # CONFIG_PMIC_DA903X is not set 779 780 # CONFIG_PMIC_ADP5520 is not set 781 + # CONFIG_MFD_MAX8925 is not set 780 782 # CONFIG_MFD_WM8400 is not set 781 783 # CONFIG_MFD_WM831X is not set 782 784 # CONFIG_MFD_WM8350_I2C is not set 785 + # CONFIG_MFD_WM8994 is not set 783 786 # CONFIG_MFD_PCF50633 is not set 784 787 # CONFIG_AB3100_CORE is not set 785 - # CONFIG_MFD_88PM8607 is not set 786 788 # CONFIG_REGULATOR is not set 787 789 # CONFIG_MEDIA_SUPPORT is not set 788 790 ··· 815 813 CONFIG_USB_DEVICEFS=y 816 814 # CONFIG_USB_DEVICE_CLASS is not set 817 815 # CONFIG_USB_DYNAMIC_MINORS is not set 818 - # CONFIG_USB_SUSPEND is not set 819 816 # CONFIG_USB_OTG is not set 820 817 # CONFIG_USB_OTG_WHITELIST is not set 821 818 # CONFIG_USB_OTG_BLACKLIST_HUB is not set ··· 892 891 # CONFIG_USB_RIO500 is not set 893 892 # CONFIG_USB_LEGOTOWER is not set 894 893 # CONFIG_USB_LCD is not set 895 - # CONFIG_USB_BERRY_CHARGE is not set 896 894 # CONFIG_USB_LED is not set 897 895 # CONFIG_USB_CYPRESS_CY7C63 is not set 898 896 # CONFIG_USB_CYTHERM is not set ··· 903 903 # CONFIG_USB_IOWARRIOR is not set 904 904 # CONFIG_USB_TEST is not set 905 905 # CONFIG_USB_ISIGHTFW is not set 906 - # CONFIG_USB_VST is not set 907 906 # CONFIG_USB_GADGET is not set 908 907 909 908 # ··· 1008 1009 # CONFIG_JFFS2_LZO is not set 1009 1010 CONFIG_JFFS2_RTIME=y 1010 1011 # CONFIG_JFFS2_RUBIN is not set 1012 + # CONFIG_LOGFS is not set 1011 1013 CONFIG_CRAMFS=y 1012 1014 # CONFIG_SQUASHFS is not set 1013 1015 # CONFIG_VXFS_FS is not set
+17 -11
arch/powerpc/configs/52xx/lite5200b_defconfig
··· 1 1 # 2 2 # Automatically generated make config: don't edit 3 - # Linux kernel version: 2.6.33-rc2 4 - # Wed Dec 30 14:45:09 2009 3 + # Linux kernel version: 2.6.34-rc1 4 + # Wed Mar 10 14:34:24 2010 5 5 # 6 6 # CONFIG_PPC64 is not set 7 7 ··· 95 95 # CONFIG_TREE_RCU_TRACE is not set 96 96 # CONFIG_IKCONFIG is not set 97 97 CONFIG_LOG_BUF_SHIFT=14 98 - CONFIG_GROUP_SCHED=y 99 - # CONFIG_FAIR_GROUP_SCHED is not set 100 - # CONFIG_RT_GROUP_SCHED is not set 101 - CONFIG_USER_SCHED=y 102 - # CONFIG_CGROUP_SCHED is not set 103 98 # CONFIG_CGROUPS is not set 104 99 CONFIG_SYSFS_DEPRECATED=y 105 100 CONFIG_SYSFS_DEPRECATED_V2=y ··· 105 110 CONFIG_RD_GZIP=y 106 111 # CONFIG_RD_BZIP2 is not set 107 112 # CONFIG_RD_LZMA is not set 113 + # CONFIG_RD_LZO is not set 108 114 # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 109 115 CONFIG_SYSCTL=y 110 116 CONFIG_ANON_INODES=y ··· 313 317 CONFIG_SUSPEND_FREEZER=y 314 318 # CONFIG_HIBERNATION is not set 315 319 # CONFIG_PM_RUNTIME is not set 320 + CONFIG_PM_OPS=y 316 321 CONFIG_SECCOMP=y 317 322 CONFIG_ISA_DMA_API=y 318 323 ··· 330 333 # CONFIG_PCIEPORTBUS is not set 331 334 CONFIG_ARCH_SUPPORTS_MSI=y 332 335 # CONFIG_PCI_MSI is not set 333 - CONFIG_PCI_LEGACY=y 334 336 # CONFIG_PCI_DEBUG is not set 335 337 # CONFIG_PCI_STUB is not set 336 338 # CONFIG_PCI_IOV is not set ··· 356 360 # Networking options 357 361 # 358 362 CONFIG_PACKET=y 359 - # CONFIG_PACKET_MMAP is not set 360 363 CONFIG_UNIX=y 361 364 CONFIG_XFRM=y 362 365 CONFIG_XFRM_USER=m ··· 452 457 # CONFIG_SYS_HYPERVISOR is not set 453 458 # CONFIG_CONNECTOR is not set 454 459 # CONFIG_MTD is not set 460 + CONFIG_OF_FLATTREE=y 461 + CONFIG_OF_DYNAMIC=y 455 462 CONFIG_OF_DEVICE=y 456 463 CONFIG_OF_I2C=y 457 464 CONFIG_OF_MDIO=y ··· 628 631 # CONFIG_PATA_IT821X is not set 629 632 # CONFIG_PATA_IT8213 is not set 630 633 # CONFIG_PATA_JMICRON is not set 634 + # CONFIG_PATA_LEGACY is not set 631 635 # CONFIG_PATA_TRIFLEX is not set 632 636 # CONFIG_PATA_MARVELL is not set 633 637 CONFIG_PATA_MPC52xx=y ··· 666 668 # 667 669 668 670 # 669 - # See the help texts for more information. 671 + # The newer stack is recommended. 670 672 # 671 673 # CONFIG_FIREWIRE is not set 672 674 # CONFIG_IEEE1394 is not set ··· 766 768 # CONFIG_MLX4_CORE is not set 767 769 # CONFIG_TEHUTI is not set 768 770 # CONFIG_BNX2X is not set 771 + # CONFIG_QLCNIC is not set 769 772 # CONFIG_QLGE is not set 770 773 # CONFIG_SFC is not set 771 774 # CONFIG_BE2NET is not set ··· 827 828 CONFIG_SERIAL_MPC52xx_CONSOLE=y 828 829 CONFIG_SERIAL_MPC52xx_CONSOLE_BAUD=115200 829 830 # CONFIG_SERIAL_JSM is not set 831 + # CONFIG_SERIAL_TIMBERDALE is not set 830 832 # CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set 831 833 CONFIG_UNIX98_PTYS=y 832 834 # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set ··· 879 879 CONFIG_I2C_MPC=y 880 880 # CONFIG_I2C_OCORES is not set 881 881 # CONFIG_I2C_SIMTEC is not set 882 + # CONFIG_I2C_XILINX is not set 882 883 883 884 # 884 885 # External I2C/SMBus adapter drivers ··· 925 924 # Multifunction device drivers 926 925 # 927 926 # CONFIG_MFD_CORE is not set 927 + # CONFIG_MFD_88PM860X is not set 928 928 # CONFIG_MFD_SM501 is not set 929 929 # CONFIG_HTC_PASIC3 is not set 930 930 # CONFIG_TWL4030_CORE is not set 931 931 # CONFIG_MFD_TMIO is not set 932 932 # CONFIG_PMIC_DA903X is not set 933 933 # CONFIG_PMIC_ADP5520 is not set 934 + # CONFIG_MFD_MAX8925 is not set 934 935 # CONFIG_MFD_WM8400 is not set 935 936 # CONFIG_MFD_WM831X is not set 936 937 # CONFIG_MFD_WM8350_I2C is not set 938 + # CONFIG_MFD_WM8994 is not set 937 939 # CONFIG_MFD_PCF50633 is not set 938 940 # CONFIG_AB3100_CORE is not set 939 - # CONFIG_MFD_88PM8607 is not set 941 + # CONFIG_LPC_SCH is not set 940 942 # CONFIG_REGULATOR is not set 941 943 # CONFIG_MEDIA_SUPPORT is not set 942 944 ··· 948 944 # 949 945 # CONFIG_AGP is not set 950 946 CONFIG_VGA_ARB=y 947 + CONFIG_VGA_ARB_MAX_GPUS=16 951 948 # CONFIG_DRM is not set 952 949 # CONFIG_VGASTATE is not set 953 950 CONFIG_VIDEO_OUTPUT_CONTROL=m ··· 1067 1062 # CONFIG_BEFS_FS is not set 1068 1063 # CONFIG_BFS_FS is not set 1069 1064 # CONFIG_EFS_FS is not set 1065 + # CONFIG_LOGFS is not set 1070 1066 # CONFIG_CRAMFS is not set 1071 1067 # CONFIG_SQUASHFS is not set 1072 1068 # CONFIG_VXFS_FS is not set
+15 -10
arch/powerpc/configs/52xx/motionpro_defconfig
··· 1 1 # 2 2 # Automatically generated make config: don't edit 3 - # Linux kernel version: 2.6.33-rc2 4 - # Wed Dec 30 14:45:08 2009 3 + # Linux kernel version: 2.6.34-rc1 4 + # Wed Mar 10 14:34:23 2010 5 5 # 6 6 # CONFIG_PPC64 is not set 7 7 ··· 94 94 # CONFIG_TREE_RCU_TRACE is not set 95 95 # CONFIG_IKCONFIG is not set 96 96 CONFIG_LOG_BUF_SHIFT=14 97 - CONFIG_GROUP_SCHED=y 98 - CONFIG_FAIR_GROUP_SCHED=y 99 - # CONFIG_RT_GROUP_SCHED is not set 100 - CONFIG_USER_SCHED=y 101 - # CONFIG_CGROUP_SCHED is not set 102 97 # CONFIG_CGROUPS is not set 103 98 CONFIG_SYSFS_DEPRECATED=y 104 99 CONFIG_SYSFS_DEPRECATED_V2=y ··· 104 109 CONFIG_RD_GZIP=y 105 110 # CONFIG_RD_BZIP2 is not set 106 111 # CONFIG_RD_LZMA is not set 112 + # CONFIG_RD_LZO is not set 107 113 # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 108 114 CONFIG_SYSCTL=y 109 115 CONFIG_ANON_INODES=y ··· 337 341 # Networking options 338 342 # 339 343 CONFIG_PACKET=y 340 - # CONFIG_PACKET_MMAP is not set 341 344 CONFIG_UNIX=y 342 345 CONFIG_XFRM=y 343 346 CONFIG_XFRM_USER=y ··· 513 518 # UBI - Unsorted block images 514 519 # 515 520 # CONFIG_MTD_UBI is not set 521 + CONFIG_OF_FLATTREE=y 522 + CONFIG_OF_DYNAMIC=y 516 523 CONFIG_OF_DEVICE=y 517 524 CONFIG_OF_I2C=y 518 525 CONFIG_OF_MDIO=y ··· 696 699 CONFIG_SERIAL_MPC52xx=y 697 700 CONFIG_SERIAL_MPC52xx_CONSOLE=y 698 701 CONFIG_SERIAL_MPC52xx_CONSOLE_BAUD=115200 702 + # CONFIG_SERIAL_TIMBERDALE is not set 699 703 # CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set 700 704 CONFIG_UNIX98_PTYS=y 701 705 # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set ··· 726 728 CONFIG_I2C_MPC=y 727 729 # CONFIG_I2C_OCORES is not set 728 730 # CONFIG_I2C_SIMTEC is not set 731 + # CONFIG_I2C_XILINX is not set 729 732 730 733 # 731 734 # External I2C/SMBus adapter drivers ··· 772 773 # CONFIG_SENSORS_ADM1029 is not set 773 774 # CONFIG_SENSORS_ADM1031 is not set 774 775 # CONFIG_SENSORS_ADM9240 is not set 776 + # CONFIG_SENSORS_ADT7411 is not set 775 777 # CONFIG_SENSORS_ADT7462 is not set 776 778 # CONFIG_SENSORS_ADT7470 is not set 777 - # CONFIG_SENSORS_ADT7473 is not set 778 779 # CONFIG_SENSORS_ADT7475 is not set 780 + # CONFIG_SENSORS_ASC7621 is not set 779 781 # CONFIG_SENSORS_ATXP1 is not set 780 782 # CONFIG_SENSORS_DS1621 is not set 781 783 # CONFIG_SENSORS_F71805F is not set ··· 811 811 # CONFIG_SENSORS_SMSC47M192 is not set 812 812 # CONFIG_SENSORS_SMSC47B397 is not set 813 813 # CONFIG_SENSORS_ADS7828 is not set 814 + # CONFIG_SENSORS_AMC6821 is not set 814 815 # CONFIG_SENSORS_THMC50 is not set 815 816 # CONFIG_SENSORS_TMP401 is not set 816 817 # CONFIG_SENSORS_TMP421 is not set ··· 832 831 # Watchdog Device Drivers 833 832 # 834 833 # CONFIG_SOFT_WATCHDOG is not set 834 + # CONFIG_MAX63XX_WATCHDOG is not set 835 835 # CONFIG_MPC5200_WDT is not set 836 836 CONFIG_SSB_POSSIBLE=y 837 837 ··· 845 843 # Multifunction device drivers 846 844 # 847 845 # CONFIG_MFD_CORE is not set 846 + # CONFIG_MFD_88PM860X is not set 848 847 # CONFIG_MFD_SM501 is not set 849 848 # CONFIG_HTC_PASIC3 is not set 850 849 # CONFIG_TWL4030_CORE is not set 851 850 # CONFIG_MFD_TMIO is not set 852 851 # CONFIG_PMIC_DA903X is not set 853 852 # CONFIG_PMIC_ADP5520 is not set 853 + # CONFIG_MFD_MAX8925 is not set 854 854 # CONFIG_MFD_WM8400 is not set 855 855 # CONFIG_MFD_WM831X is not set 856 856 # CONFIG_MFD_WM8350_I2C is not set 857 + # CONFIG_MFD_WM8994 is not set 857 858 # CONFIG_MFD_PCF50633 is not set 858 859 # CONFIG_AB3100_CORE is not set 859 - # CONFIG_MFD_88PM8607 is not set 860 860 # CONFIG_REGULATOR is not set 861 861 # CONFIG_MEDIA_SUPPORT is not set 862 862 ··· 1054 1050 # CONFIG_JFFS2_LZO is not set 1055 1051 CONFIG_JFFS2_RTIME=y 1056 1052 # CONFIG_JFFS2_RUBIN is not set 1053 + # CONFIG_LOGFS is not set 1057 1054 CONFIG_CRAMFS=y 1058 1055 # CONFIG_SQUASHFS is not set 1059 1056 # CONFIG_VXFS_FS is not set
+14 -13
arch/powerpc/configs/52xx/pcm030_defconfig
··· 1 1 # 2 2 # Automatically generated make config: don't edit 3 - # Linux kernel version: 2.6.33-rc2 4 - # Wed Dec 30 14:45:10 2009 3 + # Linux kernel version: 2.6.34-rc1 4 + # Wed Mar 10 14:34:25 2010 5 5 # 6 6 # CONFIG_PPC64 is not set 7 7 ··· 97 97 CONFIG_IKCONFIG=y 98 98 CONFIG_IKCONFIG_PROC=y 99 99 CONFIG_LOG_BUF_SHIFT=14 100 - CONFIG_GROUP_SCHED=y 101 - CONFIG_FAIR_GROUP_SCHED=y 102 - # CONFIG_RT_GROUP_SCHED is not set 103 - CONFIG_USER_SCHED=y 104 - # CONFIG_CGROUP_SCHED is not set 105 100 # CONFIG_CGROUPS is not set 106 101 CONFIG_SYSFS_DEPRECATED=y 107 102 CONFIG_SYSFS_DEPRECATED_V2=y ··· 321 326 # CONFIG_PCIEPORTBUS is not set 322 327 CONFIG_ARCH_SUPPORTS_MSI=y 323 328 # CONFIG_PCI_MSI is not set 324 - CONFIG_PCI_LEGACY=y 325 329 # CONFIG_PCI_STUB is not set 326 330 # CONFIG_PCI_IOV is not set 327 331 # CONFIG_PCCARD is not set ··· 346 352 # Networking options 347 353 # 348 354 CONFIG_PACKET=y 349 - # CONFIG_PACKET_MMAP is not set 350 355 CONFIG_UNIX=y 351 356 # CONFIG_NET_KEY is not set 352 357 CONFIG_INET=y ··· 518 525 # UBI - Unsorted block images 519 526 # 520 527 # CONFIG_MTD_UBI is not set 528 + CONFIG_OF_FLATTREE=y 529 + CONFIG_OF_DYNAMIC=y 521 530 CONFIG_OF_DEVICE=y 522 531 CONFIG_OF_I2C=y 523 532 CONFIG_OF_MDIO=y ··· 605 610 # CONFIG_PATA_IT821X is not set 606 611 # CONFIG_PATA_IT8213 is not set 607 612 # CONFIG_PATA_JMICRON is not set 613 + # CONFIG_PATA_LEGACY is not set 608 614 # CONFIG_PATA_TRIFLEX is not set 609 615 # CONFIG_PATA_MARVELL is not set 610 616 CONFIG_PATA_MPC52xx=m ··· 643 647 # 644 648 645 649 # 646 - # See the help texts for more information. 650 + # The newer stack is recommended. 647 651 # 648 652 # CONFIG_FIREWIRE is not set 649 653 # CONFIG_IEEE1394 is not set ··· 771 775 CONFIG_SERIAL_MPC52xx_CONSOLE=y 772 776 CONFIG_SERIAL_MPC52xx_CONSOLE_BAUD=9600 773 777 # CONFIG_SERIAL_JSM is not set 778 + # CONFIG_SERIAL_TIMBERDALE is not set 774 779 # CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set 775 780 CONFIG_UNIX98_PTYS=y 776 781 # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set ··· 821 824 CONFIG_I2C_MPC=y 822 825 # CONFIG_I2C_OCORES is not set 823 826 # CONFIG_I2C_SIMTEC is not set 827 + # CONFIG_I2C_XILINX is not set 824 828 825 829 # 826 830 # External I2C/SMBus adapter drivers ··· 868 870 # Multifunction device drivers 869 871 # 870 872 # CONFIG_MFD_CORE is not set 873 + # CONFIG_MFD_88PM860X is not set 871 874 # CONFIG_MFD_SM501 is not set 872 875 # CONFIG_HTC_PASIC3 is not set 873 876 # CONFIG_TWL4030_CORE is not set 874 877 # CONFIG_MFD_TMIO is not set 875 878 # CONFIG_PMIC_DA903X is not set 876 879 # CONFIG_PMIC_ADP5520 is not set 880 + # CONFIG_MFD_MAX8925 is not set 877 881 # CONFIG_MFD_WM8400 is not set 878 882 # CONFIG_MFD_WM831X is not set 879 883 # CONFIG_MFD_WM8350_I2C is not set 884 + # CONFIG_MFD_WM8994 is not set 880 885 # CONFIG_MFD_PCF50633 is not set 881 886 # CONFIG_AB3100_CORE is not set 882 - # CONFIG_MFD_88PM8607 is not set 887 + # CONFIG_LPC_SCH is not set 883 888 # CONFIG_REGULATOR is not set 884 889 # CONFIG_MEDIA_SUPPORT is not set 885 890 ··· 891 890 # 892 891 # CONFIG_AGP is not set 893 892 CONFIG_VGA_ARB=y 893 + CONFIG_VGA_ARB_MAX_GPUS=16 894 894 # CONFIG_DRM is not set 895 895 # CONFIG_VGASTATE is not set 896 896 # CONFIG_VIDEO_OUTPUT_CONTROL is not set ··· 999 997 # CONFIG_USB_RIO500 is not set 1000 998 # CONFIG_USB_LEGOTOWER is not set 1001 999 # CONFIG_USB_LCD is not set 1002 - # CONFIG_USB_BERRY_CHARGE is not set 1003 1000 # CONFIG_USB_LED is not set 1004 1001 # CONFIG_USB_CYPRESS_CY7C63 is not set 1005 1002 # CONFIG_USB_CYTHERM is not set ··· 1010 1009 # CONFIG_USB_IOWARRIOR is not set 1011 1010 # CONFIG_USB_TEST is not set 1012 1011 # CONFIG_USB_ISIGHTFW is not set 1013 - # CONFIG_USB_VST is not set 1014 1012 # CONFIG_USB_GADGET is not set 1015 1013 1016 1014 # ··· 1172 1172 # CONFIG_JFFS2_LZO is not set 1173 1173 CONFIG_JFFS2_RTIME=y 1174 1174 # CONFIG_JFFS2_RUBIN is not set 1175 + # CONFIG_LOGFS is not set 1175 1176 # CONFIG_CRAMFS is not set 1176 1177 # CONFIG_SQUASHFS is not set 1177 1178 # CONFIG_VXFS_FS is not set
+15 -13
arch/powerpc/configs/52xx/tqm5200_defconfig
··· 1 1 # 2 2 # Automatically generated make config: don't edit 3 - # Linux kernel version: 2.6.33-rc2 4 - # Wed Dec 30 14:45:09 2009 3 + # Linux kernel version: 2.6.34-rc1 4 + # Wed Mar 10 14:34:24 2010 5 5 # 6 6 # CONFIG_PPC64 is not set 7 7 ··· 94 94 # CONFIG_TREE_RCU_TRACE is not set 95 95 # CONFIG_IKCONFIG is not set 96 96 CONFIG_LOG_BUF_SHIFT=14 97 - CONFIG_GROUP_SCHED=y 98 - CONFIG_FAIR_GROUP_SCHED=y 99 - # CONFIG_RT_GROUP_SCHED is not set 100 - CONFIG_USER_SCHED=y 101 - # CONFIG_CGROUP_SCHED is not set 102 97 # CONFIG_CGROUPS is not set 103 98 CONFIG_SYSFS_DEPRECATED=y 104 99 CONFIG_SYSFS_DEPRECATED_V2=y ··· 104 109 CONFIG_RD_GZIP=y 105 110 # CONFIG_RD_BZIP2 is not set 106 111 # CONFIG_RD_LZMA is not set 112 + # CONFIG_RD_LZO is not set 107 113 # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 108 114 CONFIG_SYSCTL=y 109 115 CONFIG_ANON_INODES=y ··· 342 346 # Networking options 343 347 # 344 348 CONFIG_PACKET=y 345 - # CONFIG_PACKET_MMAP is not set 346 349 CONFIG_UNIX=y 347 350 CONFIG_XFRM=y 348 351 CONFIG_XFRM_USER=y ··· 519 524 # UBI - Unsorted block images 520 525 # 521 526 # CONFIG_MTD_UBI is not set 527 + CONFIG_OF_FLATTREE=y 528 + CONFIG_OF_DYNAMIC=y 522 529 CONFIG_OF_DEVICE=y 523 530 CONFIG_OF_I2C=y 524 531 CONFIG_OF_MDIO=y ··· 701 704 CONFIG_SERIAL_MPC52xx=y 702 705 CONFIG_SERIAL_MPC52xx_CONSOLE=y 703 706 CONFIG_SERIAL_MPC52xx_CONSOLE_BAUD=115200 707 + # CONFIG_SERIAL_TIMBERDALE is not set 704 708 # CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set 705 709 CONFIG_UNIX98_PTYS=y 706 710 # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set ··· 731 733 CONFIG_I2C_MPC=y 732 734 # CONFIG_I2C_OCORES is not set 733 735 # CONFIG_I2C_SIMTEC is not set 736 + # CONFIG_I2C_XILINX is not set 734 737 735 738 # 736 739 # External I2C/SMBus adapter drivers ··· 779 780 # CONFIG_SENSORS_ADM1029 is not set 780 781 # CONFIG_SENSORS_ADM1031 is not set 781 782 # CONFIG_SENSORS_ADM9240 is not set 783 + # CONFIG_SENSORS_ADT7411 is not set 782 784 # CONFIG_SENSORS_ADT7462 is not set 783 785 # CONFIG_SENSORS_ADT7470 is not set 784 - # CONFIG_SENSORS_ADT7473 is not set 785 786 # CONFIG_SENSORS_ADT7475 is not set 787 + # CONFIG_SENSORS_ASC7621 is not set 786 788 # CONFIG_SENSORS_ATXP1 is not set 787 789 # CONFIG_SENSORS_DS1621 is not set 788 790 # CONFIG_SENSORS_F71805F is not set ··· 818 818 # CONFIG_SENSORS_SMSC47M192 is not set 819 819 # CONFIG_SENSORS_SMSC47B397 is not set 820 820 # CONFIG_SENSORS_ADS7828 is not set 821 + # CONFIG_SENSORS_AMC6821 is not set 821 822 # CONFIG_SENSORS_THMC50 is not set 822 823 # CONFIG_SENSORS_TMP401 is not set 823 824 # CONFIG_SENSORS_TMP421 is not set ··· 839 838 # Watchdog Device Drivers 840 839 # 841 840 # CONFIG_SOFT_WATCHDOG is not set 841 + # CONFIG_MAX63XX_WATCHDOG is not set 842 842 # CONFIG_MPC5200_WDT is not set 843 843 844 844 # ··· 857 855 # Multifunction device drivers 858 856 # 859 857 # CONFIG_MFD_CORE is not set 858 + # CONFIG_MFD_88PM860X is not set 860 859 # CONFIG_MFD_SM501 is not set 861 860 # CONFIG_HTC_PASIC3 is not set 862 861 # CONFIG_TWL4030_CORE is not set 863 862 # CONFIG_MFD_TMIO is not set 864 863 # CONFIG_PMIC_DA903X is not set 865 864 # CONFIG_PMIC_ADP5520 is not set 865 + # CONFIG_MFD_MAX8925 is not set 866 866 # CONFIG_MFD_WM8400 is not set 867 867 # CONFIG_MFD_WM831X is not set 868 868 # CONFIG_MFD_WM8350_I2C is not set 869 + # CONFIG_MFD_WM8994 is not set 869 870 # CONFIG_MFD_PCF50633 is not set 870 871 # CONFIG_AB3100_CORE is not set 871 - # CONFIG_MFD_88PM8607 is not set 872 872 # CONFIG_REGULATOR is not set 873 873 # CONFIG_MEDIA_SUPPORT is not set 874 874 ··· 901 897 CONFIG_USB_DEVICEFS=y 902 898 # CONFIG_USB_DEVICE_CLASS is not set 903 899 # CONFIG_USB_DYNAMIC_MINORS is not set 904 - # CONFIG_USB_SUSPEND is not set 905 900 # CONFIG_USB_OTG is not set 906 901 # CONFIG_USB_OTG_WHITELIST is not set 907 902 # CONFIG_USB_OTG_BLACKLIST_HUB is not set ··· 978 975 # CONFIG_USB_RIO500 is not set 979 976 # CONFIG_USB_LEGOTOWER is not set 980 977 # CONFIG_USB_LCD is not set 981 - # CONFIG_USB_BERRY_CHARGE is not set 982 978 # CONFIG_USB_LED is not set 983 979 # CONFIG_USB_CYPRESS_CY7C63 is not set 984 980 # CONFIG_USB_CYTHERM is not set ··· 989 987 # CONFIG_USB_IOWARRIOR is not set 990 988 # CONFIG_USB_TEST is not set 991 989 # CONFIG_USB_ISIGHTFW is not set 992 - # CONFIG_USB_VST is not set 993 990 # CONFIG_USB_GADGET is not set 994 991 995 992 # ··· 1152 1151 # CONFIG_JFFS2_LZO is not set 1153 1152 CONFIG_JFFS2_RTIME=y 1154 1153 # CONFIG_JFFS2_RUBIN is not set 1154 + # CONFIG_LOGFS is not set 1155 1155 CONFIG_CRAMFS=y 1156 1156 # CONFIG_SQUASHFS is not set 1157 1157 # CONFIG_VXFS_FS is not set
+87 -47
arch/powerpc/configs/mpc5200_defconfig
··· 1 1 # 2 2 # Automatically generated make config: don't edit 3 - # Linux kernel version: 2.6.33-rc2 4 - # Wed Dec 30 15:08:52 2009 3 + # Linux kernel version: 2.6.34-rc1 4 + # Wed Mar 10 14:38:54 2010 5 5 # 6 6 # CONFIG_PPC64 is not set 7 7 ··· 96 96 # CONFIG_TREE_RCU_TRACE is not set 97 97 # CONFIG_IKCONFIG is not set 98 98 CONFIG_LOG_BUF_SHIFT=14 99 - # CONFIG_GROUP_SCHED is not set 100 99 # CONFIG_CGROUPS is not set 101 100 CONFIG_SYSFS_DEPRECATED=y 102 101 CONFIG_SYSFS_DEPRECATED_V2=y 103 102 # CONFIG_RELAY is not set 104 - # CONFIG_NAMESPACES is not set 103 + CONFIG_NAMESPACES=y 104 + # CONFIG_UTS_NS is not set 105 + # CONFIG_IPC_NS is not set 106 + # CONFIG_USER_NS is not set 107 + # CONFIG_PID_NS is not set 108 + # CONFIG_NET_NS is not set 105 109 CONFIG_BLK_DEV_INITRD=y 106 110 CONFIG_INITRAMFS_SOURCE="" 107 111 CONFIG_RD_GZIP=y 108 - # CONFIG_RD_BZIP2 is not set 109 - # CONFIG_RD_LZMA is not set 112 + CONFIG_RD_BZIP2=y 113 + CONFIG_RD_LZMA=y 114 + CONFIG_RD_LZO=y 110 115 # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 111 116 CONFIG_SYSCTL=y 112 117 CONFIG_ANON_INODES=y 113 - CONFIG_EMBEDDED=y 114 - # CONFIG_SYSCTL_SYSCALL is not set 115 - # CONFIG_KALLSYMS is not set 118 + # CONFIG_EMBEDDED is not set 119 + CONFIG_SYSCTL_SYSCALL=y 120 + CONFIG_KALLSYMS=y 121 + # CONFIG_KALLSYMS_ALL is not set 122 + # CONFIG_KALLSYMS_EXTRA_PASS is not set 116 123 CONFIG_HOTPLUG=y 117 124 CONFIG_PRINTK=y 118 125 CONFIG_BUG=y 119 126 CONFIG_ELF_CORE=y 120 127 CONFIG_BASE_FULL=y 121 128 CONFIG_FUTEX=y 122 - # CONFIG_EPOLL is not set 129 + CONFIG_EPOLL=y 123 130 CONFIG_SIGNALFD=y 124 131 CONFIG_TIMERFD=y 125 132 CONFIG_EVENTFD=y ··· 148 141 # CONFIG_SLOB is not set 149 142 # CONFIG_PROFILING is not set 150 143 CONFIG_HAVE_OPROFILE=y 144 + # CONFIG_KPROBES is not set 151 145 CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y 152 146 CONFIG_HAVE_IOREMAP_PROT=y 153 147 CONFIG_HAVE_KPROBES=y ··· 328 320 CONFIG_SUSPEND_FREEZER=y 329 321 # CONFIG_HIBERNATION is not set 330 322 # CONFIG_PM_RUNTIME is not set 323 + CONFIG_PM_OPS=y 331 324 CONFIG_SECCOMP=y 332 325 CONFIG_ISA_DMA_API=y 333 326 ··· 345 336 # CONFIG_PCIEPORTBUS is not set 346 337 CONFIG_ARCH_SUPPORTS_MSI=y 347 338 # CONFIG_PCI_MSI is not set 348 - CONFIG_PCI_LEGACY=y 349 339 # CONFIG_PCI_DEBUG is not set 350 340 # CONFIG_PCI_STUB is not set 351 341 # CONFIG_PCI_IOV is not set ··· 371 363 # Networking options 372 364 # 373 365 CONFIG_PACKET=y 374 - # CONFIG_PACKET_MMAP is not set 375 366 CONFIG_UNIX=y 376 367 CONFIG_XFRM=y 377 368 CONFIG_XFRM_USER=m ··· 461 454 # CONFIG_DEVTMPFS is not set 462 455 CONFIG_STANDALONE=y 463 456 CONFIG_PREVENT_FIRMWARE_BUILD=y 464 - # CONFIG_FW_LOADER is not set 457 + CONFIG_FW_LOADER=y 458 + CONFIG_FIRMWARE_IN_KERNEL=y 459 + CONFIG_EXTRA_FIRMWARE="" 465 460 # CONFIG_DEBUG_DRIVER is not set 466 461 # CONFIG_DEBUG_DEVRES is not set 467 462 # CONFIG_SYS_HYPERVISOR is not set ··· 563 554 # UBI debugging options 564 555 # 565 556 # CONFIG_MTD_UBI_DEBUG is not set 557 + CONFIG_OF_FLATTREE=y 558 + CONFIG_OF_DYNAMIC=y 566 559 CONFIG_OF_DEVICE=y 567 560 CONFIG_OF_GPIO=y 568 561 CONFIG_OF_I2C=y ··· 743 732 # CONFIG_PATA_IT821X is not set 744 733 # CONFIG_PATA_IT8213 is not set 745 734 # CONFIG_PATA_JMICRON is not set 735 + # CONFIG_PATA_LEGACY is not set 746 736 # CONFIG_PATA_TRIFLEX is not set 747 737 # CONFIG_PATA_MARVELL is not set 748 738 CONFIG_PATA_MPC52xx=y ··· 782 770 # 783 771 784 772 # 785 - # See the help texts for more information. 773 + # The newer stack is recommended. 786 774 # 787 775 # CONFIG_FIREWIRE is not set 788 776 # CONFIG_IEEE1394 is not set ··· 941 929 CONFIG_SERIAL_MPC52xx_CONSOLE=y 942 930 CONFIG_SERIAL_MPC52xx_CONSOLE_BAUD=115200 943 931 # CONFIG_SERIAL_JSM is not set 932 + # CONFIG_SERIAL_TIMBERDALE is not set 944 933 # CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set 945 934 CONFIG_UNIX98_PTYS=y 946 935 # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set ··· 994 981 CONFIG_I2C_MPC=y 995 982 # CONFIG_I2C_OCORES is not set 996 983 # CONFIG_I2C_SIMTEC is not set 984 + # CONFIG_I2C_XILINX is not set 997 985 998 986 # 999 987 # External I2C/SMBus adapter drivers ··· 1024 1010 # 1025 1011 # SPI Master Controller Drivers 1026 1012 # 1027 - # CONFIG_SPI_BITBANG is not set 1028 - # CONFIG_SPI_GPIO is not set 1029 - # CONFIG_SPI_MPC52xx is not set 1013 + CONFIG_SPI_BITBANG=m 1014 + CONFIG_SPI_GPIO=m 1015 + CONFIG_SPI_MPC52xx=m 1030 1016 CONFIG_SPI_MPC52xx_PSC=m 1031 1017 # CONFIG_SPI_XILINX is not set 1032 1018 # CONFIG_SPI_DESIGNWARE is not set ··· 1050 1036 # 1051 1037 # Memory mapped GPIO expanders: 1052 1038 # 1039 + # CONFIG_GPIO_IT8761E is not set 1053 1040 # CONFIG_GPIO_XILINX is not set 1041 + # CONFIG_GPIO_SCH is not set 1054 1042 1055 1043 # 1056 1044 # I2C GPIO expanders: 1057 1045 # 1046 + # CONFIG_GPIO_MAX7300 is not set 1058 1047 # CONFIG_GPIO_MAX732X is not set 1059 1048 # CONFIG_GPIO_PCA953X is not set 1060 1049 # CONFIG_GPIO_PCF857X is not set 1050 + # CONFIG_GPIO_ADP5588 is not set 1061 1051 1062 1052 # 1063 1053 # PCI GPIO expanders: ··· 1098 1080 # CONFIG_SENSORS_ADM1029 is not set 1099 1081 # CONFIG_SENSORS_ADM1031 is not set 1100 1082 # CONFIG_SENSORS_ADM9240 is not set 1083 + # CONFIG_SENSORS_ADT7411 is not set 1101 1084 # CONFIG_SENSORS_ADT7462 is not set 1102 1085 # CONFIG_SENSORS_ADT7470 is not set 1103 - # CONFIG_SENSORS_ADT7473 is not set 1104 1086 # CONFIG_SENSORS_ADT7475 is not set 1087 + # CONFIG_SENSORS_ASC7621 is not set 1105 1088 # CONFIG_SENSORS_ATXP1 is not set 1106 1089 # CONFIG_SENSORS_DS1621 is not set 1107 1090 # CONFIG_SENSORS_I5K_AMB is not set ··· 1142 1123 # CONFIG_SENSORS_SMSC47M192 is not set 1143 1124 # CONFIG_SENSORS_SMSC47B397 is not set 1144 1125 # CONFIG_SENSORS_ADS7828 is not set 1126 + # CONFIG_SENSORS_AMC6821 is not set 1145 1127 # CONFIG_SENSORS_THMC50 is not set 1146 1128 # CONFIG_SENSORS_TMP401 is not set 1147 1129 # CONFIG_SENSORS_TMP421 is not set ··· 1167 1147 # Watchdog Device Drivers 1168 1148 # 1169 1149 # CONFIG_SOFT_WATCHDOG is not set 1150 + # CONFIG_MAX63XX_WATCHDOG is not set 1170 1151 # CONFIG_ALIM7101_WDT is not set 1171 1152 # CONFIG_MPC5200_WDT is not set 1172 1153 # CONFIG_WATCHDOG_RTAS is not set ··· 1193 1172 # Multifunction device drivers 1194 1173 # 1195 1174 # CONFIG_MFD_CORE is not set 1175 + # CONFIG_MFD_88PM860X is not set 1196 1176 # CONFIG_MFD_SM501 is not set 1197 1177 # CONFIG_HTC_PASIC3 is not set 1178 + # CONFIG_HTC_I2CPLD is not set 1198 1179 # CONFIG_TPS65010 is not set 1199 1180 # CONFIG_TWL4030_CORE is not set 1200 1181 # CONFIG_MFD_TMIO is not set 1201 1182 # CONFIG_PMIC_DA903X is not set 1202 1183 # CONFIG_PMIC_ADP5520 is not set 1184 + # CONFIG_MFD_MAX8925 is not set 1203 1185 # CONFIG_MFD_WM8400 is not set 1204 1186 # CONFIG_MFD_WM831X is not set 1205 1187 # CONFIG_MFD_WM8350_I2C is not set 1188 + # CONFIG_MFD_WM8994 is not set 1206 1189 # CONFIG_MFD_PCF50633 is not set 1207 1190 # CONFIG_MFD_MC13783 is not set 1208 1191 # CONFIG_AB3100_CORE is not set 1209 1192 # CONFIG_EZX_PCAP is not set 1210 - # CONFIG_MFD_88PM8607 is not set 1211 1193 # CONFIG_AB4500_CORE is not set 1194 + # CONFIG_MFD_TIMBERDALE is not set 1195 + # CONFIG_LPC_SCH is not set 1212 1196 # CONFIG_REGULATOR is not set 1213 1197 # CONFIG_MEDIA_SUPPORT is not set 1214 1198 ··· 1222 1196 # 1223 1197 # CONFIG_AGP is not set 1224 1198 CONFIG_VGA_ARB=y 1199 + CONFIG_VGA_ARB_MAX_GPUS=16 1225 1200 CONFIG_DRM=y 1226 1201 # CONFIG_DRM_TDFX is not set 1227 1202 # CONFIG_DRM_R128 is not set ··· 1336 1309 # 1337 1310 # Special HID drivers 1338 1311 # 1312 + # CONFIG_HID_3M_PCT is not set 1339 1313 CONFIG_HID_A4TECH=y 1340 - # CONFIG_HID_APPLE is not set 1314 + CONFIG_HID_APPLE=y 1341 1315 CONFIG_HID_BELKIN=y 1342 1316 CONFIG_HID_CHERRY=y 1343 - # CONFIG_HID_CHICONY is not set 1317 + CONFIG_HID_CHICONY=y 1344 1318 CONFIG_HID_CYPRESS=y 1345 - # CONFIG_HID_DRAGONRISE is not set 1319 + CONFIG_HID_DRAGONRISE=y 1320 + # CONFIG_DRAGONRISE_FF is not set 1346 1321 CONFIG_HID_EZKEY=y 1347 - # CONFIG_HID_KYE is not set 1348 - # CONFIG_HID_GYRATION is not set 1349 - # CONFIG_HID_TWINHAN is not set 1350 - # CONFIG_HID_KENSINGTON is not set 1351 - # CONFIG_HID_LOGITECH is not set 1352 - # CONFIG_HID_MICROSOFT is not set 1353 - # CONFIG_HID_MONTEREY is not set 1322 + CONFIG_HID_KYE=y 1323 + CONFIG_HID_GYRATION=y 1324 + CONFIG_HID_TWINHAN=y 1325 + CONFIG_HID_KENSINGTON=y 1326 + CONFIG_HID_LOGITECH=y 1327 + # CONFIG_LOGITECH_FF is not set 1328 + # CONFIG_LOGIRUMBLEPAD2_FF is not set 1329 + # CONFIG_LOGIG940_FF is not set 1330 + CONFIG_HID_MICROSOFT=y 1331 + # CONFIG_HID_MOSART is not set 1332 + CONFIG_HID_MONTEREY=y 1354 1333 # CONFIG_HID_NTRIG is not set 1355 - # CONFIG_HID_PANTHERLORD is not set 1356 - # CONFIG_HID_PETALYNX is not set 1357 - # CONFIG_HID_SAMSUNG is not set 1358 - # CONFIG_HID_SONY is not set 1359 - # CONFIG_HID_SUNPLUS is not set 1360 - # CONFIG_HID_GREENASIA is not set 1361 - # CONFIG_HID_SMARTJOYPLUS is not set 1362 - # CONFIG_HID_TOPSEED is not set 1363 - # CONFIG_HID_THRUSTMASTER is not set 1364 - # CONFIG_HID_ZEROPLUS is not set 1334 + CONFIG_HID_ORTEK=y 1335 + CONFIG_HID_PANTHERLORD=y 1336 + # CONFIG_PANTHERLORD_FF is not set 1337 + CONFIG_HID_PETALYNX=y 1338 + # CONFIG_HID_QUANTA is not set 1339 + CONFIG_HID_SAMSUNG=y 1340 + CONFIG_HID_SONY=y 1341 + # CONFIG_HID_STANTUM is not set 1342 + CONFIG_HID_SUNPLUS=y 1343 + CONFIG_HID_GREENASIA=y 1344 + # CONFIG_GREENASIA_FF is not set 1345 + CONFIG_HID_SMARTJOYPLUS=y 1346 + # CONFIG_SMARTJOYPLUS_FF is not set 1347 + CONFIG_HID_TOPSEED=y 1348 + CONFIG_HID_THRUSTMASTER=y 1349 + # CONFIG_THRUSTMASTER_FF is not set 1350 + CONFIG_HID_ZEROPLUS=y 1351 + # CONFIG_ZEROPLUS_FF is not set 1365 1352 CONFIG_USB_SUPPORT=y 1366 1353 CONFIG_USB_ARCH_HAS_HCD=y 1367 1354 CONFIG_USB_ARCH_HAS_OHCI=y ··· 1390 1349 CONFIG_USB_DEVICEFS=y 1391 1350 # CONFIG_USB_DEVICE_CLASS is not set 1392 1351 # CONFIG_USB_DYNAMIC_MINORS is not set 1393 - # CONFIG_USB_SUSPEND is not set 1394 1352 # CONFIG_USB_OTG is not set 1395 - # CONFIG_USB_OTG_WHITELIST is not set 1396 - # CONFIG_USB_OTG_BLACKLIST_HUB is not set 1397 1353 CONFIG_USB_MON=y 1398 1354 # CONFIG_USB_WUSB is not set 1399 1355 # CONFIG_USB_WUSB_CBAF is not set ··· 1471 1433 # CONFIG_USB_RIO500 is not set 1472 1434 # CONFIG_USB_LEGOTOWER is not set 1473 1435 # CONFIG_USB_LCD is not set 1474 - # CONFIG_USB_BERRY_CHARGE is not set 1475 1436 # CONFIG_USB_LED is not set 1476 1437 # CONFIG_USB_CYPRESS_CY7C63 is not set 1477 1438 # CONFIG_USB_CYTHERM is not set ··· 1482 1445 # CONFIG_USB_IOWARRIOR is not set 1483 1446 # CONFIG_USB_TEST is not set 1484 1447 # CONFIG_USB_ISIGHTFW is not set 1485 - # CONFIG_USB_VST is not set 1486 1448 # CONFIG_USB_GADGET is not set 1487 1449 1488 1450 # ··· 1672 1636 CONFIG_UBIFS_FS_LZO=y 1673 1637 CONFIG_UBIFS_FS_ZLIB=y 1674 1638 # CONFIG_UBIFS_FS_DEBUG is not set 1639 + # CONFIG_LOGFS is not set 1675 1640 CONFIG_CRAMFS=y 1676 1641 # CONFIG_SQUASHFS is not set 1677 1642 # CONFIG_VXFS_FS is not set ··· 1767 1730 CONFIG_ZLIB_INFLATE=y 1768 1731 CONFIG_ZLIB_DEFLATE=y 1769 1732 CONFIG_LZO_COMPRESS=m 1770 - CONFIG_LZO_DECOMPRESS=m 1733 + CONFIG_LZO_DECOMPRESS=y 1771 1734 CONFIG_DECOMPRESS_GZIP=y 1735 + CONFIG_DECOMPRESS_BZIP2=y 1736 + CONFIG_DECOMPRESS_LZMA=y 1737 + CONFIG_DECOMPRESS_LZO=y 1772 1738 CONFIG_HAS_IOMEM=y 1773 1739 CONFIG_HAS_IOPORT=y 1774 1740 CONFIG_HAS_DMA=y ··· 1816 1776 # CONFIG_DEBUG_SPINLOCK_SLEEP is not set 1817 1777 # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set 1818 1778 # CONFIG_DEBUG_KOBJECT is not set 1819 - # CONFIG_DEBUG_BUGVERBOSE is not set 1779 + CONFIG_DEBUG_BUGVERBOSE=y 1820 1780 CONFIG_DEBUG_INFO=y 1821 1781 # CONFIG_DEBUG_VM is not set 1822 1782 # CONFIG_DEBUG_WRITECOUNT is not set 1823 - # CONFIG_DEBUG_MEMORY_INIT is not set 1783 + CONFIG_DEBUG_MEMORY_INIT=y 1824 1784 # CONFIG_DEBUG_LIST is not set 1825 1785 # CONFIG_DEBUG_SG is not set 1826 1786 # CONFIG_DEBUG_NOTIFIERS is not set
+5 -1
arch/powerpc/platforms/52xx/mpc52xx_gpt.c
··· 711 711 return 0; 712 712 } 713 713 714 - #define mpc52xx_gpt_wdt_setup(x, y) (0) 714 + static inline int mpc52xx_gpt_wdt_setup(struct mpc52xx_gpt_priv *gpt, 715 + const u32 *period) 716 + { 717 + return 0; 718 + } 715 719 716 720 #endif /* CONFIG_MPC5200_WDT */ 717 721
+5 -5
drivers/serial/uartlite.c
··· 19 19 #include <linux/interrupt.h> 20 20 #include <linux/init.h> 21 21 #include <asm/io.h> 22 - #if defined(CONFIG_OF) 22 + #if defined(CONFIG_OF) && (defined(CONFIG_PPC32) || defined(CONFIG_MICROBLAZE)) 23 23 #include <linux/of.h> 24 24 #include <linux/of_device.h> 25 25 #include <linux/of_platform.h> ··· 581 581 /* --------------------------------------------------------------------- 582 582 * OF bus bindings 583 583 */ 584 - #if defined(CONFIG_OF) 584 + #if defined(CONFIG_OF) && (defined(CONFIG_PPC32) || defined(CONFIG_MICROBLAZE)) 585 585 static int __devinit 586 586 ulite_of_probe(struct of_device *op, const struct of_device_id *match) 587 587 { ··· 631 631 { 632 632 of_unregister_platform_driver(&ulite_of_driver); 633 633 } 634 - #else /* CONFIG_OF */ 635 - /* CONFIG_OF not enabled; do nothing helpers */ 634 + #else /* CONFIG_OF && (CONFIG_PPC32 || CONFIG_MICROBLAZE) */ 635 + /* Appropriate config not enabled; do nothing helpers */ 636 636 static inline int __init ulite_of_register(void) { return 0; } 637 637 static inline void __exit ulite_of_unregister(void) { } 638 - #endif /* CONFIG_OF */ 638 + #endif /* CONFIG_OF && (CONFIG_PPC32 || CONFIG_MICROBLAZE) */ 639 639 640 640 /* --------------------------------------------------------------------- 641 641 * Module setup/teardown
+12 -6
drivers/spi/omap2_mcspi.c
··· 578 578 struct spi_master *spi_cntrl; 579 579 u32 l = 0, div = 0; 580 580 u8 word_len = spi->bits_per_word; 581 + u32 speed_hz = spi->max_speed_hz; 581 582 582 583 mcspi = spi_master_get_devdata(spi->master); 583 584 spi_cntrl = mcspi->master; ··· 588 587 589 588 cs->word_len = word_len; 590 589 591 - if (spi->max_speed_hz) { 590 + if (t && t->speed_hz) 591 + speed_hz = t->speed_hz; 592 + 593 + if (speed_hz) { 592 594 while (div <= 15 && (OMAP2_MCSPI_MAX_FREQ / (1 << div)) 593 - > spi->max_speed_hz) 595 + > speed_hz) 594 596 div++; 595 597 } else 596 598 div = 15; ··· 755 751 mcspi = spi_master_get_devdata(spi->master); 756 752 mcspi_dma = &mcspi->dma_channels[spi->chip_select]; 757 753 758 - /* Unlink controller state from context save list */ 759 - cs = spi->controller_state; 760 - list_del(&cs->node); 754 + if (spi->controller_state) { 755 + /* Unlink controller state from context save list */ 756 + cs = spi->controller_state; 757 + list_del(&cs->node); 761 758 762 - kfree(spi->controller_state); 759 + kfree(spi->controller_state); 760 + } 763 761 764 762 if (mcspi_dma->dma_rx_channel != -1) { 765 763 omap_free_dma(mcspi_dma->dma_rx_channel);
+1 -1
include/linux/of.h
··· 127 127 128 128 /* Default string compare functions, Allow arch asm/prom.h to override */ 129 129 #if !defined(of_compat_cmp) 130 - #define of_compat_cmp(s1, s2, l) strncasecmp((s1), (s2), (l)) 130 + #define of_compat_cmp(s1, s2, l) strcasecmp((s1), (s2)) 131 131 #define of_prop_cmp(s1, s2) strcmp((s1), (s2)) 132 132 #define of_node_cmp(s1, s2) strcasecmp((s1), (s2)) 133 133 #endif