aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--MAINTAINERS8
-rw-r--r--arch/blackfin/Kconfig6
-rw-r--r--arch/blackfin/Makefile21
-rw-r--r--arch/blackfin/configs/BF533-EZKIT_defconfig12
-rw-r--r--arch/blackfin/configs/BF533-STAMP_defconfig26
-rw-r--r--arch/blackfin/configs/BF537-STAMP_defconfig26
-rw-r--r--arch/blackfin/configs/BF561-EZKIT_defconfig12
-rw-r--r--arch/blackfin/configs/PNAV-10_defconfig13
-rw-r--r--arch/blackfin/kernel/setup.c18
-rw-r--r--arch/blackfin/kernel/traps.c3
-rw-r--r--arch/i386/kernel/acpi/boot.c21
-rw-r--r--arch/i386/kernel/cpu/perfctr-watchdog.c35
-rw-r--r--arch/mips/kernel/smp-mt.c4
-rw-r--r--arch/powerpc/configs/mpc7448_hpc2_defconfig212
-rw-r--r--arch/powerpc/configs/mpc8272_ads_defconfig293
-rw-r--r--arch/powerpc/configs/mpc8313_rdb_defconfig310
-rw-r--r--arch/powerpc/configs/mpc832x_mds_defconfig176
-rw-r--r--arch/powerpc/configs/mpc832x_rdb_defconfig229
-rw-r--r--arch/powerpc/configs/mpc834x_itx_defconfig265
-rw-r--r--arch/powerpc/configs/mpc834x_itxgp_defconfig232
-rw-r--r--arch/powerpc/configs/mpc834x_mds_defconfig195
-rw-r--r--arch/powerpc/configs/mpc836x_mds_defconfig176
-rw-r--r--arch/powerpc/configs/mpc8540_ads_defconfig201
-rw-r--r--arch/powerpc/configs/mpc8544_ds_defconfig193
-rw-r--r--arch/powerpc/configs/mpc8560_ads_defconfig201
-rw-r--r--arch/powerpc/configs/mpc8568mds_defconfig191
-rw-r--r--arch/powerpc/configs/mpc85xx_cds_defconfig206
-rw-r--r--arch/powerpc/configs/mpc8641_hpcn_defconfig200
-rw-r--r--arch/powerpc/configs/mpc866_ads_defconfig213
-rw-r--r--arch/powerpc/configs/mpc885_ads_defconfig222
-rw-r--r--arch/powerpc/kernel/irq.c6
-rw-r--r--arch/powerpc/platforms/cell/cbe_cpufreq.c15
-rw-r--r--drivers/acpi/osl.c4
-rw-r--r--drivers/ata/Kconfig5
-rw-r--r--drivers/ata/ata_generic.c2
-rw-r--r--drivers/ata/libata-core.c9
-rw-r--r--drivers/ata/libata-sff.c5
-rw-r--r--drivers/ata/pata_ali.c8
-rw-r--r--drivers/ata/pata_cs5520.c5
-rw-r--r--drivers/ata/pata_pcmcia.c2
-rw-r--r--drivers/ata/pata_pdc2027x.c11
-rw-r--r--drivers/ata/pata_pdc202xx_old.c4
-rw-r--r--drivers/ata/pata_sis.c46
-rw-r--r--drivers/ata/sata_inic162x.c7
-rw-r--r--drivers/ata/sata_mv.c3
-rw-r--r--drivers/ata/sata_nv.c1
-rw-r--r--drivers/ata/sata_sis.c39
-rw-r--r--drivers/ata/sis.h2
-rw-r--r--drivers/firewire/Kconfig65
-rw-r--r--drivers/firewire/fw-ohci.c6
-rw-r--r--drivers/ide/ide-probe.c4
-rw-r--r--drivers/ide/ide-taskfile.c12
-rw-r--r--drivers/ide/pci/amd74xx.c8
-rw-r--r--drivers/ide/pci/hpt366.c21
-rw-r--r--drivers/ide/pci/it821x.c3
-rw-r--r--drivers/ide/pci/pdc202xx_new.c10
-rw-r--r--drivers/ide/setup-pci.c10
-rw-r--r--drivers/infiniband/ulp/ipoib/ipoib_cm.c4
-rw-r--r--drivers/input/keyboard/atkbd.c47
-rw-r--r--drivers/input/serio/i8042-x86ia64io.h11
-rw-r--r--drivers/input/serio/serio.c2
-rw-r--r--drivers/media/dvb/cinergyT2/cinergyT2.c66
-rw-r--r--drivers/media/dvb/ttpci/budget-core.c2
-rw-r--r--drivers/media/video/bt8xx/bttv-driver.c13
-rw-r--r--drivers/media/video/cx88/cx88-blackbird.c2
-rw-r--r--drivers/misc/Kconfig8
-rw-r--r--drivers/misc/Makefile1
-rw-r--r--drivers/misc/blink.c45
-rw-r--r--drivers/net/Kconfig2
-rw-r--r--drivers/net/gianfar.c2
-rw-r--r--drivers/net/mlx4/main.c2
-rw-r--r--drivers/net/myri10ge/myri10ge.c2
-rw-r--r--drivers/net/netxen/netxen_nic.h180
-rw-r--r--drivers/net/netxen/netxen_nic_hdr.h2
-rw-r--r--drivers/net/netxen/netxen_nic_hw.c33
-rw-r--r--drivers/net/netxen/netxen_nic_init.c51
-rw-r--r--drivers/net/netxen/netxen_nic_main.c177
-rw-r--r--drivers/net/netxen/netxen_nic_phan_reg.h14
-rw-r--r--drivers/net/ns83820.c4
-rw-r--r--drivers/net/pcmcia/3c589_cs.c2
-rw-r--r--drivers/net/starfire.c2
-rw-r--r--drivers/net/usb/cdc_ether.c8
-rw-r--r--drivers/net/usb/dm9601.c11
-rw-r--r--drivers/net/usb/usbnet.c9
-rw-r--r--drivers/net/wireless/libertas/Makefile2
-rw-r--r--drivers/net/wireless/libertas/README275
-rw-r--r--drivers/net/wireless/libertas/assoc.c28
-rw-r--r--drivers/net/wireless/libertas/cmd.c12
-rw-r--r--drivers/net/wireless/libertas/cmdresp.c21
-rw-r--r--drivers/net/wireless/libertas/hostcmd.h2
-rw-r--r--drivers/net/wireless/libertas/ioctl.c1081
-rw-r--r--drivers/net/wireless/libertas/main.c8
-rw-r--r--drivers/net/wireless/libertas/scan.c51
-rw-r--r--drivers/net/wireless/libertas/wext.c152
-rw-r--r--drivers/net/wireless/libertas/wext.h45
-rw-r--r--drivers/scsi/Kconfig1
-rw-r--r--fs/direct-io.c2
-rw-r--r--fs/jffs2/readinode.c23
-rw-r--r--include/asm-blackfin/macros.h0
-rw-r--r--include/asm-blackfin/processor.h4
-rw-r--r--include/asm-mips/mach-ip32/dma-coherence.h6
-rw-r--r--include/asm-mips/ptrace.h2
-rw-r--r--include/asm-mips/unistd.h16
-rw-r--r--include/asm-powerpc/irq.h5
-rw-r--r--include/linux/input.h143
-rw-r--r--kernel/time/ntp.c2
-rw-r--r--mm/slab.c32
-rw-r--r--mm/slub.c8
108 files changed, 2820 insertions, 4036 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 4ce895a4b5ba..23a04f431283 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -3618,7 +3618,7 @@ W: http://www.kroah.com/linux-usb/
3618USB DAVICOM DM9601 DRIVER 3618USB DAVICOM DM9601 DRIVER
3619P: Peter Korsgaard 3619P: Peter Korsgaard
3620M: jacmet@sunsite.dk 3620M: jacmet@sunsite.dk
3621L: linux-usb-devel@lists.sourceforge.net 3621L: netdev@vger.kernel.org
3622W: http://www.linux-usb.org/usbnet 3622W: http://www.linux-usb.org/usbnet
3623S: Maintained 3623S: Maintained
3624 3624
@@ -3702,8 +3702,8 @@ S: Maintained
3702USB PEGASUS DRIVER 3702USB PEGASUS DRIVER
3703P: Petko Manolov 3703P: Petko Manolov
3704M: petkan@users.sourceforge.net 3704M: petkan@users.sourceforge.net
3705L: linux-usb-users@lists.sourceforge.net
3706L: linux-usb-devel@lists.sourceforge.net 3705L: linux-usb-devel@lists.sourceforge.net
3706L: netdev@vger.kernel.org
3707W: http://pegasus2.sourceforge.net/ 3707W: http://pegasus2.sourceforge.net/
3708S: Maintained 3708S: Maintained
3709 3709
@@ -3717,8 +3717,8 @@ S: Maintained
3717USB RTL8150 DRIVER 3717USB RTL8150 DRIVER
3718P: Petko Manolov 3718P: Petko Manolov
3719M: petkan@users.sourceforge.net 3719M: petkan@users.sourceforge.net
3720L: linux-usb-users@lists.sourceforge.net
3721L: linux-usb-devel@lists.sourceforge.net 3720L: linux-usb-devel@lists.sourceforge.net
3721L: netdev@vger.kernel.org
3722W: http://pegasus2.sourceforge.net/ 3722W: http://pegasus2.sourceforge.net/
3723S: Maintained 3723S: Maintained
3724 3724
@@ -3829,7 +3829,7 @@ S: Maintained
3829USB "USBNET" DRIVER FRAMEWORK 3829USB "USBNET" DRIVER FRAMEWORK
3830P: David Brownell 3830P: David Brownell
3831M: dbrownell@users.sourceforge.net 3831M: dbrownell@users.sourceforge.net
3832L: linux-usb-devel@lists.sourceforge.net 3832L: netdev@vger.kernel.org
3833W: http://www.linux-usb.org/usbnet 3833W: http://www.linux-usb.org/usbnet
3834S: Maintained 3834S: Maintained
3835 3835
diff --git a/arch/blackfin/Kconfig b/arch/blackfin/Kconfig
index 1fad8560c7af..d98bafcaca59 100644
--- a/arch/blackfin/Kconfig
+++ b/arch/blackfin/Kconfig
@@ -142,6 +142,12 @@ config BF_REV_0_5
142 bool "0.5" 142 bool "0.5"
143 depends on (BF561 || BF533 || BF532 || BF531) 143 depends on (BF561 || BF533 || BF532 || BF531)
144 144
145config BF_REV_ANY
146 bool "any"
147
148config BF_REV_NONE
149 bool "none"
150
145endchoice 151endchoice
146 152
147config BFIN_DUAL_CORE 153config BFIN_DUAL_CORE
diff --git a/arch/blackfin/Makefile b/arch/blackfin/Makefile
index 75e89c324756..6971a4418dfe 100644
--- a/arch/blackfin/Makefile
+++ b/arch/blackfin/Makefile
@@ -28,6 +28,27 @@ machine-$(CONFIG_BF561) := bf561
28MACHINE := $(machine-y) 28MACHINE := $(machine-y)
29export MACHINE 29export MACHINE
30 30
31cpu-$(CONFIG_BF531) := bf531
32cpu-$(CONFIG_BF532) := bf532
33cpu-$(CONFIG_BF533) := bf533
34cpu-$(CONFIG_BF534) := bf534
35cpu-$(CONFIG_BF536) := bf536
36cpu-$(CONFIG_BF537) := bf537
37cpu-$(CONFIG_BF548) := bf548
38cpu-$(CONFIG_BF549) := bf549
39cpu-$(CONFIG_BF561) := bf561
40
41rev-$(CONFIG_BF_REV_0_0) := 0.0
42rev-$(CONFIG_BF_REV_0_1) := 0.1
43rev-$(CONFIG_BF_REV_0_2) := 0.2
44rev-$(CONFIG_BF_REV_0_3) := 0.3
45rev-$(CONFIG_BF_REV_0_4) := 0.4
46rev-$(CONFIG_BF_REV_0_5) := 0.5
47rev-$(CONFIG_BF_REV_NONE) := none
48rev-$(CONFIG_BF_REV_ANY) := any
49
50CFLAGS += -mcpu=$(cpu-y)-$(rev-y)
51AFLAGS += -mcpu=$(cpu-y)-$(rev-y)
31 52
32head-y := arch/$(ARCH)/mach-$(MACHINE)/head.o arch/$(ARCH)/kernel/init_task.o 53head-y := arch/$(ARCH)/mach-$(MACHINE)/head.o arch/$(ARCH)/kernel/init_task.o
33 54
diff --git a/arch/blackfin/configs/BF533-EZKIT_defconfig b/arch/blackfin/configs/BF533-EZKIT_defconfig
index 90d58aabe693..1cf1ab28dc66 100644
--- a/arch/blackfin/configs/BF533-EZKIT_defconfig
+++ b/arch/blackfin/configs/BF533-EZKIT_defconfig
@@ -1,6 +1,6 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.21.3 3# Linux kernel version: 2.6.21.5
4# 4#
5# CONFIG_MMU is not set 5# CONFIG_MMU is not set
6# CONFIG_FPU is not set 6# CONFIG_FPU is not set
@@ -115,17 +115,26 @@ CONFIG_BF533=y
115# CONFIG_BF534 is not set 115# CONFIG_BF534 is not set
116# CONFIG_BF536 is not set 116# CONFIG_BF536 is not set
117# CONFIG_BF537 is not set 117# CONFIG_BF537 is not set
118# CONFIG_BF542 is not set
119# CONFIG_BF544 is not set
120# CONFIG_BF548 is not set
121# CONFIG_BF549 is not set
118# CONFIG_BF561 is not set 122# CONFIG_BF561 is not set
123# CONFIG_BF_REV_0_0 is not set
119# CONFIG_BF_REV_0_2 is not set 124# CONFIG_BF_REV_0_2 is not set
120CONFIG_BF_REV_0_3=y 125CONFIG_BF_REV_0_3=y
121# CONFIG_BF_REV_0_4 is not set 126# CONFIG_BF_REV_0_4 is not set
122# CONFIG_BF_REV_0_5 is not set 127# CONFIG_BF_REV_0_5 is not set
128# CONFIG_BF_REV_ANY is not set
129# CONFIG_BF_REV_NONE is not set
130CONFIG_BF53x=y
123CONFIG_BFIN_SINGLE_CORE=y 131CONFIG_BFIN_SINGLE_CORE=y
124CONFIG_BFIN533_EZKIT=y 132CONFIG_BFIN533_EZKIT=y
125# CONFIG_BFIN533_STAMP is not set 133# CONFIG_BFIN533_STAMP is not set
126# CONFIG_BFIN537_STAMP is not set 134# CONFIG_BFIN537_STAMP is not set
127# CONFIG_BFIN533_BLUETECHNIX_CM is not set 135# CONFIG_BFIN533_BLUETECHNIX_CM is not set
128# CONFIG_BFIN537_BLUETECHNIX_CM is not set 136# CONFIG_BFIN537_BLUETECHNIX_CM is not set
137# CONFIG_BFIN548_EZKIT is not set
129# CONFIG_BFIN561_BLUETECHNIX_CM is not set 138# CONFIG_BFIN561_BLUETECHNIX_CM is not set
130# CONFIG_BFIN561_EZKIT is not set 139# CONFIG_BFIN561_EZKIT is not set
131# CONFIG_BFIN561_TEPLA is not set 140# CONFIG_BFIN561_TEPLA is not set
@@ -634,6 +643,7 @@ CONFIG_NETDEVICES=y
634CONFIG_NET_ETHERNET=y 643CONFIG_NET_ETHERNET=y
635CONFIG_MII=y 644CONFIG_MII=y
636CONFIG_SMC91X=y 645CONFIG_SMC91X=y
646# CONFIG_SMSC911X is not set
637 647
638# 648#
639# Ethernet (1000 Mbit) 649# Ethernet (1000 Mbit)
diff --git a/arch/blackfin/configs/BF533-STAMP_defconfig b/arch/blackfin/configs/BF533-STAMP_defconfig
index fee918957392..64b7f1b3b2af 100644
--- a/arch/blackfin/configs/BF533-STAMP_defconfig
+++ b/arch/blackfin/configs/BF533-STAMP_defconfig
@@ -1,6 +1,6 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.21.3 3# Linux kernel version: 2.6.21.5
4# 4#
5# CONFIG_MMU is not set 5# CONFIG_MMU is not set
6# CONFIG_FPU is not set 6# CONFIG_FPU is not set
@@ -115,17 +115,26 @@ CONFIG_BF533=y
115# CONFIG_BF534 is not set 115# CONFIG_BF534 is not set
116# CONFIG_BF536 is not set 116# CONFIG_BF536 is not set
117# CONFIG_BF537 is not set 117# CONFIG_BF537 is not set
118# CONFIG_BF542 is not set
119# CONFIG_BF544 is not set
120# CONFIG_BF548 is not set
121# CONFIG_BF549 is not set
118# CONFIG_BF561 is not set 122# CONFIG_BF561 is not set
123# CONFIG_BF_REV_0_0 is not set
119# CONFIG_BF_REV_0_2 is not set 124# CONFIG_BF_REV_0_2 is not set
120CONFIG_BF_REV_0_3=y 125CONFIG_BF_REV_0_3=y
121# CONFIG_BF_REV_0_4 is not set 126# CONFIG_BF_REV_0_4 is not set
122# CONFIG_BF_REV_0_5 is not set 127# CONFIG_BF_REV_0_5 is not set
128# CONFIG_BF_REV_ANY is not set
129# CONFIG_BF_REV_NONE is not set
130CONFIG_BF53x=y
123CONFIG_BFIN_SINGLE_CORE=y 131CONFIG_BFIN_SINGLE_CORE=y
124# CONFIG_BFIN533_EZKIT is not set 132# CONFIG_BFIN533_EZKIT is not set
125CONFIG_BFIN533_STAMP=y 133CONFIG_BFIN533_STAMP=y
126# CONFIG_BFIN537_STAMP is not set 134# CONFIG_BFIN537_STAMP is not set
127# CONFIG_BFIN533_BLUETECHNIX_CM is not set 135# CONFIG_BFIN533_BLUETECHNIX_CM is not set
128# CONFIG_BFIN537_BLUETECHNIX_CM is not set 136# CONFIG_BFIN537_BLUETECHNIX_CM is not set
137# CONFIG_BFIN548_EZKIT is not set
129# CONFIG_BFIN561_BLUETECHNIX_CM is not set 138# CONFIG_BFIN561_BLUETECHNIX_CM is not set
130# CONFIG_BFIN561_EZKIT is not set 139# CONFIG_BFIN561_EZKIT is not set
131# CONFIG_BFIN561_TEPLA is not set 140# CONFIG_BFIN561_TEPLA is not set
@@ -646,6 +655,7 @@ CONFIG_NETDEVICES=y
646CONFIG_NET_ETHERNET=y 655CONFIG_NET_ETHERNET=y
647CONFIG_MII=y 656CONFIG_MII=y
648CONFIG_SMC91X=y 657CONFIG_SMC91X=y
658# CONFIG_SMSC911X is not set
649 659
650# 660#
651# Ethernet (1000 Mbit) 661# Ethernet (1000 Mbit)
@@ -986,9 +996,17 @@ CONFIG_SND_VERBOSE_PROCFS=y
986# 996#
987# ALSA Blackfin devices 997# ALSA Blackfin devices
988# 998#
989# CONFIG_SND_BLACKFIN_AD1836 is not set 999CONFIG_SND_BLACKFIN_AD1836=m
990# CONFIG_SND_BLACKFIN_AD1981B is not set 1000CONFIG_SND_BLACKFIN_AD1836_TDM=y
991# CONFIG_SND_BFIN_AD73311 is not set 1001# CONFIG_SND_BLACKFIN_AD1836_I2S is not set
1002CONFIG_SND_BLACKFIN_AD1836_MULSUB=y
1003# CONFIG_SND_BLACKFIN_AD1836_5P1 is not set
1004CONFIG_SND_BLACKFIN_AD1981B=m
1005CONFIG_SND_BLACKFIN_SPORT=0
1006CONFIG_SND_BLACKFIN_SPI_PFBIT=4
1007CONFIG_SND_BFIN_AD73311=m
1008CONFIG_SND_BFIN_SPORT=0
1009CONFIG_SND_BFIN_AD73311_SE=4
992 1010
993# 1011#
994# SoC audio support 1012# SoC audio support
diff --git a/arch/blackfin/configs/BF537-STAMP_defconfig b/arch/blackfin/configs/BF537-STAMP_defconfig
index 37688bb55b9a..ccf09dc09a18 100644
--- a/arch/blackfin/configs/BF537-STAMP_defconfig
+++ b/arch/blackfin/configs/BF537-STAMP_defconfig
@@ -1,6 +1,6 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.21.3 3# Linux kernel version: 2.6.21.5
4# 4#
5# CONFIG_MMU is not set 5# CONFIG_MMU is not set
6# CONFIG_FPU is not set 6# CONFIG_FPU is not set
@@ -115,17 +115,26 @@ CONFIG_PREEMPT_VOLUNTARY=y
115# CONFIG_BF534 is not set 115# CONFIG_BF534 is not set
116# CONFIG_BF536 is not set 116# CONFIG_BF536 is not set
117CONFIG_BF537=y 117CONFIG_BF537=y
118# CONFIG_BF542 is not set
119# CONFIG_BF544 is not set
120# CONFIG_BF548 is not set
121# CONFIG_BF549 is not set
118# CONFIG_BF561 is not set 122# CONFIG_BF561 is not set
123# CONFIG_BF_REV_0_0 is not set
119CONFIG_BF_REV_0_2=y 124CONFIG_BF_REV_0_2=y
120# CONFIG_BF_REV_0_3 is not set 125# CONFIG_BF_REV_0_3 is not set
121# CONFIG_BF_REV_0_4 is not set 126# CONFIG_BF_REV_0_4 is not set
122# CONFIG_BF_REV_0_5 is not set 127# CONFIG_BF_REV_0_5 is not set
128# CONFIG_BF_REV_ANY is not set
129# CONFIG_BF_REV_NONE is not set
130CONFIG_BF53x=y
123CONFIG_BFIN_SINGLE_CORE=y 131CONFIG_BFIN_SINGLE_CORE=y
124# CONFIG_BFIN533_EZKIT is not set 132# CONFIG_BFIN533_EZKIT is not set
125# CONFIG_BFIN533_STAMP is not set 133# CONFIG_BFIN533_STAMP is not set
126CONFIG_BFIN537_STAMP=y 134CONFIG_BFIN537_STAMP=y
127# CONFIG_BFIN533_BLUETECHNIX_CM is not set 135# CONFIG_BFIN533_BLUETECHNIX_CM is not set
128# CONFIG_BFIN537_BLUETECHNIX_CM is not set 136# CONFIG_BFIN537_BLUETECHNIX_CM is not set
137# CONFIG_BFIN548_EZKIT is not set
129# CONFIG_BFIN561_BLUETECHNIX_CM is not set 138# CONFIG_BFIN561_BLUETECHNIX_CM is not set
130# CONFIG_BFIN561_EZKIT is not set 139# CONFIG_BFIN561_EZKIT is not set
131# CONFIG_BFIN561_TEPLA is not set 140# CONFIG_BFIN561_TEPLA is not set
@@ -664,6 +673,7 @@ CONFIG_BFIN_MAC_USE_L1=y
664CONFIG_BFIN_TX_DESC_NUM=10 673CONFIG_BFIN_TX_DESC_NUM=10
665CONFIG_BFIN_RX_DESC_NUM=20 674CONFIG_BFIN_RX_DESC_NUM=20
666# CONFIG_BFIN_MAC_RMII is not set 675# CONFIG_BFIN_MAC_RMII is not set
676# CONFIG_SMSC911X is not set
667 677
668# 678#
669# Ethernet (1000 Mbit) 679# Ethernet (1000 Mbit)
@@ -1020,9 +1030,17 @@ CONFIG_SND_VERBOSE_PROCFS=y
1020# 1030#
1021# ALSA Blackfin devices 1031# ALSA Blackfin devices
1022# 1032#
1023# CONFIG_SND_BLACKFIN_AD1836 is not set 1033CONFIG_SND_BLACKFIN_AD1836=m
1024# CONFIG_SND_BLACKFIN_AD1981B is not set 1034CONFIG_SND_BLACKFIN_AD1836_TDM=y
1025# CONFIG_SND_BFIN_AD73311 is not set 1035# CONFIG_SND_BLACKFIN_AD1836_I2S is not set
1036CONFIG_SND_BLACKFIN_AD1836_MULSUB=y
1037# CONFIG_SND_BLACKFIN_AD1836_5P1 is not set
1038CONFIG_SND_BLACKFIN_AD1981B=m
1039CONFIG_SND_BLACKFIN_SPORT=0
1040CONFIG_SND_BLACKFIN_SPI_PFBIT=4
1041CONFIG_SND_BFIN_AD73311=m
1042CONFIG_SND_BFIN_SPORT=0
1043CONFIG_SND_BFIN_AD73311_SE=4
1026 1044
1027# 1045#
1028# SoC audio support 1046# SoC audio support
diff --git a/arch/blackfin/configs/BF561-EZKIT_defconfig b/arch/blackfin/configs/BF561-EZKIT_defconfig
index fe4e67debaca..51c0b6f97798 100644
--- a/arch/blackfin/configs/BF561-EZKIT_defconfig
+++ b/arch/blackfin/configs/BF561-EZKIT_defconfig
@@ -1,6 +1,6 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.21.3 3# Linux kernel version: 2.6.21.5
4# 4#
5# CONFIG_MMU is not set 5# CONFIG_MMU is not set
6# CONFIG_FPU is not set 6# CONFIG_FPU is not set
@@ -115,17 +115,25 @@ CONFIG_PREEMPT_VOLUNTARY=y
115# CONFIG_BF534 is not set 115# CONFIG_BF534 is not set
116# CONFIG_BF536 is not set 116# CONFIG_BF536 is not set
117# CONFIG_BF537 is not set 117# CONFIG_BF537 is not set
118# CONFIG_BF542 is not set
119# CONFIG_BF544 is not set
120# CONFIG_BF548 is not set
121# CONFIG_BF549 is not set
118CONFIG_BF561=y 122CONFIG_BF561=y
123# CONFIG_BF_REV_0_0 is not set
119# CONFIG_BF_REV_0_2 is not set 124# CONFIG_BF_REV_0_2 is not set
120CONFIG_BF_REV_0_3=y 125CONFIG_BF_REV_0_3=y
121# CONFIG_BF_REV_0_4 is not set 126# CONFIG_BF_REV_0_4 is not set
122# CONFIG_BF_REV_0_5 is not set 127# CONFIG_BF_REV_0_5 is not set
128# CONFIG_BF_REV_ANY is not set
129# CONFIG_BF_REV_NONE is not set
123CONFIG_BFIN_DUAL_CORE=y 130CONFIG_BFIN_DUAL_CORE=y
124# CONFIG_BFIN533_EZKIT is not set 131# CONFIG_BFIN533_EZKIT is not set
125# CONFIG_BFIN533_STAMP is not set 132# CONFIG_BFIN533_STAMP is not set
126# CONFIG_BFIN537_STAMP is not set 133# CONFIG_BFIN537_STAMP is not set
127# CONFIG_BFIN533_BLUETECHNIX_CM is not set 134# CONFIG_BFIN533_BLUETECHNIX_CM is not set
128# CONFIG_BFIN537_BLUETECHNIX_CM is not set 135# CONFIG_BFIN537_BLUETECHNIX_CM is not set
136# CONFIG_BFIN548_EZKIT is not set
129# CONFIG_BFIN561_BLUETECHNIX_CM is not set 137# CONFIG_BFIN561_BLUETECHNIX_CM is not set
130CONFIG_BFIN561_EZKIT=y 138CONFIG_BFIN561_EZKIT=y
131# CONFIG_BFIN561_TEPLA is not set 139# CONFIG_BFIN561_TEPLA is not set
@@ -673,6 +681,7 @@ CONFIG_NETDEVICES=y
673CONFIG_NET_ETHERNET=y 681CONFIG_NET_ETHERNET=y
674CONFIG_MII=y 682CONFIG_MII=y
675CONFIG_SMC91X=y 683CONFIG_SMC91X=y
684# CONFIG_SMSC911X is not set
676 685
677# 686#
678# Ethernet (1000 Mbit) 687# Ethernet (1000 Mbit)
@@ -801,7 +810,6 @@ CONFIG_WATCHDOG=y
801CONFIG_BFIN_WDT=y 810CONFIG_BFIN_WDT=y
802CONFIG_HW_RANDOM=y 811CONFIG_HW_RANDOM=y
803# CONFIG_GEN_RTC is not set 812# CONFIG_GEN_RTC is not set
804# CONFIG_BLACKFIN_DPMC is not set
805# CONFIG_DTLK is not set 813# CONFIG_DTLK is not set
806# CONFIG_R3964 is not set 814# CONFIG_R3964 is not set
807# CONFIG_RAW_DRIVER is not set 815# CONFIG_RAW_DRIVER is not set
diff --git a/arch/blackfin/configs/PNAV-10_defconfig b/arch/blackfin/configs/PNAV-10_defconfig
index a783ff69ace1..983ed181c896 100644
--- a/arch/blackfin/configs/PNAV-10_defconfig
+++ b/arch/blackfin/configs/PNAV-10_defconfig
@@ -1,6 +1,6 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.21.3 3# Linux kernel version: 2.6.21.5
4# 4#
5# CONFIG_MMU is not set 5# CONFIG_MMU is not set
6# CONFIG_FPU is not set 6# CONFIG_FPU is not set
@@ -114,17 +114,26 @@ CONFIG_PREEMPT_VOLUNTARY=y
114# CONFIG_BF534 is not set 114# CONFIG_BF534 is not set
115# CONFIG_BF536 is not set 115# CONFIG_BF536 is not set
116CONFIG_BF537=y 116CONFIG_BF537=y
117# CONFIG_BF542 is not set
118# CONFIG_BF544 is not set
119# CONFIG_BF548 is not set
120# CONFIG_BF549 is not set
117# CONFIG_BF561 is not set 121# CONFIG_BF561 is not set
122# CONFIG_BF_REV_0_0 is not set
118CONFIG_BF_REV_0_2=y 123CONFIG_BF_REV_0_2=y
119# CONFIG_BF_REV_0_3 is not set 124# CONFIG_BF_REV_0_3 is not set
120# CONFIG_BF_REV_0_4 is not set 125# CONFIG_BF_REV_0_4 is not set
121# CONFIG_BF_REV_0_5 is not set 126# CONFIG_BF_REV_0_5 is not set
127# CONFIG_BF_REV_ANY is not set
128# CONFIG_BF_REV_NONE is not set
129CONFIG_BF53x=y
122CONFIG_BFIN_SINGLE_CORE=y 130CONFIG_BFIN_SINGLE_CORE=y
123# CONFIG_BFIN533_EZKIT is not set 131# CONFIG_BFIN533_EZKIT is not set
124# CONFIG_BFIN533_STAMP is not set 132# CONFIG_BFIN533_STAMP is not set
125# CONFIG_BFIN537_STAMP is not set 133# CONFIG_BFIN537_STAMP is not set
126# CONFIG_BFIN533_BLUETECHNIX_CM is not set 134# CONFIG_BFIN533_BLUETECHNIX_CM is not set
127# CONFIG_BFIN537_BLUETECHNIX_CM is not set 135# CONFIG_BFIN537_BLUETECHNIX_CM is not set
136# CONFIG_BFIN548_EZKIT is not set
128# CONFIG_BFIN561_BLUETECHNIX_CM is not set 137# CONFIG_BFIN561_BLUETECHNIX_CM is not set
129# CONFIG_BFIN561_EZKIT is not set 138# CONFIG_BFIN561_EZKIT is not set
130# CONFIG_BFIN561_TEPLA is not set 139# CONFIG_BFIN561_TEPLA is not set
@@ -598,6 +607,7 @@ CONFIG_BFIN_MAC=y
598CONFIG_BFIN_TX_DESC_NUM=100 607CONFIG_BFIN_TX_DESC_NUM=100
599CONFIG_BFIN_RX_DESC_NUM=100 608CONFIG_BFIN_RX_DESC_NUM=100
600CONFIG_BFIN_MAC_RMII=y 609CONFIG_BFIN_MAC_RMII=y
610# CONFIG_SMSC911X is not set
601 611
602# 612#
603# Ethernet (1000 Mbit) 613# Ethernet (1000 Mbit)
@@ -746,7 +756,6 @@ CONFIG_CAN_BLACKFIN=m
746# CONFIG_WATCHDOG is not set 756# CONFIG_WATCHDOG is not set
747CONFIG_HW_RANDOM=y 757CONFIG_HW_RANDOM=y
748# CONFIG_GEN_RTC is not set 758# CONFIG_GEN_RTC is not set
749CONFIG_BLACKFIN_DPMC=y
750# CONFIG_DTLK is not set 759# CONFIG_DTLK is not set
751# CONFIG_R3964 is not set 760# CONFIG_R3964 is not set
752# CONFIG_RAW_DRIVER is not set 761# CONFIG_RAW_DRIVER is not set
diff --git a/arch/blackfin/kernel/setup.c b/arch/blackfin/kernel/setup.c
index 5b9b434c1ed9..83060f98d15d 100644
--- a/arch/blackfin/kernel/setup.c
+++ b/arch/blackfin/kernel/setup.c
@@ -307,10 +307,20 @@ void __init setup_arch(char **cmdline_p)
307 init_leds(); 307 init_leds();
308 308
309 printk(KERN_INFO "Blackfin support (C) 2004-2007 Analog Devices, Inc.\n"); 309 printk(KERN_INFO "Blackfin support (C) 2004-2007 Analog Devices, Inc.\n");
310 printk(KERN_INFO "Compiled for ADSP-%s Rev 0.%d\n", CPU, bfin_compiled_revid()); 310 if (bfin_compiled_revid() == 0xffff)
311 if (bfin_revid() != bfin_compiled_revid()) 311 printk(KERN_INFO "Compiled for ADSP-%s Rev any\n", CPU);
312 printk(KERN_ERR "Warning: Compiled for Rev %d, but running on Rev %d\n", 312 else if (bfin_compiled_revid() == -1)
313 bfin_compiled_revid(), bfin_revid()); 313 printk(KERN_INFO "Compiled for ADSP-%s Rev none\n", CPU);
314 else
315 printk(KERN_INFO "Compiled for ADSP-%s Rev 0.%d\n", CPU, bfin_compiled_revid());
316 if (bfin_revid() != bfin_compiled_revid()) {
317 if (bfin_compiled_revid() == -1)
318 printk(KERN_ERR "Warning: Compiled for Rev none, but running on Rev %d\n",
319 bfin_revid());
320 else if (bfin_compiled_revid() != 0xffff)
321 printk(KERN_ERR "Warning: Compiled for Rev %d, but running on Rev %d\n",
322 bfin_compiled_revid(), bfin_revid());
323 }
314 if (bfin_revid() < SUPPORTED_REVID) 324 if (bfin_revid() < SUPPORTED_REVID)
315 printk(KERN_ERR "Warning: Unsupported Chip Revision ADSP-%s Rev 0.%d detected\n", 325 printk(KERN_ERR "Warning: Unsupported Chip Revision ADSP-%s Rev 0.%d detected\n",
316 CPU, bfin_revid()); 326 CPU, bfin_revid());
diff --git a/arch/blackfin/kernel/traps.c b/arch/blackfin/kernel/traps.c
index aa660f32d8c8..56058b0b6d4a 100644
--- a/arch/blackfin/kernel/traps.c
+++ b/arch/blackfin/kernel/traps.c
@@ -545,7 +545,8 @@ void dump_bfin_regs(struct pt_regs *fp, void *retaddr)
545 545
546 if (current->mm) { 546 if (current->mm) {
547 printk(KERN_EMERG "TEXT = 0x%p-0x%p DATA = 0x%p-0x%p\n" 547 printk(KERN_EMERG "TEXT = 0x%p-0x%p DATA = 0x%p-0x%p\n"
548 "BSS = 0x%p-0x%p USER-STACK = 0x%p\n\n", 548 KERN_EMERG "BSS = 0x%p-0x%p USER-STACK = 0x%p\n"
549 KERN_EMERG "\n",
549 (void*)current->mm->start_code, 550 (void*)current->mm->start_code,
550 (void*)current->mm->end_code, 551 (void*)current->mm->end_code,
551 (void*)current->mm->start_data, 552 (void*)current->mm->start_data,
diff --git a/arch/i386/kernel/acpi/boot.c b/arch/i386/kernel/acpi/boot.c
index 280898b045b2..a574cd2c8b61 100644
--- a/arch/i386/kernel/acpi/boot.c
+++ b/arch/i386/kernel/acpi/boot.c
@@ -621,8 +621,6 @@ static int __init acpi_parse_sbf(struct acpi_table_header *table)
621static int __init acpi_parse_hpet(struct acpi_table_header *table) 621static int __init acpi_parse_hpet(struct acpi_table_header *table)
622{ 622{
623 struct acpi_table_hpet *hpet_tbl; 623 struct acpi_table_hpet *hpet_tbl;
624 struct resource *hpet_res;
625 resource_size_t res_start;
626 624
627 hpet_tbl = (struct acpi_table_hpet *)table; 625 hpet_tbl = (struct acpi_table_hpet *)table;
628 if (!hpet_tbl) { 626 if (!hpet_tbl) {
@@ -636,29 +634,10 @@ static int __init acpi_parse_hpet(struct acpi_table_header *table)
636 return -1; 634 return -1;
637 } 635 }
638 636
639#define HPET_RESOURCE_NAME_SIZE 9
640 hpet_res = alloc_bootmem(sizeof(*hpet_res) + HPET_RESOURCE_NAME_SIZE);
641 if (hpet_res) {
642 memset(hpet_res, 0, sizeof(*hpet_res));
643 hpet_res->name = (void *)&hpet_res[1];
644 hpet_res->flags = IORESOURCE_MEM | IORESOURCE_BUSY;
645 snprintf((char *)hpet_res->name, HPET_RESOURCE_NAME_SIZE,
646 "HPET %u", hpet_tbl->sequence);
647 hpet_res->end = (1 * 1024) - 1;
648 }
649
650 hpet_address = hpet_tbl->address.address; 637 hpet_address = hpet_tbl->address.address;
651 printk(KERN_INFO PREFIX "HPET id: %#x base: %#lx\n", 638 printk(KERN_INFO PREFIX "HPET id: %#x base: %#lx\n",
652 hpet_tbl->id, hpet_address); 639 hpet_tbl->id, hpet_address);
653 640
654 res_start = hpet_address;
655
656 if (hpet_res) {
657 hpet_res->start = res_start;
658 hpet_res->end += res_start;
659 insert_resource(&iomem_resource, hpet_res);
660 }
661
662 return 0; 641 return 0;
663} 642}
664#else 643#else
diff --git a/arch/i386/kernel/cpu/perfctr-watchdog.c b/arch/i386/kernel/cpu/perfctr-watchdog.c
index f0b67630b90d..4d26d514c56f 100644
--- a/arch/i386/kernel/cpu/perfctr-watchdog.c
+++ b/arch/i386/kernel/cpu/perfctr-watchdog.c
@@ -55,14 +55,45 @@ static DEFINE_PER_CPU(struct nmi_watchdog_ctlblk, nmi_watchdog_ctlblk);
55/* converts an msr to an appropriate reservation bit */ 55/* converts an msr to an appropriate reservation bit */
56static inline unsigned int nmi_perfctr_msr_to_bit(unsigned int msr) 56static inline unsigned int nmi_perfctr_msr_to_bit(unsigned int msr)
57{ 57{
58 return wd_ops ? msr - wd_ops->perfctr : 0; 58 /* returns the bit offset of the performance counter register */
59 switch (boot_cpu_data.x86_vendor) {
60 case X86_VENDOR_AMD:
61 return (msr - MSR_K7_PERFCTR0);
62 case X86_VENDOR_INTEL:
63 if (cpu_has(&boot_cpu_data, X86_FEATURE_ARCH_PERFMON))
64 return (msr - MSR_ARCH_PERFMON_PERFCTR0);
65
66 switch (boot_cpu_data.x86) {
67 case 6:
68 return (msr - MSR_P6_PERFCTR0);
69 case 15:
70 return (msr - MSR_P4_BPU_PERFCTR0);
71 }
72 }
73 return 0;
59} 74}
60 75
61/* converts an msr to an appropriate reservation bit */ 76/* converts an msr to an appropriate reservation bit */
62/* returns the bit offset of the event selection register */ 77/* returns the bit offset of the event selection register */
63static inline unsigned int nmi_evntsel_msr_to_bit(unsigned int msr) 78static inline unsigned int nmi_evntsel_msr_to_bit(unsigned int msr)
64{ 79{
65 return wd_ops ? msr - wd_ops->evntsel : 0; 80 /* returns the bit offset of the event selection register */
81 switch (boot_cpu_data.x86_vendor) {
82 case X86_VENDOR_AMD:
83 return (msr - MSR_K7_EVNTSEL0);
84 case X86_VENDOR_INTEL:
85 if (cpu_has(&boot_cpu_data, X86_FEATURE_ARCH_PERFMON))
86 return (msr - MSR_ARCH_PERFMON_EVENTSEL0);
87
88 switch (boot_cpu_data.x86) {
89 case 6:
90 return (msr - MSR_P6_EVNTSEL0);
91 case 15:
92 return (msr - MSR_P4_BSU_ESCR0);
93 }
94 }
95 return 0;
96
66} 97}
67 98
68/* checks for a bit availability (hack for oprofile) */ 99/* checks for a bit availability (hack for oprofile) */
diff --git a/arch/mips/kernel/smp-mt.c b/arch/mips/kernel/smp-mt.c
index b8fa7ddd78f6..19b30d6f1727 100644
--- a/arch/mips/kernel/smp-mt.c
+++ b/arch/mips/kernel/smp-mt.c
@@ -236,8 +236,6 @@ void __init plat_smp_setup(void)
236 dvpe(); 236 dvpe();
237 dmt(); 237 dmt();
238 238
239 mips_mt_set_cpuoptions();
240
241 /* Put MVPE's into 'configuration state' */ 239 /* Put MVPE's into 'configuration state' */
242 set_c0_mvpcontrol(MVPCONTROL_VPC); 240 set_c0_mvpcontrol(MVPCONTROL_VPC);
243 241
@@ -263,6 +261,8 @@ void __init plat_smp_setup(void)
263 261
264void __init plat_prepare_cpus(unsigned int max_cpus) 262void __init plat_prepare_cpus(unsigned int max_cpus)
265{ 263{
264 mips_mt_set_cpuoptions();
265
266 /* set up ipi interrupts */ 266 /* set up ipi interrupts */
267 if (cpu_has_vint) { 267 if (cpu_has_vint) {
268 set_vi_handler(MIPS_CPU_IPI_RESCHED_IRQ, ipi_resched_dispatch); 268 set_vi_handler(MIPS_CPU_IPI_RESCHED_IRQ, ipi_resched_dispatch);
diff --git a/arch/powerpc/configs/mpc7448_hpc2_defconfig b/arch/powerpc/configs/mpc7448_hpc2_defconfig
index fdf09eabe6e7..174a290ee7a9 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.20-rc5 3# Linux kernel version: 2.6.22-rc7
4# Mon Jan 22 22:20:53 2007 4# Sun Jul 1 23:56:54 2007
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7CONFIG_PPC32=y 7CONFIG_PPC32=y
@@ -34,9 +34,9 @@ CONFIG_CLASSIC32=y
34# CONFIG_PPC_83xx is not set 34# CONFIG_PPC_83xx is not set
35# CONFIG_PPC_85xx is not set 35# CONFIG_PPC_85xx is not set
36# CONFIG_PPC_86xx is not set 36# CONFIG_PPC_86xx is not set
37# CONFIG_PPC_8xx is not set
37# CONFIG_40x is not set 38# CONFIG_40x is not set
38# CONFIG_44x is not set 39# CONFIG_44x is not set
39# CONFIG_8xx is not set
40# CONFIG_E200 is not set 40# CONFIG_E200 is not set
41CONFIG_6xx=y 41CONFIG_6xx=y
42CONFIG_PPC_FPU=y 42CONFIG_PPC_FPU=y
@@ -45,6 +45,7 @@ CONFIG_PPC_FPU=y
45# CONFIG_ALTIVEC is not set 45# CONFIG_ALTIVEC is not set
46CONFIG_PPC_STD_MMU=y 46CONFIG_PPC_STD_MMU=y
47CONFIG_PPC_STD_MMU_32=y 47CONFIG_PPC_STD_MMU_32=y
48# CONFIG_PPC_MM_SLICES is not set
48# CONFIG_SMP is not set 49# CONFIG_SMP is not set
49CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 50CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
50 51
@@ -63,14 +64,17 @@ CONFIG_LOCALVERSION_AUTO=y
63CONFIG_SWAP=y 64CONFIG_SWAP=y
64CONFIG_SYSVIPC=y 65CONFIG_SYSVIPC=y
65# CONFIG_IPC_NS is not set 66# CONFIG_IPC_NS is not set
67CONFIG_SYSVIPC_SYSCTL=y
66# CONFIG_POSIX_MQUEUE is not set 68# CONFIG_POSIX_MQUEUE is not set
67# CONFIG_BSD_PROCESS_ACCT is not set 69# CONFIG_BSD_PROCESS_ACCT is not set
68# CONFIG_TASKSTATS is not set 70# CONFIG_TASKSTATS is not set
69# CONFIG_UTS_NS is not set 71# CONFIG_UTS_NS is not set
70# CONFIG_AUDIT is not set 72# CONFIG_AUDIT is not set
71# CONFIG_IKCONFIG is not set 73# CONFIG_IKCONFIG is not set
74CONFIG_LOG_BUF_SHIFT=14
72CONFIG_SYSFS_DEPRECATED=y 75CONFIG_SYSFS_DEPRECATED=y
73# CONFIG_RELAY is not set 76# CONFIG_RELAY is not set
77CONFIG_BLK_DEV_INITRD=y
74CONFIG_INITRAMFS_SOURCE="" 78CONFIG_INITRAMFS_SOURCE=""
75# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 79# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
76CONFIG_SYSCTL=y 80CONFIG_SYSCTL=y
@@ -84,14 +88,19 @@ CONFIG_BUG=y
84CONFIG_ELF_CORE=y 88CONFIG_ELF_CORE=y
85CONFIG_BASE_FULL=y 89CONFIG_BASE_FULL=y
86CONFIG_FUTEX=y 90CONFIG_FUTEX=y
91CONFIG_ANON_INODES=y
87CONFIG_EPOLL=y 92CONFIG_EPOLL=y
93CONFIG_SIGNALFD=y
94CONFIG_TIMERFD=y
95CONFIG_EVENTFD=y
88CONFIG_SHMEM=y 96CONFIG_SHMEM=y
89CONFIG_SLAB=y
90CONFIG_VM_EVENT_COUNTERS=y 97CONFIG_VM_EVENT_COUNTERS=y
98CONFIG_SLAB=y
99# CONFIG_SLUB is not set
100# CONFIG_SLOB is not set
91CONFIG_RT_MUTEXES=y 101CONFIG_RT_MUTEXES=y
92# CONFIG_TINY_SHMEM is not set 102# CONFIG_TINY_SHMEM is not set
93CONFIG_BASE_SMALL=0 103CONFIG_BASE_SMALL=0
94# CONFIG_SLOB is not set
95 104
96# 105#
97# Loadable module support 106# Loadable module support
@@ -126,8 +135,18 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"
126CONFIG_EMBEDDED6xx=y 135CONFIG_EMBEDDED6xx=y
127# CONFIG_APUS is not set 136# CONFIG_APUS is not set
128# CONFIG_PPC_MPC52xx is not set 137# CONFIG_PPC_MPC52xx is not set
138# CONFIG_PPC_MPC5200 is not set
129# CONFIG_PPC_CELL is not set 139# CONFIG_PPC_CELL is not set
130# CONFIG_PPC_CELL_NATIVE is not set 140# CONFIG_PPC_CELL_NATIVE is not set
141# CONFIG_PQ2ADS is not set
142# CONFIG_LINKSTATION is not set
143CONFIG_MPC7448HPC2=y
144# CONFIG_PPC_HOLLY is not set
145# CONFIG_PPC_PRPMC2800 is not set
146CONFIG_TSI108_BRIDGE=y
147CONFIG_MPIC=y
148CONFIG_MPIC_WEIRD=y
149# CONFIG_PPC_I8259 is not set
131# CONFIG_PPC_RTAS is not set 150# CONFIG_PPC_RTAS is not set
132# CONFIG_MMIO_NVRAM is not set 151# CONFIG_MMIO_NVRAM is not set
133# CONFIG_PPC_MPC106 is not set 152# CONFIG_PPC_MPC106 is not set
@@ -136,36 +155,7 @@ CONFIG_EMBEDDED6xx=y
136# CONFIG_GENERIC_IOMAP is not set 155# CONFIG_GENERIC_IOMAP is not set
137# CONFIG_CPU_FREQ is not set 156# CONFIG_CPU_FREQ is not set
138# CONFIG_TAU is not set 157# CONFIG_TAU is not set
139# CONFIG_KATANA is not set 158# CONFIG_CPM2 is not set
140# CONFIG_WILLOW is not set
141# CONFIG_CPCI690 is not set
142# CONFIG_POWERPMC250 is not set
143# CONFIG_CHESTNUT is not set
144# CONFIG_SPRUCE is not set
145# CONFIG_HDPU is not set
146# CONFIG_EV64260 is not set
147# CONFIG_LOPEC is not set
148# CONFIG_MVME5100 is not set
149# CONFIG_PPLUS is not set
150# CONFIG_PRPMC750 is not set
151# CONFIG_PRPMC800 is not set
152# CONFIG_SANDPOINT is not set
153# CONFIG_LINKSTATION is not set
154CONFIG_MPC7448HPC2=y
155# CONFIG_RADSTONE_PPC7D is not set
156# CONFIG_PAL4 is not set
157# CONFIG_GEMINI is not set
158# CONFIG_EST8260 is not set
159# CONFIG_SBC82xx is not set
160# CONFIG_SBS8260 is not set
161# CONFIG_RPX8260 is not set
162# CONFIG_TQM8260 is not set
163# CONFIG_ADS8272 is not set
164# CONFIG_PQ2FADS is not set
165# CONFIG_EV64360 is not set
166CONFIG_TSI108_BRIDGE=y
167# CONFIG_WANT_EARLY_SERIAL is not set
168CONFIG_MPIC=y
169 159
170# 160#
171# Kernel options 161# Kernel options
@@ -193,31 +183,30 @@ CONFIG_FLAT_NODE_MEM_MAP=y
193# CONFIG_SPARSEMEM_STATIC is not set 183# CONFIG_SPARSEMEM_STATIC is not set
194CONFIG_SPLIT_PTLOCK_CPUS=4 184CONFIG_SPLIT_PTLOCK_CPUS=4
195# CONFIG_RESOURCES_64BIT is not set 185# CONFIG_RESOURCES_64BIT is not set
186CONFIG_ZONE_DMA_FLAG=1
196CONFIG_PROC_DEVICETREE=y 187CONFIG_PROC_DEVICETREE=y
197# CONFIG_CMDLINE_BOOL is not set 188# CONFIG_CMDLINE_BOOL is not set
198# CONFIG_PM is not set 189# CONFIG_PM is not set
199# CONFIG_SECCOMP is not set 190# CONFIG_SECCOMP is not set
191# CONFIG_WANT_DEVICE_TREE is not set
200CONFIG_ISA_DMA_API=y 192CONFIG_ISA_DMA_API=y
201 193
202# 194#
203# Bus options 195# Bus options
204# 196#
197CONFIG_ZONE_DMA=y
205CONFIG_GENERIC_ISA_DMA=y 198CONFIG_GENERIC_ISA_DMA=y
206CONFIG_MPIC_WEIRD=y
207# CONFIG_PPC_I8259 is not set
208# CONFIG_PPC_INDIRECT_PCI is not set 199# CONFIG_PPC_INDIRECT_PCI is not set
209CONFIG_PCI=y 200CONFIG_PCI=y
210CONFIG_PCI_DOMAINS=y 201CONFIG_PCI_DOMAINS=y
211# CONFIG_PCIEPORTBUS is not set 202# CONFIG_PCIEPORTBUS is not set
203CONFIG_ARCH_SUPPORTS_MSI=y
204# CONFIG_PCI_MSI is not set
212 205
213# 206#
214# PCCARD (PCMCIA/CardBus) support 207# PCCARD (PCMCIA/CardBus) support
215# 208#
216# CONFIG_PCCARD is not set 209# CONFIG_PCCARD is not set
217
218#
219# PCI Hotplug Support
220#
221# CONFIG_HOTPLUG_PCI is not set 210# CONFIG_HOTPLUG_PCI is not set
222 211
223# 212#
@@ -242,13 +231,13 @@ CONFIG_NET=y
242# 231#
243# Networking options 232# Networking options
244# 233#
245# CONFIG_NETDEBUG is not set
246CONFIG_PACKET=y 234CONFIG_PACKET=y
247# CONFIG_PACKET_MMAP is not set 235# CONFIG_PACKET_MMAP is not set
248CONFIG_UNIX=y 236CONFIG_UNIX=y
249CONFIG_XFRM=y 237CONFIG_XFRM=y
250CONFIG_XFRM_USER=y 238CONFIG_XFRM_USER=y
251# CONFIG_XFRM_SUB_POLICY is not set 239# CONFIG_XFRM_SUB_POLICY is not set
240# CONFIG_XFRM_MIGRATE is not set
252# CONFIG_NET_KEY is not set 241# CONFIG_NET_KEY is not set
253CONFIG_INET=y 242CONFIG_INET=y
254CONFIG_IP_MULTICAST=y 243CONFIG_IP_MULTICAST=y
@@ -282,20 +271,8 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
282# CONFIG_INET6_TUNNEL is not set 271# CONFIG_INET6_TUNNEL is not set
283# CONFIG_NETWORK_SECMARK is not set 272# CONFIG_NETWORK_SECMARK is not set
284# CONFIG_NETFILTER is not set 273# CONFIG_NETFILTER is not set
285
286#
287# DCCP Configuration (EXPERIMENTAL)
288#
289# CONFIG_IP_DCCP is not set 274# CONFIG_IP_DCCP is not set
290
291#
292# SCTP Configuration (EXPERIMENTAL)
293#
294# CONFIG_IP_SCTP is not set 275# CONFIG_IP_SCTP is not set
295
296#
297# TIPC Configuration (EXPERIMENTAL)
298#
299# CONFIG_TIPC is not set 276# CONFIG_TIPC is not set
300# CONFIG_ATM is not set 277# CONFIG_ATM is not set
301# CONFIG_BRIDGE is not set 278# CONFIG_BRIDGE is not set
@@ -321,7 +298,16 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
321# CONFIG_HAMRADIO is not set 298# CONFIG_HAMRADIO is not set
322# CONFIG_IRDA is not set 299# CONFIG_IRDA is not set
323# CONFIG_BT is not set 300# CONFIG_BT is not set
301# CONFIG_AF_RXRPC is not set
302
303#
304# Wireless
305#
306# CONFIG_CFG80211 is not set
307# CONFIG_WIRELESS_EXT is not set
308# CONFIG_MAC80211 is not set
324# CONFIG_IEEE80211 is not set 309# CONFIG_IEEE80211 is not set
310# CONFIG_RFKILL is not set
325 311
326# 312#
327# Device Drivers 313# Device Drivers
@@ -339,10 +325,6 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y
339# Connector - unified userspace <-> kernelspace linker 325# Connector - unified userspace <-> kernelspace linker
340# 326#
341# CONFIG_CONNECTOR is not set 327# CONFIG_CONNECTOR is not set
342
343#
344# Memory Technology Devices (MTD)
345#
346# CONFIG_MTD is not set 328# CONFIG_MTD is not set
347 329
348# 330#
@@ -353,6 +335,7 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y
353# 335#
354# Plug and Play support 336# Plug and Play support
355# 337#
338# CONFIG_PNPACPI is not set
356 339
357# 340#
358# Block devices 341# Block devices
@@ -371,19 +354,16 @@ CONFIG_BLK_DEV_RAM=y
371CONFIG_BLK_DEV_RAM_COUNT=16 354CONFIG_BLK_DEV_RAM_COUNT=16
372CONFIG_BLK_DEV_RAM_SIZE=131072 355CONFIG_BLK_DEV_RAM_SIZE=131072
373CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 356CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
374CONFIG_BLK_DEV_INITRD=y
375# CONFIG_CDROM_PKTCDVD is not set 357# CONFIG_CDROM_PKTCDVD is not set
376# CONFIG_ATA_OVER_ETH is not set 358# CONFIG_ATA_OVER_ETH is not set
377 359
378# 360#
379# Misc devices 361# Misc devices
380# 362#
363# CONFIG_PHANTOM is not set
381# CONFIG_SGI_IOC4 is not set 364# CONFIG_SGI_IOC4 is not set
382# CONFIG_TIFM_CORE is not set 365# CONFIG_TIFM_CORE is not set
383 366# CONFIG_BLINK is not set
384#
385# ATA/ATAPI/MFM/RLL support
386#
387# CONFIG_IDE is not set 367# CONFIG_IDE is not set
388 368
389# 369#
@@ -460,11 +440,8 @@ CONFIG_BLK_DEV_SD=y
460# CONFIG_SCSI_NSP32 is not set 440# CONFIG_SCSI_NSP32 is not set
461# CONFIG_SCSI_DEBUG is not set 441# CONFIG_SCSI_DEBUG is not set
462# CONFIG_SCSI_SRP is not set 442# CONFIG_SCSI_SRP is not set
463
464#
465# Serial ATA (prod) and Parallel ATA (experimental) drivers
466#
467CONFIG_ATA=y 443CONFIG_ATA=y
444# CONFIG_ATA_NONSTANDARD is not set
468# CONFIG_SATA_AHCI is not set 445# CONFIG_SATA_AHCI is not set
469# CONFIG_SATA_SVW is not set 446# CONFIG_SATA_SVW is not set
470# CONFIG_ATA_PIIX is not set 447# CONFIG_ATA_PIIX is not set
@@ -480,10 +457,12 @@ CONFIG_SATA_MV=y
480# CONFIG_SATA_ULI is not set 457# CONFIG_SATA_ULI is not set
481# CONFIG_SATA_VIA is not set 458# CONFIG_SATA_VIA is not set
482# CONFIG_SATA_VITESSE is not set 459# CONFIG_SATA_VITESSE is not set
460# CONFIG_SATA_INIC162X is not set
483# CONFIG_PATA_ALI is not set 461# CONFIG_PATA_ALI is not set
484# CONFIG_PATA_AMD is not set 462# CONFIG_PATA_AMD is not set
485# CONFIG_PATA_ARTOP is not set 463# CONFIG_PATA_ARTOP is not set
486# CONFIG_PATA_ATIIXP is not set 464# CONFIG_PATA_ATIIXP is not set
465# CONFIG_PATA_CMD640_PCI is not set
487# CONFIG_PATA_CMD64X is not set 466# CONFIG_PATA_CMD64X is not set
488# CONFIG_PATA_CS5520 is not set 467# CONFIG_PATA_CS5520 is not set
489# CONFIG_PATA_CS5530 is not set 468# CONFIG_PATA_CS5530 is not set
@@ -495,6 +474,7 @@ CONFIG_SATA_MV=y
495# CONFIG_PATA_HPT3X2N is not set 474# CONFIG_PATA_HPT3X2N is not set
496# CONFIG_PATA_HPT3X3 is not set 475# CONFIG_PATA_HPT3X3 is not set
497# CONFIG_PATA_IT821X is not set 476# CONFIG_PATA_IT821X is not set
477# CONFIG_PATA_IT8213 is not set
498# CONFIG_PATA_JMICRON is not set 478# CONFIG_PATA_JMICRON is not set
499# CONFIG_PATA_TRIFLEX is not set 479# CONFIG_PATA_TRIFLEX is not set
500# CONFIG_PATA_MARVELL is not set 480# CONFIG_PATA_MARVELL is not set
@@ -532,18 +512,14 @@ CONFIG_SATA_MV=y
532# 512#
533# IEEE 1394 (FireWire) support 513# IEEE 1394 (FireWire) support
534# 514#
515# CONFIG_FIREWIRE is not set
535# CONFIG_IEEE1394 is not set 516# CONFIG_IEEE1394 is not set
536 517
537# 518#
538# I2O device support 519# I2O device support
539# 520#
540# CONFIG_I2O is not set 521# CONFIG_I2O is not set
541 522# CONFIG_MACINTOSH_DRIVERS is not set
542#
543# Macintosh device drivers
544#
545# CONFIG_MAC_EMUMOUSEBTN is not set
546# CONFIG_WINDFARM is not set
547 523
548# 524#
549# Network device support 525# Network device support
@@ -553,15 +529,7 @@ CONFIG_NETDEVICES=y
553# CONFIG_BONDING is not set 529# CONFIG_BONDING is not set
554# CONFIG_EQUALIZER is not set 530# CONFIG_EQUALIZER is not set
555# CONFIG_TUN is not set 531# CONFIG_TUN is not set
556
557#
558# ARCnet devices
559#
560# CONFIG_ARCNET is not set 532# CONFIG_ARCNET is not set
561
562#
563# PHY device support
564#
565CONFIG_PHYLIB=y 533CONFIG_PHYLIB=y
566 534
567# 535#
@@ -615,10 +583,8 @@ CONFIG_8139TOO=y
615# CONFIG_SUNDANCE is not set 583# CONFIG_SUNDANCE is not set
616# CONFIG_TLAN is not set 584# CONFIG_TLAN is not set
617# CONFIG_VIA_RHINE is not set 585# CONFIG_VIA_RHINE is not set
618 586# CONFIG_SC92031 is not set
619# 587CONFIG_NETDEV_1000=y
620# Ethernet (1000 Mbit)
621#
622# CONFIG_ACENIC is not set 588# CONFIG_ACENIC is not set
623# CONFIG_DL2K is not set 589# CONFIG_DL2K is not set
624# CONFIG_E1000 is not set 590# CONFIG_E1000 is not set
@@ -635,29 +601,22 @@ CONFIG_8139TOO=y
635# CONFIG_BNX2 is not set 601# CONFIG_BNX2 is not set
636CONFIG_TSI108_ETH=y 602CONFIG_TSI108_ETH=y
637# CONFIG_QLA3XXX is not set 603# CONFIG_QLA3XXX is not set
638 604# CONFIG_ATL1 is not set
639# 605CONFIG_NETDEV_10000=y
640# Ethernet (10000 Mbit)
641#
642# CONFIG_CHELSIO_T1 is not set 606# CONFIG_CHELSIO_T1 is not set
607# CONFIG_CHELSIO_T3 is not set
643# CONFIG_IXGB is not set 608# CONFIG_IXGB is not set
644# CONFIG_S2IO is not set 609# CONFIG_S2IO is not set
645# CONFIG_MYRI10GE is not set 610# CONFIG_MYRI10GE is not set
646# CONFIG_NETXEN_NIC is not set 611# CONFIG_NETXEN_NIC is not set
647 612# CONFIG_MLX4_CORE is not set
648#
649# Token Ring devices
650#
651# CONFIG_TR is not set 613# CONFIG_TR is not set
652 614
653# 615#
654# Wireless LAN (non-hamradio) 616# Wireless LAN
655#
656# CONFIG_NET_RADIO is not set
657
658#
659# Wan interfaces
660# 617#
618# CONFIG_WLAN_PRE80211 is not set
619# CONFIG_WLAN_80211 is not set
661# CONFIG_WAN is not set 620# CONFIG_WAN is not set
662# CONFIG_FDDI is not set 621# CONFIG_FDDI is not set
663# CONFIG_HIPPI is not set 622# CONFIG_HIPPI is not set
@@ -684,6 +643,7 @@ CONFIG_TSI108_ETH=y
684# 643#
685CONFIG_INPUT=y 644CONFIG_INPUT=y
686# CONFIG_INPUT_FF_MEMLESS is not set 645# CONFIG_INPUT_FF_MEMLESS is not set
646# CONFIG_INPUT_POLLDEV is not set
687 647
688# 648#
689# Userland interfaces 649# Userland interfaces
@@ -700,6 +660,7 @@ CONFIG_INPUT=y
700# CONFIG_INPUT_KEYBOARD is not set 660# CONFIG_INPUT_KEYBOARD is not set
701# CONFIG_INPUT_MOUSE is not set 661# CONFIG_INPUT_MOUSE is not set
702# CONFIG_INPUT_JOYSTICK is not set 662# CONFIG_INPUT_JOYSTICK is not set
663# CONFIG_INPUT_TABLET is not set
703# CONFIG_INPUT_TOUCHSCREEN is not set 664# CONFIG_INPUT_TOUCHSCREEN is not set
704# CONFIG_INPUT_MISC is not set 665# CONFIG_INPUT_MISC is not set
705 666
@@ -732,6 +693,7 @@ CONFIG_SERIAL_8250_RUNTIME_UARTS=4
732CONFIG_SERIAL_CORE=y 693CONFIG_SERIAL_CORE=y
733CONFIG_SERIAL_CORE_CONSOLE=y 694CONFIG_SERIAL_CORE_CONSOLE=y
734# CONFIG_SERIAL_JSM is not set 695# CONFIG_SERIAL_JSM is not set
696# CONFIG_SERIAL_OF_PLATFORM is not set
735CONFIG_UNIX98_PTYS=y 697CONFIG_UNIX98_PTYS=y
736CONFIG_LEGACY_PTYS=y 698CONFIG_LEGACY_PTYS=y
737CONFIG_LEGACY_PTY_COUNT=256 699CONFIG_LEGACY_PTY_COUNT=256
@@ -740,16 +702,11 @@ CONFIG_LEGACY_PTY_COUNT=256
740# IPMI 702# IPMI
741# 703#
742# CONFIG_IPMI_HANDLER is not set 704# CONFIG_IPMI_HANDLER is not set
743
744#
745# Watchdog Cards
746#
747# CONFIG_WATCHDOG is not set 705# CONFIG_WATCHDOG is not set
748# CONFIG_HW_RANDOM is not set 706# CONFIG_HW_RANDOM is not set
749# CONFIG_NVRAM is not set 707# CONFIG_NVRAM is not set
750CONFIG_GEN_RTC=y 708CONFIG_GEN_RTC=y
751# CONFIG_GEN_RTC_X is not set 709# CONFIG_GEN_RTC_X is not set
752# CONFIG_DTLK is not set
753# CONFIG_R3964 is not set 710# CONFIG_R3964 is not set
754# CONFIG_APPLICOM is not set 711# CONFIG_APPLICOM is not set
755# CONFIG_AGP is not set 712# CONFIG_AGP is not set
@@ -760,10 +717,7 @@ CONFIG_GEN_RTC=y
760# TPM devices 717# TPM devices
761# 718#
762# CONFIG_TCG_TPM is not set 719# CONFIG_TCG_TPM is not set
763 720CONFIG_DEVPORT=y
764#
765# I2C support
766#
767# CONFIG_I2C is not set 721# CONFIG_I2C is not set
768 722
769# 723#
@@ -776,35 +730,41 @@ CONFIG_GEN_RTC=y
776# Dallas's 1-wire bus 730# Dallas's 1-wire bus
777# 731#
778# CONFIG_W1 is not set 732# CONFIG_W1 is not set
779
780#
781# Hardware Monitoring support
782#
783CONFIG_HWMON=y 733CONFIG_HWMON=y
784# CONFIG_HWMON_VID is not set 734# CONFIG_HWMON_VID is not set
785# CONFIG_SENSORS_ABITUGURU is not set 735# CONFIG_SENSORS_ABITUGURU is not set
786# CONFIG_SENSORS_F71805F is not set 736# CONFIG_SENSORS_F71805F is not set
787# CONFIG_SENSORS_PC87427 is not set 737# CONFIG_SENSORS_PC87427 is not set
738# CONFIG_SENSORS_SMSC47M1 is not set
739# CONFIG_SENSORS_SMSC47B397 is not set
788# CONFIG_SENSORS_VT1211 is not set 740# CONFIG_SENSORS_VT1211 is not set
741# CONFIG_SENSORS_W83627HF is not set
789# CONFIG_HWMON_DEBUG_CHIP is not set 742# CONFIG_HWMON_DEBUG_CHIP is not set
790 743
791# 744#
745# Multifunction device drivers
746#
747# CONFIG_MFD_SM501 is not set
748
749#
792# Multimedia devices 750# Multimedia devices
793# 751#
794# CONFIG_VIDEO_DEV is not set 752# CONFIG_VIDEO_DEV is not set
753# CONFIG_DVB_CORE is not set
754CONFIG_DAB=y
795 755
796# 756#
797# Digital Video Broadcasting Devices 757# Graphics support
798# 758#
799# CONFIG_DVB is not set 759# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
800 760
801# 761#
802# Graphics support 762# Display device support
803# 763#
804CONFIG_FIRMWARE_EDID=y 764# CONFIG_DISPLAY_SUPPORT is not set
765# CONFIG_VGASTATE is not set
805# CONFIG_FB is not set 766# CONFIG_FB is not set
806# CONFIG_FB_IBM_GXT4500 is not set 767# CONFIG_FB_IBM_GXT4500 is not set
807# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
808 768
809# 769#
810# Sound 770# Sound
@@ -815,6 +775,7 @@ CONFIG_FIRMWARE_EDID=y
815# HID Devices 775# HID Devices
816# 776#
817CONFIG_HID=y 777CONFIG_HID=y
778# CONFIG_HID_DEBUG is not set
818 779
819# 780#
820# USB support 781# USB support
@@ -832,10 +793,6 @@ CONFIG_USB_ARCH_HAS_EHCI=y
832# USB Gadget Support 793# USB Gadget Support
833# 794#
834# CONFIG_USB_GADGET is not set 795# CONFIG_USB_GADGET is not set
835
836#
837# MMC/SD Card support
838#
839# CONFIG_MMC is not set 796# CONFIG_MMC is not set
840 797
841# 798#
@@ -879,10 +836,6 @@ CONFIG_USB_ARCH_HAS_EHCI=y
879# 836#
880 837
881# 838#
882# Virtualization
883#
884
885#
886# File systems 839# File systems
887# 840#
888CONFIG_EXT2_FS=y 841CONFIG_EXT2_FS=y
@@ -967,6 +920,7 @@ CONFIG_ROOT_NFS=y
967CONFIG_LOCKD=y 920CONFIG_LOCKD=y
968CONFIG_NFS_COMMON=y 921CONFIG_NFS_COMMON=y
969CONFIG_SUNRPC=y 922CONFIG_SUNRPC=y
923# CONFIG_SUNRPC_BIND34 is not set
970# CONFIG_RPCSEC_GSS_KRB5 is not set 924# CONFIG_RPCSEC_GSS_KRB5 is not set
971# CONFIG_RPCSEC_GSS_SPKM3 is not set 925# CONFIG_RPCSEC_GSS_SPKM3 is not set
972# CONFIG_SMB_FS is not set 926# CONFIG_SMB_FS is not set
@@ -996,6 +950,7 @@ CONFIG_MSDOS_PARTITION=y
996# CONFIG_SUN_PARTITION is not set 950# CONFIG_SUN_PARTITION is not set
997# CONFIG_KARMA_PARTITION is not set 951# CONFIG_KARMA_PARTITION is not set
998# CONFIG_EFI_PARTITION is not set 952# CONFIG_EFI_PARTITION is not set
953# CONFIG_SYSV68_PARTITION is not set
999 954
1000# 955#
1001# Native Language Support 956# Native Language Support
@@ -1006,6 +961,7 @@ CONFIG_MSDOS_PARTITION=y
1006# Distributed Lock Manager 961# Distributed Lock Manager
1007# 962#
1008# CONFIG_DLM is not set 963# CONFIG_DLM is not set
964# CONFIG_UCC_SLOW is not set
1009 965
1010# 966#
1011# Library routines 967# Library routines
@@ -1013,10 +969,13 @@ CONFIG_MSDOS_PARTITION=y
1013CONFIG_BITREVERSE=y 969CONFIG_BITREVERSE=y
1014# CONFIG_CRC_CCITT is not set 970# CONFIG_CRC_CCITT is not set
1015# CONFIG_CRC16 is not set 971# CONFIG_CRC16 is not set
972# CONFIG_CRC_ITU_T is not set
1016CONFIG_CRC32=y 973CONFIG_CRC32=y
1017# CONFIG_LIBCRC32C is not set 974# CONFIG_LIBCRC32C is not set
1018CONFIG_PLIST=y 975CONFIG_PLIST=y
1019CONFIG_IOMAP_COPY=y 976CONFIG_HAS_IOMEM=y
977CONFIG_HAS_IOPORT=y
978CONFIG_HAS_DMA=y
1020 979
1021# 980#
1022# Instrumentation Support 981# Instrumentation Support
@@ -1033,7 +992,6 @@ CONFIG_ENABLE_MUST_CHECK=y
1033# CONFIG_DEBUG_FS is not set 992# CONFIG_DEBUG_FS is not set
1034# CONFIG_HEADERS_CHECK is not set 993# CONFIG_HEADERS_CHECK is not set
1035# CONFIG_DEBUG_KERNEL is not set 994# CONFIG_DEBUG_KERNEL is not set
1036CONFIG_LOG_BUF_SHIFT=14
1037# CONFIG_DEBUG_BUGVERBOSE is not set 995# CONFIG_DEBUG_BUGVERBOSE is not set
1038# CONFIG_BOOTX_TEXT is not set 996# CONFIG_BOOTX_TEXT is not set
1039# CONFIG_PPC_EARLY_DEBUG is not set 997# CONFIG_PPC_EARLY_DEBUG is not set
diff --git a/arch/powerpc/configs/mpc8272_ads_defconfig b/arch/powerpc/configs/mpc8272_ads_defconfig
index 2af45025082f..4a429294e4da 100644
--- a/arch/powerpc/configs/mpc8272_ads_defconfig
+++ b/arch/powerpc/configs/mpc8272_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.17-rc5 3# Linux kernel version: 2.6.22-rc7
4# Fri Jul 14 20:36:35 2006 4# Sun Jul 1 23:56:55 2007
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7CONFIG_PPC32=y 7CONFIG_PPC32=y
@@ -10,6 +10,7 @@ CONFIG_MMU=y
10CONFIG_GENERIC_HARDIRQS=y 10CONFIG_GENERIC_HARDIRQS=y
11CONFIG_IRQ_PER_CPU=y 11CONFIG_IRQ_PER_CPU=y
12CONFIG_RWSEM_XCHGADD_ALGORITHM=y 12CONFIG_RWSEM_XCHGADD_ALGORITHM=y
13CONFIG_ARCH_HAS_ILOG2_U32=y
13CONFIG_GENERIC_HWEIGHT=y 14CONFIG_GENERIC_HWEIGHT=y
14CONFIG_GENERIC_CALIBRATE_DELAY=y 15CONFIG_GENERIC_CALIBRATE_DELAY=y
15CONFIG_GENERIC_FIND_NEXT_BIT=y 16CONFIG_GENERIC_FIND_NEXT_BIT=y
@@ -21,25 +22,31 @@ CONFIG_ARCH_MAY_HAVE_PC_FDC=y
21CONFIG_PPC_OF=y 22CONFIG_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_DEFAULT_UIMAGE is not set 25CONFIG_AUDIT_ARCH=y
26CONFIG_GENERIC_BUG=y
27CONFIG_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
31CONFIG_PPC_82xx=y 33CONFIG_PPC_82xx=y
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
36# CONFIG_PPC_86xx is not set
37# CONFIG_PPC_8xx is not set
34# CONFIG_40x is not set 38# CONFIG_40x is not set
35# CONFIG_44x is not set 39# CONFIG_44x is not set
36# CONFIG_8xx is not set
37# CONFIG_E200 is not set 40# CONFIG_E200 is not set
38CONFIG_6xx=y 41CONFIG_6xx=y
39CONFIG_PPC_FPU=y 42CONFIG_PPC_FPU=y
43# CONFIG_PPC_DCR_NATIVE is not set
44# CONFIG_PPC_DCR_MMIO is not set
40CONFIG_PPC_STD_MMU=y 45CONFIG_PPC_STD_MMU=y
41CONFIG_PPC_STD_MMU_32=y 46CONFIG_PPC_STD_MMU_32=y
47# CONFIG_PPC_MM_SLICES is not set
42# CONFIG_SMP is not set 48# CONFIG_SMP is not set
49CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
43 50
44# 51#
45# Code maturity level options 52# Code maturity level options
@@ -55,14 +62,21 @@ CONFIG_LOCALVERSION="powerpc8272"
55CONFIG_LOCALVERSION_AUTO=y 62CONFIG_LOCALVERSION_AUTO=y
56CONFIG_SWAP=y 63CONFIG_SWAP=y
57CONFIG_SYSVIPC=y 64CONFIG_SYSVIPC=y
65# CONFIG_IPC_NS is not set
66CONFIG_SYSVIPC_SYSCTL=y
58# CONFIG_BSD_PROCESS_ACCT is not set 67# CONFIG_BSD_PROCESS_ACCT is not set
59CONFIG_SYSCTL=y 68# CONFIG_TASKSTATS is not set
69# CONFIG_UTS_NS is not set
60# CONFIG_AUDIT is not set 70# CONFIG_AUDIT is not set
61CONFIG_IKCONFIG=y 71CONFIG_IKCONFIG=y
62CONFIG_IKCONFIG_PROC=y 72CONFIG_IKCONFIG_PROC=y
73CONFIG_LOG_BUF_SHIFT=14
74CONFIG_SYSFS_DEPRECATED=y
63# CONFIG_RELAY is not set 75# CONFIG_RELAY is not set
64CONFIG_INITRAMFS_SOURCE="" 76# CONFIG_BLK_DEV_INITRD is not set
77CONFIG_SYSCTL=y
65CONFIG_EMBEDDED=y 78CONFIG_EMBEDDED=y
79CONFIG_SYSCTL_SYSCALL=y
66CONFIG_KALLSYMS=y 80CONFIG_KALLSYMS=y
67CONFIG_KALLSYMS_ALL=y 81CONFIG_KALLSYMS_ALL=y
68CONFIG_KALLSYMS_EXTRA_PASS=y 82CONFIG_KALLSYMS_EXTRA_PASS=y
@@ -72,12 +86,19 @@ CONFIG_BUG=y
72CONFIG_ELF_CORE=y 86CONFIG_ELF_CORE=y
73CONFIG_BASE_FULL=y 87CONFIG_BASE_FULL=y
74CONFIG_FUTEX=y 88CONFIG_FUTEX=y
89CONFIG_ANON_INODES=y
75CONFIG_EPOLL=y 90CONFIG_EPOLL=y
91CONFIG_SIGNALFD=y
92CONFIG_TIMERFD=y
93CONFIG_EVENTFD=y
76CONFIG_SHMEM=y 94CONFIG_SHMEM=y
95CONFIG_VM_EVENT_COUNTERS=y
77CONFIG_SLAB=y 96CONFIG_SLAB=y
97# CONFIG_SLUB is not set
98# CONFIG_SLOB is not set
99CONFIG_RT_MUTEXES=y
78# CONFIG_TINY_SHMEM is not set 100# CONFIG_TINY_SHMEM is not set
79CONFIG_BASE_SMALL=0 101CONFIG_BASE_SMALL=0
80# CONFIG_SLOB is not set
81 102
82# 103#
83# Loadable module support 104# Loadable module support
@@ -87,6 +108,7 @@ CONFIG_BASE_SMALL=0
87# 108#
88# Block layer 109# Block layer
89# 110#
111CONFIG_BLOCK=y
90# CONFIG_LBD is not set 112# CONFIG_LBD is not set
91# CONFIG_BLK_DEV_IO_TRACE is not set 113# CONFIG_BLK_DEV_IO_TRACE is not set
92# CONFIG_LSF is not set 114# CONFIG_LSF is not set
@@ -103,17 +125,29 @@ CONFIG_DEFAULT_AS=y
103# CONFIG_DEFAULT_CFQ is not set 125# CONFIG_DEFAULT_CFQ is not set
104# CONFIG_DEFAULT_NOOP is not set 126# CONFIG_DEFAULT_NOOP is not set
105CONFIG_DEFAULT_IOSCHED="anticipatory" 127CONFIG_DEFAULT_IOSCHED="anticipatory"
106CONFIG_PQ2ADS=y
107CONFIG_8260=y
108CONFIG_8272=y
109CONFIG_CPM2=y
110# CONFIG_WANT_EARLY_SERIAL is not set
111CONFIG_EMBEDDEDBOOT=y
112 128
113# 129#
114# Platform support 130# Platform support
115# 131#
116CONFIG_ADS8272=y 132# CONFIG_PPC_MPC52xx is not set
133# CONFIG_PPC_MPC5200 is not set
134# CONFIG_PPC_CELL is not set
135# CONFIG_PPC_CELL_NATIVE is not set
136CONFIG_MPC82xx_ADS=y
137CONFIG_PQ2ADS=y
138CONFIG_8260=y
139CONFIG_8272=y
140# CONFIG_MPIC is not set
141# CONFIG_MPIC_WEIRD is not set
142# CONFIG_PPC_I8259 is not set
143# CONFIG_PPC_RTAS is not set
144# CONFIG_MMIO_NVRAM is not set
145# CONFIG_PPC_MPC106 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
149# CONFIG_CPU_FREQ is not set
150CONFIG_CPM2=y
117 151
118# 152#
119# Kernel options 153# Kernel options
@@ -121,6 +155,7 @@ CONFIG_ADS8272=y
121# CONFIG_HIGHMEM is not set 155# CONFIG_HIGHMEM is not set
122# CONFIG_HZ_100 is not set 156# CONFIG_HZ_100 is not set
123CONFIG_HZ_250=y 157CONFIG_HZ_250=y
158# CONFIG_HZ_300 is not set
124# CONFIG_HZ_1000 is not set 159# CONFIG_HZ_1000 is not set
125CONFIG_HZ=250 160CONFIG_HZ=250
126CONFIG_PREEMPT_NONE=y 161CONFIG_PREEMPT_NONE=y
@@ -128,26 +163,30 @@ CONFIG_PREEMPT_NONE=y
128# CONFIG_PREEMPT is not set 163# CONFIG_PREEMPT is not set
129CONFIG_BINFMT_ELF=y 164CONFIG_BINFMT_ELF=y
130CONFIG_BINFMT_MISC=y 165CONFIG_BINFMT_MISC=y
131# CONFIG_PC_KEYBOARD is not set 166CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
132CONFIG_ARCH_FLATMEM_ENABLE=y 167CONFIG_ARCH_FLATMEM_ENABLE=y
168CONFIG_ARCH_POPULATES_NODE_MAP=y
133CONFIG_FLATMEM=y 169CONFIG_FLATMEM=y
134CONFIG_FLAT_NODE_MEM_MAP=y 170CONFIG_FLAT_NODE_MEM_MAP=y
135# CONFIG_SPARSEMEM_STATIC is not set 171# CONFIG_SPARSEMEM_STATIC is not set
136CONFIG_SPLIT_PTLOCK_CPUS=4 172CONFIG_SPLIT_PTLOCK_CPUS=4
173# CONFIG_RESOURCES_64BIT is not set
174CONFIG_ZONE_DMA_FLAG=1
137CONFIG_PROC_DEVICETREE=y 175CONFIG_PROC_DEVICETREE=y
138# CONFIG_CMDLINE_BOOL is not set 176# CONFIG_CMDLINE_BOOL is not set
139# CONFIG_PM is not set 177# CONFIG_PM is not set
140# CONFIG_SOFTWARE_SUSPEND is not set
141CONFIG_SECCOMP=y 178CONFIG_SECCOMP=y
179# CONFIG_WANT_DEVICE_TREE is not set
142CONFIG_ISA_DMA_API=y 180CONFIG_ISA_DMA_API=y
143 181
144# 182#
145# Bus options 183# Bus options
146# 184#
147# CONFIG_PPC_I8259 is not set 185CONFIG_ZONE_DMA=y
148CONFIG_FSL_SOC=y 186CONFIG_FSL_SOC=y
149# CONFIG_PCI is not set 187# CONFIG_PCI is not set
150# CONFIG_PCI_DOMAINS is not set 188# CONFIG_PCI_DOMAINS is not set
189# CONFIG_ARCH_SUPPORTS_MSI is not set
151 190
152# 191#
153# PCCARD (PCMCIA/CardBus) support 192# PCCARD (PCMCIA/CardBus) support
@@ -155,10 +194,6 @@ CONFIG_FSL_SOC=y
155# CONFIG_PCCARD is not set 194# CONFIG_PCCARD is not set
156 195
157# 196#
158# PCI Hotplug Support
159#
160
161#
162# Advanced setup 197# Advanced setup
163# 198#
164# CONFIG_ADVANCED_OPTIONS is not set 199# CONFIG_ADVANCED_OPTIONS is not set
@@ -180,10 +215,11 @@ CONFIG_NET=y
180# 215#
181# Networking options 216# Networking options
182# 217#
183# CONFIG_NETDEBUG is not set
184CONFIG_PACKET=y 218CONFIG_PACKET=y
185# CONFIG_PACKET_MMAP is not set 219# CONFIG_PACKET_MMAP is not set
186CONFIG_UNIX=y 220CONFIG_UNIX=y
221CONFIG_XFRM=y
222# CONFIG_XFRM_USER is not set
187# CONFIG_NET_KEY is not set 223# CONFIG_NET_KEY is not set
188CONFIG_INET=y 224CONFIG_INET=y
189CONFIG_IP_MULTICAST=y 225CONFIG_IP_MULTICAST=y
@@ -201,15 +237,15 @@ CONFIG_SYN_COOKIES=y
201# CONFIG_INET_ESP is not set 237# CONFIG_INET_ESP is not set
202# CONFIG_INET_IPCOMP is not set 238# CONFIG_INET_IPCOMP is not set
203# CONFIG_INET_XFRM_TUNNEL is not set 239# CONFIG_INET_XFRM_TUNNEL is not set
204# CONFIG_INET_TUNNEL is not set 240CONFIG_INET_TUNNEL=y
241CONFIG_INET_XFRM_MODE_TRANSPORT=y
242CONFIG_INET_XFRM_MODE_TUNNEL=y
243CONFIG_INET_XFRM_MODE_BEET=y
205CONFIG_INET_DIAG=y 244CONFIG_INET_DIAG=y
206CONFIG_INET_TCP_DIAG=y 245CONFIG_INET_TCP_DIAG=y
207# CONFIG_TCP_CONG_ADVANCED is not set 246# CONFIG_TCP_CONG_ADVANCED is not set
208CONFIG_TCP_CONG_BIC=y 247CONFIG_TCP_CONG_CUBIC=y
209 248CONFIG_DEFAULT_TCP_CONG="cubic"
210#
211# IP: Virtual Server Configuration
212#
213# CONFIG_IP_VS is not set 249# CONFIG_IP_VS is not set
214CONFIG_IPV6=y 250CONFIG_IPV6=y
215# CONFIG_IPV6_PRIVACY is not set 251# CONFIG_IPV6_PRIVACY is not set
@@ -219,7 +255,12 @@ CONFIG_IPV6=y
219# CONFIG_INET6_IPCOMP is not set 255# CONFIG_INET6_IPCOMP is not set
220# CONFIG_INET6_XFRM_TUNNEL is not set 256# CONFIG_INET6_XFRM_TUNNEL is not set
221# CONFIG_INET6_TUNNEL is not set 257# CONFIG_INET6_TUNNEL is not set
258CONFIG_INET6_XFRM_MODE_TRANSPORT=y
259CONFIG_INET6_XFRM_MODE_TUNNEL=y
260CONFIG_INET6_XFRM_MODE_BEET=y
261CONFIG_IPV6_SIT=y
222# CONFIG_IPV6_TUNNEL is not set 262# CONFIG_IPV6_TUNNEL is not set
263# CONFIG_NETWORK_SECMARK is not set
223CONFIG_NETFILTER=y 264CONFIG_NETFILTER=y
224# CONFIG_NETFILTER_DEBUG is not set 265# CONFIG_NETFILTER_DEBUG is not set
225 266
@@ -227,13 +268,16 @@ CONFIG_NETFILTER=y
227# Core Netfilter Configuration 268# Core Netfilter Configuration
228# 269#
229# CONFIG_NETFILTER_NETLINK is not set 270# CONFIG_NETFILTER_NETLINK is not set
271# CONFIG_NF_CONNTRACK_ENABLED is not set
272# CONFIG_NF_CONNTRACK is not set
230# CONFIG_NETFILTER_XTABLES is not set 273# CONFIG_NETFILTER_XTABLES is not set
231 274
232# 275#
233# IP: Netfilter Configuration 276# IP: Netfilter Configuration
234# 277#
235# CONFIG_IP_NF_CONNTRACK is not set
236# CONFIG_IP_NF_QUEUE is not set 278# CONFIG_IP_NF_QUEUE is not set
279# CONFIG_IP_NF_IPTABLES is not set
280# CONFIG_IP_NF_ARPTABLES is not set
237# CONFIG_BRIDGE is not set 281# CONFIG_BRIDGE is not set
238# CONFIG_VLAN_8021Q is not set 282# CONFIG_VLAN_8021Q is not set
239# CONFIG_DECNET is not set 283# CONFIG_DECNET is not set
@@ -253,7 +297,14 @@ CONFIG_NETFILTER=y
253# CONFIG_HAMRADIO is not set 297# CONFIG_HAMRADIO is not set
254# CONFIG_IRDA is not set 298# CONFIG_IRDA is not set
255# CONFIG_BT is not set 299# CONFIG_BT is not set
300
301#
302# Wireless
303#
304# CONFIG_CFG80211 is not set
305# CONFIG_WIRELESS_EXT is not set
256# CONFIG_IEEE80211 is not set 306# CONFIG_IEEE80211 is not set
307# CONFIG_RFKILL is not set
257 308
258# 309#
259# Device Drivers 310# Device Drivers
@@ -266,15 +317,13 @@ CONFIG_STANDALONE=y
266CONFIG_PREVENT_FIRMWARE_BUILD=y 317CONFIG_PREVENT_FIRMWARE_BUILD=y
267# CONFIG_FW_LOADER is not set 318# CONFIG_FW_LOADER is not set
268# CONFIG_DEBUG_DRIVER is not set 319# CONFIG_DEBUG_DRIVER is not set
320# CONFIG_DEBUG_DEVRES is not set
321# CONFIG_SYS_HYPERVISOR is not set
269 322
270# 323#
271# Connector - unified userspace <-> kernelspace linker 324# Connector - unified userspace <-> kernelspace linker
272# 325#
273# CONFIG_CONNECTOR is not set 326# CONFIG_CONNECTOR is not set
274
275#
276# Memory Technology Devices (MTD)
277#
278# CONFIG_MTD is not set 327# CONFIG_MTD is not set
279 328
280# 329#
@@ -285,6 +334,7 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y
285# 334#
286# Plug and Play support 335# Plug and Play support
287# 336#
337# CONFIG_PNPACPI is not set
288 338
289# 339#
290# Block devices 340# Block devices
@@ -295,14 +345,15 @@ CONFIG_BLK_DEV_LOOP=y
295# CONFIG_BLK_DEV_CRYPTOLOOP is not set 345# CONFIG_BLK_DEV_CRYPTOLOOP is not set
296# CONFIG_BLK_DEV_NBD is not set 346# CONFIG_BLK_DEV_NBD is not set
297# CONFIG_BLK_DEV_RAM is not set 347# CONFIG_BLK_DEV_RAM is not set
298# CONFIG_BLK_DEV_INITRD is not set
299# CONFIG_CDROM_PKTCDVD is not set 348# CONFIG_CDROM_PKTCDVD is not set
300# CONFIG_ATA_OVER_ETH is not set 349# CONFIG_ATA_OVER_ETH is not set
301 350
302# 351#
303# ATA/ATAPI/MFM/RLL support 352# Misc devices
304# 353#
354# CONFIG_BLINK is not set
305CONFIG_IDE=y 355CONFIG_IDE=y
356CONFIG_IDE_MAX_HWIFS=4
306CONFIG_BLK_DEV_IDE=y 357CONFIG_BLK_DEV_IDE=y
307 358
308# 359#
@@ -314,14 +365,15 @@ CONFIG_BLK_DEV_IDEDISK=y
314# CONFIG_BLK_DEV_IDECD is not set 365# CONFIG_BLK_DEV_IDECD is not set
315# CONFIG_BLK_DEV_IDEFLOPPY is not set 366# CONFIG_BLK_DEV_IDEFLOPPY is not set
316# CONFIG_IDE_TASK_IOCTL is not set 367# CONFIG_IDE_TASK_IOCTL is not set
368CONFIG_IDE_PROC_FS=y
317 369
318# 370#
319# IDE chipset support/bugfixes 371# IDE chipset support/bugfixes
320# 372#
321# CONFIG_IDE_GENERIC is not set 373# CONFIG_IDE_GENERIC is not set
374# CONFIG_IDEPCI_PCIBUS_ORDER is not set
322# CONFIG_IDE_ARM is not set 375# CONFIG_IDE_ARM is not set
323# CONFIG_BLK_DEV_IDEDMA is not set 376# CONFIG_BLK_DEV_IDEDMA is not set
324# CONFIG_IDEDMA_AUTO is not set
325# CONFIG_BLK_DEV_HD is not set 377# CONFIG_BLK_DEV_HD is not set
326 378
327# 379#
@@ -329,29 +381,14 @@ CONFIG_BLK_DEV_IDEDISK=y
329# 381#
330# CONFIG_RAID_ATTRS is not set 382# CONFIG_RAID_ATTRS is not set
331# CONFIG_SCSI is not set 383# CONFIG_SCSI is not set
384# CONFIG_SCSI_NETLINK is not set
385# CONFIG_ATA is not set
332 386
333# 387#
334# Multi-device support (RAID and LVM) 388# Multi-device support (RAID and LVM)
335# 389#
336# CONFIG_MD is not set 390# CONFIG_MD is not set
337 391# CONFIG_MACINTOSH_DRIVERS is not set
338#
339# Fusion MPT device support
340#
341# CONFIG_FUSION is not set
342
343#
344# IEEE 1394 (FireWire) support
345#
346
347#
348# I2O device support
349#
350
351#
352# Macintosh device drivers
353#
354# CONFIG_WINDFARM is not set
355 392
356# 393#
357# Network device support 394# Network device support
@@ -361,10 +398,6 @@ CONFIG_NETDEVICES=y
361# CONFIG_BONDING is not set 398# CONFIG_BONDING is not set
362# CONFIG_EQUALIZER is not set 399# CONFIG_EQUALIZER is not set
363CONFIG_TUN=y 400CONFIG_TUN=y
364
365#
366# PHY device support
367#
368CONFIG_PHYLIB=y 401CONFIG_PHYLIB=y
369 402
370# 403#
@@ -375,6 +408,9 @@ CONFIG_DAVICOM_PHY=y
375# CONFIG_QSEMI_PHY is not set 408# CONFIG_QSEMI_PHY is not set
376# CONFIG_LXT_PHY is not set 409# CONFIG_LXT_PHY is not set
377# CONFIG_CICADA_PHY is not set 410# CONFIG_CICADA_PHY is not set
411# CONFIG_VITESSE_PHY is not set
412# CONFIG_SMSC_PHY is not set
413# CONFIG_BROADCOM_PHY is not set
378# CONFIG_FIXED_PHY is not set 414# CONFIG_FIXED_PHY is not set
379 415
380# 416#
@@ -385,27 +421,14 @@ CONFIG_MII=y
385CONFIG_FS_ENET=y 421CONFIG_FS_ENET=y
386# CONFIG_FS_ENET_HAS_SCC is not set 422# CONFIG_FS_ENET_HAS_SCC is not set
387CONFIG_FS_ENET_HAS_FCC=y 423CONFIG_FS_ENET_HAS_FCC=y
424CONFIG_NETDEV_1000=y
425CONFIG_NETDEV_10000=y
388 426
389# 427#
390# Ethernet (1000 Mbit) 428# Wireless LAN
391#
392
393#
394# Ethernet (10000 Mbit)
395#
396
397#
398# Token Ring devices
399#
400
401#
402# Wireless LAN (non-hamradio)
403#
404# CONFIG_NET_RADIO is not set
405
406#
407# Wan interfaces
408# 429#
430# CONFIG_WLAN_PRE80211 is not set
431# CONFIG_WLAN_80211 is not set
409# CONFIG_WAN is not set 432# CONFIG_WAN is not set
410CONFIG_PPP=y 433CONFIG_PPP=y
411# CONFIG_PPP_FILTER is not set 434# CONFIG_PPP_FILTER is not set
@@ -414,6 +437,7 @@ CONFIG_PPP_SYNC_TTY=y
414CONFIG_PPP_DEFLATE=y 437CONFIG_PPP_DEFLATE=y
415# CONFIG_PPP_BSDCOMP is not set 438# CONFIG_PPP_BSDCOMP is not set
416# CONFIG_SLIP is not set 439# CONFIG_SLIP is not set
440CONFIG_SLHC=y
417# CONFIG_NETPOLL is not set 441# CONFIG_NETPOLL is not set
418# CONFIG_NET_POLL_CONTROLLER is not set 442# CONFIG_NET_POLL_CONTROLLER is not set
419 443
@@ -431,6 +455,8 @@ CONFIG_PPP_DEFLATE=y
431# Input device support 455# Input device support
432# 456#
433CONFIG_INPUT=y 457CONFIG_INPUT=y
458# CONFIG_INPUT_FF_MEMLESS is not set
459# CONFIG_INPUT_POLLDEV is not set
434 460
435# 461#
436# Userland interfaces 462# Userland interfaces
@@ -453,11 +479,19 @@ CONFIG_KEYBOARD_ATKBD=y
453# CONFIG_KEYBOARD_LKKBD is not set 479# CONFIG_KEYBOARD_LKKBD is not set
454# CONFIG_KEYBOARD_XTKBD is not set 480# CONFIG_KEYBOARD_XTKBD is not set
455# CONFIG_KEYBOARD_NEWTON is not set 481# CONFIG_KEYBOARD_NEWTON is not set
482# CONFIG_KEYBOARD_STOWAWAY is not set
456CONFIG_INPUT_MOUSE=y 483CONFIG_INPUT_MOUSE=y
457CONFIG_MOUSE_PS2=y 484CONFIG_MOUSE_PS2=y
485CONFIG_MOUSE_PS2_ALPS=y
486CONFIG_MOUSE_PS2_LOGIPS2PP=y
487CONFIG_MOUSE_PS2_SYNAPTICS=y
488CONFIG_MOUSE_PS2_LIFEBOOK=y
489CONFIG_MOUSE_PS2_TRACKPOINT=y
490# CONFIG_MOUSE_PS2_TOUCHKIT is not set
458# CONFIG_MOUSE_SERIAL is not set 491# CONFIG_MOUSE_SERIAL is not set
459# CONFIG_MOUSE_VSXXXAA is not set 492# CONFIG_MOUSE_VSXXXAA is not set
460# CONFIG_INPUT_JOYSTICK is not set 493# CONFIG_INPUT_JOYSTICK is not set
494# CONFIG_INPUT_TABLET is not set
461# CONFIG_INPUT_TOUCHSCREEN is not set 495# CONFIG_INPUT_TOUCHSCREEN is not set
462# CONFIG_INPUT_MISC is not set 496# CONFIG_INPUT_MISC is not set
463 497
@@ -485,6 +519,7 @@ CONFIG_SERIO_LIBPS2=y
485# 519#
486# Non-8250 serial port support 520# Non-8250 serial port support
487# 521#
522# CONFIG_SERIAL_UARTLITE is not set
488CONFIG_SERIAL_CORE=y 523CONFIG_SERIAL_CORE=y
489CONFIG_SERIAL_CORE_CONSOLE=y 524CONFIG_SERIAL_CORE_CONSOLE=y
490CONFIG_SERIAL_CPM=y 525CONFIG_SERIAL_CPM=y
@@ -503,29 +538,16 @@ CONFIG_LEGACY_PTY_COUNT=256
503# IPMI 538# IPMI
504# 539#
505# CONFIG_IPMI_HANDLER is not set 540# CONFIG_IPMI_HANDLER is not set
506
507#
508# Watchdog Cards
509#
510# CONFIG_WATCHDOG is not set 541# CONFIG_WATCHDOG is not set
542CONFIG_HW_RANDOM=y
511# CONFIG_NVRAM is not set 543# CONFIG_NVRAM is not set
512# CONFIG_GEN_RTC is not set 544# CONFIG_GEN_RTC is not set
513# CONFIG_DTLK is not set
514# CONFIG_R3964 is not set 545# CONFIG_R3964 is not set
515
516#
517# Ftape, the floppy tape device driver
518#
519# CONFIG_AGP is not set
520# CONFIG_RAW_DRIVER is not set 546# CONFIG_RAW_DRIVER is not set
521 547
522# 548#
523# TPM devices 549# TPM devices
524# 550#
525
526#
527# I2C support
528#
529# CONFIG_I2C is not set 551# CONFIG_I2C is not set
530 552
531# 553#
@@ -538,32 +560,32 @@ CONFIG_LEGACY_PTY_COUNT=256
538# Dallas's 1-wire bus 560# Dallas's 1-wire bus
539# 561#
540# CONFIG_W1 is not set 562# CONFIG_W1 is not set
541
542#
543# Hardware Monitoring support
544#
545# CONFIG_HWMON is not set 563# CONFIG_HWMON is not set
546# CONFIG_HWMON_VID is not set
547 564
548# 565#
549# Misc devices 566# Multifunction device drivers
550# 567#
568# CONFIG_MFD_SM501 is not set
551 569
552# 570#
553# Multimedia devices 571# Multimedia devices
554# 572#
555# CONFIG_VIDEO_DEV is not set 573# CONFIG_VIDEO_DEV is not set
556CONFIG_VIDEO_V4L2=y 574# CONFIG_DVB_CORE is not set
575CONFIG_DAB=y
557 576
558# 577#
559# Digital Video Broadcasting Devices 578# Graphics support
560# 579#
561# CONFIG_DVB is not set 580# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
562 581
563# 582#
564# Graphics support 583# Display device support
565# 584#
585# CONFIG_DISPLAY_SUPPORT is not set
586# CONFIG_VGASTATE is not set
566# CONFIG_FB is not set 587# CONFIG_FB is not set
588# CONFIG_FB_IBM_GXT4500 is not set
567 589
568# 590#
569# Sound 591# Sound
@@ -571,6 +593,12 @@ CONFIG_VIDEO_V4L2=y
571# CONFIG_SOUND is not set 593# CONFIG_SOUND is not set
572 594
573# 595#
596# HID Devices
597#
598CONFIG_HID=y
599# CONFIG_HID_DEBUG is not set
600
601#
574# USB support 602# USB support
575# 603#
576# CONFIG_USB_ARCH_HAS_HCD is not set 604# CONFIG_USB_ARCH_HAS_HCD is not set
@@ -586,6 +614,7 @@ CONFIG_VIDEO_V4L2=y
586# 614#
587CONFIG_USB_GADGET=y 615CONFIG_USB_GADGET=y
588# CONFIG_USB_GADGET_DEBUG_FILES is not set 616# CONFIG_USB_GADGET_DEBUG_FILES is not set
617# CONFIG_USB_GADGET_FSL_USB2 is not set
589# CONFIG_USB_GADGET_NET2280 is not set 618# CONFIG_USB_GADGET_NET2280 is not set
590# CONFIG_USB_GADGET_PXA2XX is not set 619# CONFIG_USB_GADGET_PXA2XX is not set
591# CONFIG_USB_GADGET_GOKU is not set 620# CONFIG_USB_GADGET_GOKU is not set
@@ -594,10 +623,6 @@ CONFIG_USB_GADGET=y
594# CONFIG_USB_GADGET_AT91 is not set 623# CONFIG_USB_GADGET_AT91 is not set
595# CONFIG_USB_GADGET_DUMMY_HCD is not set 624# CONFIG_USB_GADGET_DUMMY_HCD is not set
596# CONFIG_USB_GADGET_DUALSPEED is not set 625# CONFIG_USB_GADGET_DUALSPEED is not set
597
598#
599# MMC/SD Card support
600#
601# CONFIG_MMC is not set 626# CONFIG_MMC is not set
602 627
603# 628#
@@ -626,6 +651,19 @@ CONFIG_USB_GADGET=y
626# 651#
627 652
628# 653#
654# DMA Engine support
655#
656# CONFIG_DMA_ENGINE is not set
657
658#
659# DMA Clients
660#
661
662#
663# DMA Devices
664#
665
666#
629# File systems 667# File systems
630# 668#
631CONFIG_EXT2_FS=y 669CONFIG_EXT2_FS=y
@@ -645,9 +683,12 @@ CONFIG_XFS_FS=y
645# CONFIG_XFS_QUOTA is not set 683# CONFIG_XFS_QUOTA is not set
646# CONFIG_XFS_SECURITY is not set 684# CONFIG_XFS_SECURITY is not set
647# CONFIG_XFS_POSIX_ACL is not set 685# CONFIG_XFS_POSIX_ACL is not set
686# CONFIG_XFS_RT is not set
687# CONFIG_OCFS2_FS is not set
648# CONFIG_MINIX_FS is not set 688# CONFIG_MINIX_FS is not set
649# CONFIG_ROMFS_FS is not set 689# CONFIG_ROMFS_FS is not set
650CONFIG_INOTIFY=y 690CONFIG_INOTIFY=y
691CONFIG_INOTIFY_USER=y
651# CONFIG_QUOTA is not set 692# CONFIG_QUOTA is not set
652CONFIG_DNOTIFY=y 693CONFIG_DNOTIFY=y
653# CONFIG_AUTOFS_FS is not set 694# CONFIG_AUTOFS_FS is not set
@@ -672,8 +713,10 @@ CONFIG_AUTOFS4_FS=y
672# 713#
673CONFIG_PROC_FS=y 714CONFIG_PROC_FS=y
674CONFIG_PROC_KCORE=y 715CONFIG_PROC_KCORE=y
716CONFIG_PROC_SYSCTL=y
675CONFIG_SYSFS=y 717CONFIG_SYSFS=y
676CONFIG_TMPFS=y 718CONFIG_TMPFS=y
719# CONFIG_TMPFS_POSIX_ACL is not set
677# CONFIG_HUGETLB_PAGE is not set 720# CONFIG_HUGETLB_PAGE is not set
678CONFIG_RAMFS=y 721CONFIG_RAMFS=y
679 722
@@ -694,6 +737,7 @@ CONFIG_CRAMFS=y
694CONFIG_NFS_FS=y 737CONFIG_NFS_FS=y
695CONFIG_NFS_V3=y 738CONFIG_NFS_V3=y
696CONFIG_NFS_V3_ACL=y 739CONFIG_NFS_V3_ACL=y
740# CONFIG_NFS_DIRECTIO is not set
697# CONFIG_NFSD is not set 741# CONFIG_NFSD is not set
698CONFIG_ROOT_NFS=y 742CONFIG_ROOT_NFS=y
699CONFIG_LOCKD=y 743CONFIG_LOCKD=y
@@ -727,6 +771,7 @@ CONFIG_MSDOS_PARTITION=y
727# CONFIG_SUN_PARTITION is not set 771# CONFIG_SUN_PARTITION is not set
728# CONFIG_KARMA_PARTITION is not set 772# CONFIG_KARMA_PARTITION is not set
729# CONFIG_EFI_PARTITION is not set 773# CONFIG_EFI_PARTITION is not set
774# CONFIG_SYSV68_PARTITION is not set
730 775
731# 776#
732# Native Language Support 777# Native Language Support
@@ -771,37 +816,55 @@ CONFIG_NLS_ISO8859_1=y
771# CONFIG_NLS_KOI8_R is not set 816# CONFIG_NLS_KOI8_R is not set
772# CONFIG_NLS_KOI8_U is not set 817# CONFIG_NLS_KOI8_U is not set
773CONFIG_NLS_UTF8=y 818CONFIG_NLS_UTF8=y
819# CONFIG_UCC_SLOW is not set
774 820
775# 821#
776# Library routines 822# Library routines
777# 823#
824CONFIG_BITREVERSE=y
778CONFIG_CRC_CCITT=y 825CONFIG_CRC_CCITT=y
779# CONFIG_CRC16 is not set 826# CONFIG_CRC16 is not set
827# CONFIG_CRC_ITU_T is not set
780CONFIG_CRC32=y 828CONFIG_CRC32=y
781# CONFIG_LIBCRC32C is not set 829# CONFIG_LIBCRC32C is not set
782CONFIG_ZLIB_INFLATE=y 830CONFIG_ZLIB_INFLATE=y
783CONFIG_ZLIB_DEFLATE=y 831CONFIG_ZLIB_DEFLATE=y
832CONFIG_PLIST=y
833CONFIG_HAS_IOMEM=y
834CONFIG_HAS_IOPORT=y
835CONFIG_HAS_DMA=y
784 836
785# 837#
786# Kernel hacking 838# Kernel hacking
787# 839#
788# CONFIG_PRINTK_TIME is not set 840# CONFIG_PRINTK_TIME is not set
841CONFIG_ENABLE_MUST_CHECK=y
789# CONFIG_MAGIC_SYSRQ is not set 842# CONFIG_MAGIC_SYSRQ is not set
843# CONFIG_UNUSED_SYMBOLS is not set
844# CONFIG_DEBUG_FS is not set
845# CONFIG_HEADERS_CHECK is not set
790CONFIG_DEBUG_KERNEL=y 846CONFIG_DEBUG_KERNEL=y
791CONFIG_LOG_BUF_SHIFT=14 847# CONFIG_DEBUG_SHIRQ is not set
792CONFIG_DETECT_SOFTLOCKUP=y 848CONFIG_DETECT_SOFTLOCKUP=y
793# CONFIG_SCHEDSTATS is not set 849# CONFIG_SCHEDSTATS is not set
850# CONFIG_TIMER_STATS is not set
794# CONFIG_DEBUG_SLAB is not set 851# CONFIG_DEBUG_SLAB is not set
795# CONFIG_DEBUG_MUTEXES is not set 852# CONFIG_DEBUG_RT_MUTEXES is not set
853# CONFIG_RT_MUTEX_TESTER is not set
796# CONFIG_DEBUG_SPINLOCK is not set 854# CONFIG_DEBUG_SPINLOCK is not set
855# CONFIG_DEBUG_MUTEXES is not set
797# CONFIG_DEBUG_SPINLOCK_SLEEP is not set 856# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
857# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
798# CONFIG_DEBUG_KOBJECT is not set 858# CONFIG_DEBUG_KOBJECT is not set
859# CONFIG_DEBUG_BUGVERBOSE is not set
799CONFIG_DEBUG_INFO=y 860CONFIG_DEBUG_INFO=y
800# CONFIG_DEBUG_FS is not set
801# CONFIG_DEBUG_VM is not set 861# CONFIG_DEBUG_VM is not set
802# CONFIG_UNWIND_INFO is not set 862# CONFIG_DEBUG_LIST is not set
803CONFIG_FORCED_INLINING=y 863CONFIG_FORCED_INLINING=y
804# CONFIG_RCU_TORTURE_TEST is not set 864# CONFIG_FAULT_INJECTION is not set
865# CONFIG_DEBUG_STACKOVERFLOW is not set
866# CONFIG_DEBUG_STACK_USAGE is not set
867# CONFIG_DEBUG_PAGEALLOC is not set
805# CONFIG_DEBUGGER is not set 868# CONFIG_DEBUGGER is not set
806# CONFIG_KGDB_CONSOLE is not set 869# CONFIG_KGDB_CONSOLE is not set
807CONFIG_BDI_SWITCH=y 870CONFIG_BDI_SWITCH=y
@@ -818,6 +881,9 @@ CONFIG_BDI_SWITCH=y
818# Cryptographic options 881# Cryptographic options
819# 882#
820CONFIG_CRYPTO=y 883CONFIG_CRYPTO=y
884CONFIG_CRYPTO_ALGAPI=y
885CONFIG_CRYPTO_BLKCIPHER=y
886CONFIG_CRYPTO_MANAGER=y
821# CONFIG_CRYPTO_HMAC is not set 887# CONFIG_CRYPTO_HMAC is not set
822# CONFIG_CRYPTO_NULL is not set 888# CONFIG_CRYPTO_NULL is not set
823# CONFIG_CRYPTO_MD4 is not set 889# CONFIG_CRYPTO_MD4 is not set
@@ -827,7 +893,12 @@ CONFIG_CRYPTO_MD5=y
827# CONFIG_CRYPTO_SHA512 is not set 893# CONFIG_CRYPTO_SHA512 is not set
828# CONFIG_CRYPTO_WP512 is not set 894# CONFIG_CRYPTO_WP512 is not set
829# CONFIG_CRYPTO_TGR192 is not set 895# CONFIG_CRYPTO_TGR192 is not set
896CONFIG_CRYPTO_ECB=y
897CONFIG_CRYPTO_CBC=y
898CONFIG_CRYPTO_PCBC=y
899# CONFIG_CRYPTO_CRYPTD is not set
830CONFIG_CRYPTO_DES=y 900CONFIG_CRYPTO_DES=y
901# CONFIG_CRYPTO_FCRYPT is not set
831# CONFIG_CRYPTO_BLOWFISH is not set 902# CONFIG_CRYPTO_BLOWFISH is not set
832# CONFIG_CRYPTO_TWOFISH is not set 903# CONFIG_CRYPTO_TWOFISH is not set
833# CONFIG_CRYPTO_SERPENT is not set 904# CONFIG_CRYPTO_SERPENT is not set
@@ -841,7 +912,7 @@ CONFIG_CRYPTO_DES=y
841# CONFIG_CRYPTO_DEFLATE is not set 912# CONFIG_CRYPTO_DEFLATE is not set
842# CONFIG_CRYPTO_MICHAEL_MIC is not set 913# CONFIG_CRYPTO_MICHAEL_MIC is not set
843# CONFIG_CRYPTO_CRC32C is not set 914# CONFIG_CRYPTO_CRC32C is not set
844# CONFIG_CRYPTO_TEST is not set 915# CONFIG_CRYPTO_CAMELLIA is not set
845 916
846# 917#
847# Hardware crypto devices 918# Hardware crypto devices
diff --git a/arch/powerpc/configs/mpc8313_rdb_defconfig b/arch/powerpc/configs/mpc8313_rdb_defconfig
index f87523716c44..b7d3dffc981a 100644
--- a/arch/powerpc/configs/mpc8313_rdb_defconfig
+++ b/arch/powerpc/configs/mpc8313_rdb_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 3# Linux kernel version: 2.6.22-rc7
4# Wed Feb 7 22:08:04 2007 4# Sun Jul 1 23:56:55 2007
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7CONFIG_PPC32=y 7CONFIG_PPC32=y
@@ -45,6 +45,7 @@ CONFIG_PPC_FPU=y
45# CONFIG_PPC_DCR_MMIO is not set 45# CONFIG_PPC_DCR_MMIO is not set
46CONFIG_PPC_STD_MMU=y 46CONFIG_PPC_STD_MMU=y
47CONFIG_PPC_STD_MMU_32=y 47CONFIG_PPC_STD_MMU_32=y
48# CONFIG_PPC_MM_SLICES is not set
48# CONFIG_SMP is not set 49# CONFIG_SMP is not set
49CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 50CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
50 51
@@ -63,14 +64,17 @@ CONFIG_LOCALVERSION_AUTO=y
63CONFIG_SWAP=y 64CONFIG_SWAP=y
64CONFIG_SYSVIPC=y 65CONFIG_SYSVIPC=y
65# CONFIG_IPC_NS is not set 66# CONFIG_IPC_NS is not set
67CONFIG_SYSVIPC_SYSCTL=y
66# CONFIG_POSIX_MQUEUE is not set 68# CONFIG_POSIX_MQUEUE is not set
67# CONFIG_BSD_PROCESS_ACCT is not set 69# CONFIG_BSD_PROCESS_ACCT is not set
68# CONFIG_TASKSTATS is not set 70# CONFIG_TASKSTATS is not set
69# CONFIG_UTS_NS is not set 71# CONFIG_UTS_NS is not set
70# CONFIG_AUDIT is not set 72# CONFIG_AUDIT is not set
71# CONFIG_IKCONFIG is not set 73# CONFIG_IKCONFIG is not set
74CONFIG_LOG_BUF_SHIFT=14
72CONFIG_SYSFS_DEPRECATED=y 75CONFIG_SYSFS_DEPRECATED=y
73# CONFIG_RELAY is not set 76# CONFIG_RELAY is not set
77CONFIG_BLK_DEV_INITRD=y
74CONFIG_INITRAMFS_SOURCE="" 78CONFIG_INITRAMFS_SOURCE=""
75# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 79# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
76CONFIG_SYSCTL=y 80CONFIG_SYSCTL=y
@@ -83,14 +87,19 @@ CONFIG_BUG=y
83CONFIG_ELF_CORE=y 87CONFIG_ELF_CORE=y
84CONFIG_BASE_FULL=y 88CONFIG_BASE_FULL=y
85CONFIG_FUTEX=y 89CONFIG_FUTEX=y
90CONFIG_ANON_INODES=y
86# CONFIG_EPOLL is not set 91# CONFIG_EPOLL is not set
92CONFIG_SIGNALFD=y
93CONFIG_TIMERFD=y
94CONFIG_EVENTFD=y
87CONFIG_SHMEM=y 95CONFIG_SHMEM=y
88CONFIG_SLAB=y
89CONFIG_VM_EVENT_COUNTERS=y 96CONFIG_VM_EVENT_COUNTERS=y
97CONFIG_SLAB=y
98# CONFIG_SLUB is not set
99# CONFIG_SLOB is not set
90CONFIG_RT_MUTEXES=y 100CONFIG_RT_MUTEXES=y
91# CONFIG_TINY_SHMEM is not set 101# CONFIG_TINY_SHMEM is not set
92CONFIG_BASE_SMALL=0 102CONFIG_BASE_SMALL=0
93# CONFIG_SLOB is not set
94 103
95# 104#
96# Loadable module support 105# Loadable module support
@@ -122,19 +131,33 @@ CONFIG_DEFAULT_AS=y
122# CONFIG_DEFAULT_CFQ is not set 131# CONFIG_DEFAULT_CFQ is not set
123# CONFIG_DEFAULT_NOOP is not set 132# CONFIG_DEFAULT_NOOP is not set
124CONFIG_DEFAULT_IOSCHED="anticipatory" 133CONFIG_DEFAULT_IOSCHED="anticipatory"
125CONFIG_PPC_GEN550=y
126# CONFIG_WANT_EARLY_SERIAL is not set
127 134
128# 135#
129# Platform support 136# Platform support
130# 137#
138# CONFIG_PPC_MPC52xx is not set
139# CONFIG_PPC_MPC5200 is not set
140# CONFIG_PPC_CELL is not set
141# CONFIG_PPC_CELL_NATIVE is not set
142# CONFIG_PQ2ADS is not set
131CONFIG_MPC8313_RDB=y 143CONFIG_MPC8313_RDB=y
132# CONFIG_MPC832x_MDS is not set 144# CONFIG_MPC832x_MDS is not set
133# CONFIG_MPC834x_SYS is not set 145# CONFIG_MPC832x_RDB is not set
146# CONFIG_MPC834x_MDS is not set
134# CONFIG_MPC834x_ITX is not set 147# CONFIG_MPC834x_ITX is not set
135# CONFIG_MPC8360E_PB is not set 148# CONFIG_MPC836x_MDS is not set
136CONFIG_PPC_MPC831x=y 149CONFIG_PPC_MPC831x=y
137# CONFIG_MPIC is not set 150# CONFIG_MPIC is not set
151# CONFIG_MPIC_WEIRD is not set
152# CONFIG_PPC_I8259 is not set
153# CONFIG_PPC_RTAS is not set
154# CONFIG_MMIO_NVRAM is not set
155# CONFIG_PPC_MPC106 is not set
156# CONFIG_PPC_970_NAP is not set
157# CONFIG_PPC_INDIRECT_IO is not set
158# CONFIG_GENERIC_IOMAP is not set
159# CONFIG_CPU_FREQ is not set
160# CONFIG_CPM2 is not set
138 161
139# 162#
140# Kernel options 163# Kernel options
@@ -162,33 +185,34 @@ CONFIG_FLAT_NODE_MEM_MAP=y
162# CONFIG_SPARSEMEM_STATIC is not set 185# CONFIG_SPARSEMEM_STATIC is not set
163CONFIG_SPLIT_PTLOCK_CPUS=4 186CONFIG_SPLIT_PTLOCK_CPUS=4
164# CONFIG_RESOURCES_64BIT is not set 187# CONFIG_RESOURCES_64BIT is not set
188CONFIG_ZONE_DMA_FLAG=1
165CONFIG_PROC_DEVICETREE=y 189CONFIG_PROC_DEVICETREE=y
166# CONFIG_CMDLINE_BOOL is not set 190# CONFIG_CMDLINE_BOOL is not set
167# CONFIG_PM is not set 191# CONFIG_PM is not set
168CONFIG_SECCOMP=y 192CONFIG_SECCOMP=y
193CONFIG_WANT_DEVICE_TREE=y
194CONFIG_DEVICE_TREE=""
169CONFIG_ISA_DMA_API=y 195CONFIG_ISA_DMA_API=y
170 196
171# 197#
172# Bus options 198# Bus options
173# 199#
200CONFIG_ZONE_DMA=y
174CONFIG_GENERIC_ISA_DMA=y 201CONFIG_GENERIC_ISA_DMA=y
175# CONFIG_MPIC_WEIRD is not set
176# CONFIG_PPC_I8259 is not set
177CONFIG_PPC_INDIRECT_PCI=y 202CONFIG_PPC_INDIRECT_PCI=y
203# CONFIG_PPC_INDIRECT_PCI_BE is not set
178CONFIG_FSL_SOC=y 204CONFIG_FSL_SOC=y
179CONFIG_PCI=y 205CONFIG_PCI=y
180CONFIG_PCI_DOMAINS=y 206CONFIG_PCI_DOMAINS=y
181# CONFIG_PCIEPORTBUS is not set 207# CONFIG_PCIEPORTBUS is not set
208CONFIG_ARCH_SUPPORTS_MSI=y
209# CONFIG_PCI_MSI is not set
182# CONFIG_PCI_DEBUG is not set 210# CONFIG_PCI_DEBUG is not set
183 211
184# 212#
185# PCCARD (PCMCIA/CardBus) support 213# PCCARD (PCMCIA/CardBus) support
186# 214#
187# CONFIG_PCCARD is not set 215# CONFIG_PCCARD is not set
188
189#
190# PCI Hotplug Support
191#
192# CONFIG_HOTPLUG_PCI is not set 216# CONFIG_HOTPLUG_PCI is not set
193 217
194# 218#
@@ -213,13 +237,13 @@ CONFIG_NET=y
213# 237#
214# Networking options 238# Networking options
215# 239#
216# CONFIG_NETDEBUG is not set
217CONFIG_PACKET=y 240CONFIG_PACKET=y
218# CONFIG_PACKET_MMAP is not set 241# CONFIG_PACKET_MMAP is not set
219CONFIG_UNIX=y 242CONFIG_UNIX=y
220CONFIG_XFRM=y 243CONFIG_XFRM=y
221# CONFIG_XFRM_USER is not set 244# CONFIG_XFRM_USER is not set
222# CONFIG_XFRM_SUB_POLICY is not set 245# CONFIG_XFRM_SUB_POLICY is not set
246# CONFIG_XFRM_MIGRATE is not set
223# CONFIG_NET_KEY is not set 247# CONFIG_NET_KEY is not set
224CONFIG_INET=y 248CONFIG_INET=y
225CONFIG_IP_MULTICAST=y 249CONFIG_IP_MULTICAST=y
@@ -253,20 +277,8 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
253# CONFIG_INET6_TUNNEL is not set 277# CONFIG_INET6_TUNNEL is not set
254# CONFIG_NETWORK_SECMARK is not set 278# CONFIG_NETWORK_SECMARK is not set
255# CONFIG_NETFILTER is not set 279# CONFIG_NETFILTER is not set
256
257#
258# DCCP Configuration (EXPERIMENTAL)
259#
260# CONFIG_IP_DCCP is not set 280# CONFIG_IP_DCCP is not set
261
262#
263# SCTP Configuration (EXPERIMENTAL)
264#
265# CONFIG_IP_SCTP is not set 281# CONFIG_IP_SCTP is not set
266
267#
268# TIPC Configuration (EXPERIMENTAL)
269#
270# CONFIG_TIPC is not set 282# CONFIG_TIPC is not set
271# CONFIG_ATM is not set 283# CONFIG_ATM is not set
272# CONFIG_BRIDGE is not set 284# CONFIG_BRIDGE is not set
@@ -292,7 +304,16 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
292# CONFIG_HAMRADIO is not set 304# CONFIG_HAMRADIO is not set
293# CONFIG_IRDA is not set 305# CONFIG_IRDA is not set
294# CONFIG_BT is not set 306# CONFIG_BT is not set
307# CONFIG_AF_RXRPC is not set
308
309#
310# Wireless
311#
312# CONFIG_CFG80211 is not set
313# CONFIG_WIRELESS_EXT is not set
314# CONFIG_MAC80211 is not set
295# CONFIG_IEEE80211 is not set 315# CONFIG_IEEE80211 is not set
316# CONFIG_RFKILL is not set
296 317
297# 318#
298# Device Drivers 319# Device Drivers
@@ -305,16 +326,13 @@ CONFIG_STANDALONE=y
305CONFIG_PREVENT_FIRMWARE_BUILD=y 326CONFIG_PREVENT_FIRMWARE_BUILD=y
306# CONFIG_FW_LOADER is not set 327# CONFIG_FW_LOADER is not set
307# CONFIG_DEBUG_DRIVER is not set 328# CONFIG_DEBUG_DRIVER is not set
329# CONFIG_DEBUG_DEVRES is not set
308# CONFIG_SYS_HYPERVISOR is not set 330# CONFIG_SYS_HYPERVISOR is not set
309 331
310# 332#
311# Connector - unified userspace <-> kernelspace linker 333# Connector - unified userspace <-> kernelspace linker
312# 334#
313# CONFIG_CONNECTOR is not set 335# CONFIG_CONNECTOR is not set
314
315#
316# Memory Technology Devices (MTD)
317#
318CONFIG_MTD=y 336CONFIG_MTD=y
319# CONFIG_MTD_DEBUG is not set 337# CONFIG_MTD_DEBUG is not set
320# CONFIG_MTD_CONCAT is not set 338# CONFIG_MTD_CONCAT is not set
@@ -357,7 +375,6 @@ CONFIG_MTD_CFI_UTIL=y
357# CONFIG_MTD_RAM is not set 375# CONFIG_MTD_RAM is not set
358# CONFIG_MTD_ROM is not set 376# CONFIG_MTD_ROM is not set
359# CONFIG_MTD_ABSENT is not set 377# CONFIG_MTD_ABSENT is not set
360# CONFIG_MTD_OBSOLETE_CHIPS is not set
361 378
362# 379#
363# Mapping drivers for chip access 380# Mapping drivers for chip access
@@ -387,17 +404,13 @@ CONFIG_MTD_PHYSMAP_BANKWIDTH=2
387# CONFIG_MTD_DOC2000 is not set 404# CONFIG_MTD_DOC2000 is not set
388# CONFIG_MTD_DOC2001 is not set 405# CONFIG_MTD_DOC2001 is not set
389# CONFIG_MTD_DOC2001PLUS is not set 406# CONFIG_MTD_DOC2001PLUS is not set
390
391#
392# NAND Flash Device Drivers
393#
394# CONFIG_MTD_NAND is not set 407# CONFIG_MTD_NAND is not set
395# CONFIG_MTD_NAND_CAFE is not set 408# CONFIG_MTD_ONENAND is not set
396 409
397# 410#
398# OneNAND Flash Device Drivers 411# UBI - Unsorted block images
399# 412#
400# CONFIG_MTD_ONENAND is not set 413# CONFIG_MTD_UBI is not set
401 414
402# 415#
403# Parallel port support 416# Parallel port support
@@ -407,6 +420,7 @@ CONFIG_MTD_PHYSMAP_BANKWIDTH=2
407# 420#
408# Plug and Play support 421# Plug and Play support
409# 422#
423# CONFIG_PNPACPI is not set
410 424
411# 425#
412# Block devices 426# Block devices
@@ -426,19 +440,16 @@ CONFIG_BLK_DEV_RAM=y
426CONFIG_BLK_DEV_RAM_COUNT=16 440CONFIG_BLK_DEV_RAM_COUNT=16
427CONFIG_BLK_DEV_RAM_SIZE=32768 441CONFIG_BLK_DEV_RAM_SIZE=32768
428CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 442CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
429CONFIG_BLK_DEV_INITRD=y
430# CONFIG_CDROM_PKTCDVD is not set 443# CONFIG_CDROM_PKTCDVD is not set
431# CONFIG_ATA_OVER_ETH is not set 444# CONFIG_ATA_OVER_ETH is not set
432 445
433# 446#
434# Misc devices 447# Misc devices
435# 448#
449# CONFIG_PHANTOM is not set
436# CONFIG_SGI_IOC4 is not set 450# CONFIG_SGI_IOC4 is not set
437# CONFIG_TIFM_CORE is not set 451# CONFIG_TIFM_CORE is not set
438 452# CONFIG_BLINK is not set
439#
440# ATA/ATAPI/MFM/RLL support
441#
442# CONFIG_IDE is not set 453# CONFIG_IDE is not set
443 454
444# 455#
@@ -467,6 +478,7 @@ CONFIG_CHR_DEV_SG=y
467# CONFIG_SCSI_CONSTANTS is not set 478# CONFIG_SCSI_CONSTANTS is not set
468# CONFIG_SCSI_LOGGING is not set 479# CONFIG_SCSI_LOGGING is not set
469# CONFIG_SCSI_SCAN_ASYNC is not set 480# CONFIG_SCSI_SCAN_ASYNC is not set
481CONFIG_SCSI_WAIT_SCAN=m
470 482
471# 483#
472# SCSI Transports 484# SCSI Transports
@@ -514,10 +526,6 @@ CONFIG_SCSI_SPI_ATTRS=y
514# CONFIG_SCSI_NSP32 is not set 526# CONFIG_SCSI_NSP32 is not set
515# CONFIG_SCSI_DEBUG is not set 527# CONFIG_SCSI_DEBUG is not set
516# CONFIG_SCSI_SRP is not set 528# CONFIG_SCSI_SRP is not set
517
518#
519# Serial ATA (prod) and Parallel ATA (experimental) drivers
520#
521# CONFIG_ATA is not set 529# CONFIG_ATA is not set
522 530
523# 531#
@@ -545,18 +553,14 @@ CONFIG_MD_RAID1=y
545# 553#
546# IEEE 1394 (FireWire) support 554# IEEE 1394 (FireWire) support
547# 555#
556# CONFIG_FIREWIRE is not set
548# CONFIG_IEEE1394 is not set 557# CONFIG_IEEE1394 is not set
549 558
550# 559#
551# I2O device support 560# I2O device support
552# 561#
553# CONFIG_I2O is not set 562# CONFIG_I2O is not set
554 563# CONFIG_MACINTOSH_DRIVERS is not set
555#
556# Macintosh device drivers
557#
558# CONFIG_MAC_EMUMOUSEBTN is not set
559# CONFIG_WINDFARM is not set
560 564
561# 565#
562# Network device support 566# Network device support
@@ -566,15 +570,7 @@ CONFIG_NETDEVICES=y
566# CONFIG_BONDING is not set 570# CONFIG_BONDING is not set
567# CONFIG_EQUALIZER is not set 571# CONFIG_EQUALIZER is not set
568# CONFIG_TUN is not set 572# CONFIG_TUN is not set
569
570#
571# ARCnet devices
572#
573# CONFIG_ARCNET is not set 573# CONFIG_ARCNET is not set
574
575#
576# PHY device support
577#
578CONFIG_PHYLIB=y 574CONFIG_PHYLIB=y
579 575
580# 576#
@@ -624,10 +620,8 @@ CONFIG_E100=y
624# CONFIG_SUNDANCE is not set 620# CONFIG_SUNDANCE is not set
625# CONFIG_TLAN is not set 621# CONFIG_TLAN is not set
626# CONFIG_VIA_RHINE is not set 622# CONFIG_VIA_RHINE is not set
627 623# CONFIG_SC92031 is not set
628# 624CONFIG_NETDEV_1000=y
629# Ethernet (1000 Mbit)
630#
631# CONFIG_ACENIC is not set 625# CONFIG_ACENIC is not set
632# CONFIG_DL2K is not set 626# CONFIG_DL2K is not set
633# CONFIG_E1000 is not set 627# CONFIG_E1000 is not set
@@ -645,29 +639,32 @@ CONFIG_E100=y
645CONFIG_GIANFAR=y 639CONFIG_GIANFAR=y
646CONFIG_GFAR_NAPI=y 640CONFIG_GFAR_NAPI=y
647# CONFIG_QLA3XXX is not set 641# CONFIG_QLA3XXX is not set
648 642# CONFIG_ATL1 is not set
649# 643CONFIG_NETDEV_10000=y
650# Ethernet (10000 Mbit)
651#
652# CONFIG_CHELSIO_T1 is not set 644# CONFIG_CHELSIO_T1 is not set
645# CONFIG_CHELSIO_T3 is not set
653# CONFIG_IXGB is not set 646# CONFIG_IXGB is not set
654# CONFIG_S2IO is not set 647# CONFIG_S2IO is not set
655# CONFIG_MYRI10GE is not set 648# CONFIG_MYRI10GE is not set
656# CONFIG_NETXEN_NIC is not set 649# CONFIG_NETXEN_NIC is not set
657 650# CONFIG_MLX4_CORE is not set
658#
659# Token Ring devices
660#
661# CONFIG_TR is not set 651# CONFIG_TR is not set
662 652
663# 653#
664# Wireless LAN (non-hamradio) 654# Wireless LAN
665# 655#
666# CONFIG_NET_RADIO is not set 656# CONFIG_WLAN_PRE80211 is not set
657# CONFIG_WLAN_80211 is not set
667 658
668# 659#
669# Wan interfaces 660# USB Network Adapters
670# 661#
662# CONFIG_USB_CATC is not set
663# CONFIG_USB_KAWETH is not set
664# CONFIG_USB_PEGASUS is not set
665# CONFIG_USB_RTL8150 is not set
666# CONFIG_USB_USBNET_MII is not set
667# CONFIG_USB_USBNET is not set
671# CONFIG_WAN is not set 668# CONFIG_WAN is not set
672# CONFIG_FDDI is not set 669# CONFIG_FDDI is not set
673# CONFIG_HIPPI is not set 670# CONFIG_HIPPI is not set
@@ -694,6 +691,7 @@ CONFIG_GFAR_NAPI=y
694# 691#
695CONFIG_INPUT=y 692CONFIG_INPUT=y
696# CONFIG_INPUT_FF_MEMLESS is not set 693# CONFIG_INPUT_FF_MEMLESS is not set
694# CONFIG_INPUT_POLLDEV is not set
697 695
698# 696#
699# Userland interfaces 697# Userland interfaces
@@ -710,6 +708,7 @@ CONFIG_INPUT=y
710# CONFIG_INPUT_KEYBOARD is not set 708# CONFIG_INPUT_KEYBOARD is not set
711# CONFIG_INPUT_MOUSE is not set 709# CONFIG_INPUT_MOUSE is not set
712# CONFIG_INPUT_JOYSTICK is not set 710# CONFIG_INPUT_JOYSTICK is not set
711# CONFIG_INPUT_TABLET is not set
713# CONFIG_INPUT_TOUCHSCREEN is not set 712# CONFIG_INPUT_TOUCHSCREEN is not set
714# CONFIG_INPUT_MISC is not set 713# CONFIG_INPUT_MISC is not set
715 714
@@ -742,6 +741,7 @@ CONFIG_SERIAL_8250_RUNTIME_UARTS=4
742CONFIG_SERIAL_CORE=y 741CONFIG_SERIAL_CORE=y
743CONFIG_SERIAL_CORE_CONSOLE=y 742CONFIG_SERIAL_CORE_CONSOLE=y
744# CONFIG_SERIAL_JSM is not set 743# CONFIG_SERIAL_JSM is not set
744# CONFIG_SERIAL_OF_PLATFORM is not set
745CONFIG_UNIX98_PTYS=y 745CONFIG_UNIX98_PTYS=y
746CONFIG_LEGACY_PTYS=y 746CONFIG_LEGACY_PTYS=y
747CONFIG_LEGACY_PTY_COUNT=256 747CONFIG_LEGACY_PTY_COUNT=256
@@ -750,10 +750,6 @@ CONFIG_LEGACY_PTY_COUNT=256
750# IPMI 750# IPMI
751# 751#
752# CONFIG_IPMI_HANDLER is not set 752# CONFIG_IPMI_HANDLER is not set
753
754#
755# Watchdog Cards
756#
757CONFIG_WATCHDOG=y 753CONFIG_WATCHDOG=y
758# CONFIG_WATCHDOG_NOWAYOUT is not set 754# CONFIG_WATCHDOG_NOWAYOUT is not set
759 755
@@ -776,7 +772,6 @@ CONFIG_83xx_WDT=y
776CONFIG_HW_RANDOM=y 772CONFIG_HW_RANDOM=y
777# CONFIG_NVRAM is not set 773# CONFIG_NVRAM is not set
778# CONFIG_GEN_RTC is not set 774# CONFIG_GEN_RTC is not set
779# CONFIG_DTLK is not set
780# CONFIG_R3964 is not set 775# CONFIG_R3964 is not set
781# CONFIG_APPLICOM is not set 776# CONFIG_APPLICOM is not set
782# CONFIG_AGP is not set 777# CONFIG_AGP is not set
@@ -787,11 +782,9 @@ CONFIG_HW_RANDOM=y
787# TPM devices 782# TPM devices
788# 783#
789# CONFIG_TCG_TPM is not set 784# CONFIG_TCG_TPM is not set
790 785CONFIG_DEVPORT=y
791#
792# I2C support
793#
794CONFIG_I2C=y 786CONFIG_I2C=y
787CONFIG_I2C_BOARDINFO=y
795CONFIG_I2C_CHARDEV=y 788CONFIG_I2C_CHARDEV=y
796 789
797# 790#
@@ -818,14 +811,15 @@ CONFIG_I2C_MPC=y
818# CONFIG_I2C_PARPORT_LIGHT is not set 811# CONFIG_I2C_PARPORT_LIGHT is not set
819# CONFIG_I2C_PROSAVAGE is not set 812# CONFIG_I2C_PROSAVAGE is not set
820# CONFIG_I2C_SAVAGE4 is not set 813# CONFIG_I2C_SAVAGE4 is not set
814# CONFIG_I2C_SIMTEC is not set
821# CONFIG_I2C_SIS5595 is not set 815# CONFIG_I2C_SIS5595 is not set
822# CONFIG_I2C_SIS630 is not set 816# CONFIG_I2C_SIS630 is not set
823# CONFIG_I2C_SIS96X is not set 817# CONFIG_I2C_SIS96X is not set
824# CONFIG_I2C_STUB is not set 818# CONFIG_I2C_STUB is not set
819# CONFIG_I2C_TINY_USB is not set
825# CONFIG_I2C_VIA is not set 820# CONFIG_I2C_VIA is not set
826# CONFIG_I2C_VIAPRO is not set 821# CONFIG_I2C_VIAPRO is not set
827# CONFIG_I2C_VOODOO3 is not set 822# CONFIG_I2C_VOODOO3 is not set
828# CONFIG_I2C_PCA_ISA is not set
829 823
830# 824#
831# Miscellaneous I2C Chip support 825# Miscellaneous I2C Chip support
@@ -859,21 +853,21 @@ CONFIG_SPI_MPC83xx=y
859# 853#
860# SPI Protocol Masters 854# SPI Protocol Masters
861# 855#
856# CONFIG_SPI_AT25 is not set
857# CONFIG_SPI_SPIDEV is not set
862 858
863# 859#
864# Dallas's 1-wire bus 860# Dallas's 1-wire bus
865# 861#
866# CONFIG_W1 is not set 862# CONFIG_W1 is not set
867
868#
869# Hardware Monitoring support
870#
871CONFIG_HWMON=y 863CONFIG_HWMON=y
872# CONFIG_HWMON_VID is not set 864# CONFIG_HWMON_VID is not set
873# CONFIG_SENSORS_ABITUGURU is not set 865# CONFIG_SENSORS_ABITUGURU is not set
866# CONFIG_SENSORS_AD7418 is not set
874# CONFIG_SENSORS_ADM1021 is not set 867# CONFIG_SENSORS_ADM1021 is not set
875# CONFIG_SENSORS_ADM1025 is not set 868# CONFIG_SENSORS_ADM1025 is not set
876# CONFIG_SENSORS_ADM1026 is not set 869# CONFIG_SENSORS_ADM1026 is not set
870# CONFIG_SENSORS_ADM1029 is not set
877# CONFIG_SENSORS_ADM1031 is not set 871# CONFIG_SENSORS_ADM1031 is not set
878# CONFIG_SENSORS_ADM9240 is not set 872# CONFIG_SENSORS_ADM9240 is not set
879# CONFIG_SENSORS_ASB100 is not set 873# CONFIG_SENSORS_ASB100 is not set
@@ -897,6 +891,7 @@ CONFIG_HWMON=y
897# CONFIG_SENSORS_LM90 is not set 891# CONFIG_SENSORS_LM90 is not set
898# CONFIG_SENSORS_LM92 is not set 892# CONFIG_SENSORS_LM92 is not set
899# CONFIG_SENSORS_MAX1619 is not set 893# CONFIG_SENSORS_MAX1619 is not set
894# CONFIG_SENSORS_MAX6650 is not set
900# CONFIG_SENSORS_PC87360 is not set 895# CONFIG_SENSORS_PC87360 is not set
901# CONFIG_SENSORS_PC87427 is not set 896# CONFIG_SENSORS_PC87427 is not set
902# CONFIG_SENSORS_SIS5595 is not set 897# CONFIG_SENSORS_SIS5595 is not set
@@ -916,23 +911,30 @@ CONFIG_HWMON=y
916# CONFIG_HWMON_DEBUG_CHIP is not set 911# CONFIG_HWMON_DEBUG_CHIP is not set
917 912
918# 913#
919# Multimedia devices 914# Multifunction device drivers
920# 915#
921# CONFIG_VIDEO_DEV is not set 916# CONFIG_MFD_SM501 is not set
922 917
923# 918#
924# Digital Video Broadcasting Devices 919# Multimedia devices
925# 920#
926# CONFIG_DVB is not set 921# CONFIG_VIDEO_DEV is not set
922# CONFIG_DVB_CORE is not set
923CONFIG_DAB=y
927# CONFIG_USB_DABUSB is not set 924# CONFIG_USB_DABUSB is not set
928 925
929# 926#
930# Graphics support 927# Graphics support
931# 928#
932CONFIG_FIRMWARE_EDID=y 929# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
930
931#
932# Display device support
933#
934# CONFIG_DISPLAY_SUPPORT is not set
935# CONFIG_VGASTATE is not set
933# CONFIG_FB is not set 936# CONFIG_FB is not set
934# CONFIG_FB_IBM_GXT4500 is not set 937# CONFIG_FB_IBM_GXT4500 is not set
935# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
936 938
937# 939#
938# Sound 940# Sound
@@ -943,6 +945,18 @@ CONFIG_FIRMWARE_EDID=y
943# HID Devices 945# HID Devices
944# 946#
945CONFIG_HID=y 947CONFIG_HID=y
948# CONFIG_HID_DEBUG is not set
949
950#
951# USB Input Devices
952#
953# CONFIG_USB_HID is not set
954
955#
956# USB HID Boot Protocol drivers
957#
958# CONFIG_USB_KBD is not set
959# CONFIG_USB_MOUSE is not set
946 960
947# 961#
948# USB support 962# USB support
@@ -957,7 +971,7 @@ CONFIG_USB=y
957# Miscellaneous USB options 971# Miscellaneous USB options
958# 972#
959CONFIG_USB_DEVICEFS=y 973CONFIG_USB_DEVICEFS=y
960# CONFIG_USB_BANDWIDTH is not set 974CONFIG_USB_DEVICE_CLASS=y
961# CONFIG_USB_DYNAMIC_MINORS is not set 975# CONFIG_USB_DYNAMIC_MINORS is not set
962# CONFIG_USB_OTG is not set 976# CONFIG_USB_OTG is not set
963 977
@@ -968,9 +982,15 @@ CONFIG_USB_EHCI_HCD=y
968# CONFIG_USB_EHCI_SPLIT_ISO is not set 982# CONFIG_USB_EHCI_SPLIT_ISO is not set
969# CONFIG_USB_EHCI_ROOT_HUB_TT is not set 983# CONFIG_USB_EHCI_ROOT_HUB_TT is not set
970# CONFIG_USB_EHCI_TT_NEWSCHED is not set 984# CONFIG_USB_EHCI_TT_NEWSCHED is not set
985# CONFIG_USB_EHCI_BIG_ENDIAN_MMIO is not set
971# CONFIG_USB_ISP116X_HCD is not set 986# CONFIG_USB_ISP116X_HCD is not set
972CONFIG_USB_OHCI_HCD=y 987CONFIG_USB_OHCI_HCD=y
973# CONFIG_USB_OHCI_BIG_ENDIAN is not set 988CONFIG_USB_OHCI_HCD_PPC_OF=y
989CONFIG_USB_OHCI_HCD_PPC_OF_BE=y
990# CONFIG_USB_OHCI_HCD_PPC_OF_LE is not set
991CONFIG_USB_OHCI_HCD_PCI=y
992CONFIG_USB_OHCI_BIG_ENDIAN_DESC=y
993CONFIG_USB_OHCI_BIG_ENDIAN_MMIO=y
974CONFIG_USB_OHCI_LITTLE_ENDIAN=y 994CONFIG_USB_OHCI_LITTLE_ENDIAN=y
975CONFIG_USB_UHCI_HCD=y 995CONFIG_USB_UHCI_HCD=y
976# CONFIG_USB_SL811_HCD is not set 996# CONFIG_USB_SL811_HCD is not set
@@ -1002,43 +1022,10 @@ CONFIG_USB_STORAGE=y
1002# CONFIG_USB_LIBUSUAL is not set 1022# CONFIG_USB_LIBUSUAL is not set
1003 1023
1004# 1024#
1005# USB Input Devices
1006#
1007# CONFIG_USB_HID is not set
1008
1009#
1010# USB HID Boot Protocol drivers
1011#
1012# CONFIG_USB_KBD is not set
1013# CONFIG_USB_MOUSE is not set
1014# CONFIG_USB_AIPTEK is not set
1015# CONFIG_USB_WACOM is not set
1016# CONFIG_USB_ACECAD is not set
1017# CONFIG_USB_KBTAB is not set
1018# CONFIG_USB_POWERMATE is not set
1019# CONFIG_USB_TOUCHSCREEN is not set
1020# CONFIG_USB_YEALINK is not set
1021# CONFIG_USB_XPAD is not set
1022# CONFIG_USB_ATI_REMOTE is not set
1023# CONFIG_USB_ATI_REMOTE2 is not set
1024# CONFIG_USB_KEYSPAN_REMOTE is not set
1025# CONFIG_USB_APPLETOUCH is not set
1026
1027#
1028# USB Imaging devices 1025# USB Imaging devices
1029# 1026#
1030# CONFIG_USB_MDC800 is not set 1027# CONFIG_USB_MDC800 is not set
1031# CONFIG_USB_MICROTEK is not set 1028# CONFIG_USB_MICROTEK is not set
1032
1033#
1034# USB Network Adapters
1035#
1036# CONFIG_USB_CATC is not set
1037# CONFIG_USB_KAWETH is not set
1038# CONFIG_USB_PEGASUS is not set
1039# CONFIG_USB_RTL8150 is not set
1040# CONFIG_USB_USBNET_MII is not set
1041# CONFIG_USB_USBNET is not set
1042CONFIG_USB_MON=y 1029CONFIG_USB_MON=y
1043 1030
1044# 1031#
@@ -1060,6 +1047,7 @@ CONFIG_USB_MON=y
1060# CONFIG_USB_RIO500 is not set 1047# CONFIG_USB_RIO500 is not set
1061# CONFIG_USB_LEGOTOWER is not set 1048# CONFIG_USB_LEGOTOWER is not set
1062# CONFIG_USB_LCD is not set 1049# CONFIG_USB_LCD is not set
1050# CONFIG_USB_BERRY_CHARGE is not set
1063# CONFIG_USB_LED is not set 1051# CONFIG_USB_LED is not set
1064# CONFIG_USB_CYPRESS_CY7C63 is not set 1052# CONFIG_USB_CYPRESS_CY7C63 is not set
1065# CONFIG_USB_CYTHERM is not set 1053# CONFIG_USB_CYTHERM is not set
@@ -1070,6 +1058,7 @@ CONFIG_USB_MON=y
1070# CONFIG_USB_SISUSBVGA is not set 1058# CONFIG_USB_SISUSBVGA is not set
1071# CONFIG_USB_LD is not set 1059# CONFIG_USB_LD is not set
1072# CONFIG_USB_TRANCEVIBRATOR is not set 1060# CONFIG_USB_TRANCEVIBRATOR is not set
1061# CONFIG_USB_IOWARRIOR is not set
1073# CONFIG_USB_TEST is not set 1062# CONFIG_USB_TEST is not set
1074 1063
1075# 1064#
@@ -1082,6 +1071,7 @@ CONFIG_USB_MON=y
1082CONFIG_USB_GADGET=y 1071CONFIG_USB_GADGET=y
1083# CONFIG_USB_GADGET_DEBUG_FILES is not set 1072# CONFIG_USB_GADGET_DEBUG_FILES is not set
1084CONFIG_USB_GADGET_SELECTED=y 1073CONFIG_USB_GADGET_SELECTED=y
1074# CONFIG_USB_GADGET_FSL_USB2 is not set
1085CONFIG_USB_GADGET_NET2280=y 1075CONFIG_USB_GADGET_NET2280=y
1086CONFIG_USB_NET2280=y 1076CONFIG_USB_NET2280=y
1087# CONFIG_USB_GADGET_PXA2XX is not set 1077# CONFIG_USB_GADGET_PXA2XX is not set
@@ -1098,10 +1088,6 @@ CONFIG_USB_ETH_RNDIS=y
1098# CONFIG_USB_FILE_STORAGE is not set 1088# CONFIG_USB_FILE_STORAGE is not set
1099# CONFIG_USB_G_SERIAL is not set 1089# CONFIG_USB_G_SERIAL is not set
1100# CONFIG_USB_MIDI_GADGET is not set 1090# CONFIG_USB_MIDI_GADGET is not set
1101
1102#
1103# MMC/SD Card support
1104#
1105# CONFIG_MMC is not set 1091# CONFIG_MMC is not set
1106 1092
1107# 1093#
@@ -1142,26 +1128,39 @@ CONFIG_RTC_INTF_SYSFS=y
1142CONFIG_RTC_INTF_PROC=y 1128CONFIG_RTC_INTF_PROC=y
1143CONFIG_RTC_INTF_DEV=y 1129CONFIG_RTC_INTF_DEV=y
1144CONFIG_RTC_INTF_DEV_UIE_EMUL=y 1130CONFIG_RTC_INTF_DEV_UIE_EMUL=y
1131# CONFIG_RTC_DRV_TEST is not set
1145 1132
1146# 1133#
1147# RTC drivers 1134# I2C RTC drivers
1148# 1135#
1149# CONFIG_RTC_DRV_X1205 is not set
1150CONFIG_RTC_DRV_DS1307=y 1136CONFIG_RTC_DRV_DS1307=y
1151# CONFIG_RTC_DRV_DS1553 is not set
1152# CONFIG_RTC_DRV_ISL1208 is not set
1153# CONFIG_RTC_DRV_DS1672 is not set 1137# CONFIG_RTC_DRV_DS1672 is not set
1154# CONFIG_RTC_DRV_DS1742 is not set 1138# CONFIG_RTC_DRV_MAX6900 is not set
1139# CONFIG_RTC_DRV_RS5C372 is not set
1140# CONFIG_RTC_DRV_ISL1208 is not set
1141# CONFIG_RTC_DRV_X1205 is not set
1155# CONFIG_RTC_DRV_PCF8563 is not set 1142# CONFIG_RTC_DRV_PCF8563 is not set
1156# CONFIG_RTC_DRV_PCF8583 is not set 1143# CONFIG_RTC_DRV_PCF8583 is not set
1144
1145#
1146# SPI RTC drivers
1147#
1157# CONFIG_RTC_DRV_RS5C348 is not set 1148# CONFIG_RTC_DRV_RS5C348 is not set
1158# CONFIG_RTC_DRV_RS5C372 is not set
1159# CONFIG_RTC_DRV_M48T86 is not set
1160# CONFIG_RTC_DRV_TEST is not set
1161# CONFIG_RTC_DRV_MAX6902 is not set 1149# CONFIG_RTC_DRV_MAX6902 is not set
1150
1151#
1152# Platform RTC drivers
1153#
1154# CONFIG_RTC_DRV_DS1553 is not set
1155# CONFIG_RTC_DRV_DS1742 is not set
1156# CONFIG_RTC_DRV_M48T86 is not set
1162# CONFIG_RTC_DRV_V3020 is not set 1157# CONFIG_RTC_DRV_V3020 is not set
1163 1158
1164# 1159#
1160# on-CPU RTC drivers
1161#
1162
1163#
1165# DMA Engine support 1164# DMA Engine support
1166# 1165#
1167CONFIG_DMA_ENGINE=y 1166CONFIG_DMA_ENGINE=y
@@ -1177,10 +1176,6 @@ CONFIG_NET_DMA=y
1177CONFIG_INTEL_IOATDMA=y 1176CONFIG_INTEL_IOATDMA=y
1178 1177
1179# 1178#
1180# Virtualization
1181#
1182
1183#
1184# File systems 1179# File systems
1185# 1180#
1186CONFIG_EXT2_FS=y 1181CONFIG_EXT2_FS=y
@@ -1269,6 +1264,7 @@ CONFIG_LOCKD_V4=y
1269CONFIG_NFS_COMMON=y 1264CONFIG_NFS_COMMON=y
1270CONFIG_SUNRPC=y 1265CONFIG_SUNRPC=y
1271CONFIG_SUNRPC_GSS=y 1266CONFIG_SUNRPC_GSS=y
1267# CONFIG_SUNRPC_BIND34 is not set
1272CONFIG_RPCSEC_GSS_KRB5=y 1268CONFIG_RPCSEC_GSS_KRB5=y
1273# CONFIG_RPCSEC_GSS_SPKM3 is not set 1269# CONFIG_RPCSEC_GSS_SPKM3 is not set
1274# CONFIG_SMB_FS is not set 1270# CONFIG_SMB_FS is not set
@@ -1298,6 +1294,7 @@ CONFIG_MSDOS_PARTITION=y
1298# CONFIG_SUN_PARTITION is not set 1294# CONFIG_SUN_PARTITION is not set
1299# CONFIG_KARMA_PARTITION is not set 1295# CONFIG_KARMA_PARTITION is not set
1300# CONFIG_EFI_PARTITION is not set 1296# CONFIG_EFI_PARTITION is not set
1297# CONFIG_SYSV68_PARTITION is not set
1301 1298
1302# 1299#
1303# Native Language Support 1300# Native Language Support
@@ -1308,6 +1305,7 @@ CONFIG_MSDOS_PARTITION=y
1308# Distributed Lock Manager 1305# Distributed Lock Manager
1309# 1306#
1310# CONFIG_DLM is not set 1307# CONFIG_DLM is not set
1308# CONFIG_UCC_SLOW is not set
1311 1309
1312# 1310#
1313# Library routines 1311# Library routines
@@ -1315,10 +1313,13 @@ CONFIG_MSDOS_PARTITION=y
1315CONFIG_BITREVERSE=y 1313CONFIG_BITREVERSE=y
1316# CONFIG_CRC_CCITT is not set 1314# CONFIG_CRC_CCITT is not set
1317# CONFIG_CRC16 is not set 1315# CONFIG_CRC16 is not set
1316# CONFIG_CRC_ITU_T is not set
1318CONFIG_CRC32=y 1317CONFIG_CRC32=y
1319# CONFIG_LIBCRC32C is not set 1318# CONFIG_LIBCRC32C is not set
1320CONFIG_PLIST=y 1319CONFIG_PLIST=y
1321CONFIG_IOMAP_COPY=y 1320CONFIG_HAS_IOMEM=y
1321CONFIG_HAS_IOPORT=y
1322CONFIG_HAS_DMA=y
1322 1323
1323# 1324#
1324# Instrumentation Support 1325# Instrumentation Support
@@ -1335,15 +1336,15 @@ CONFIG_ENABLE_MUST_CHECK=y
1335# CONFIG_DEBUG_FS is not set 1336# CONFIG_DEBUG_FS is not set
1336# CONFIG_HEADERS_CHECK is not set 1337# CONFIG_HEADERS_CHECK is not set
1337CONFIG_DEBUG_KERNEL=y 1338CONFIG_DEBUG_KERNEL=y
1338CONFIG_LOG_BUF_SHIFT=14 1339# CONFIG_DEBUG_SHIRQ is not set
1339CONFIG_DETECT_SOFTLOCKUP=y 1340CONFIG_DETECT_SOFTLOCKUP=y
1340# CONFIG_SCHEDSTATS is not set 1341# CONFIG_SCHEDSTATS is not set
1342# CONFIG_TIMER_STATS is not set
1341# CONFIG_DEBUG_SLAB is not set 1343# CONFIG_DEBUG_SLAB is not set
1342# CONFIG_DEBUG_RT_MUTEXES is not set 1344# CONFIG_DEBUG_RT_MUTEXES is not set
1343# CONFIG_RT_MUTEX_TESTER is not set 1345# CONFIG_RT_MUTEX_TESTER is not set
1344# CONFIG_DEBUG_SPINLOCK is not set 1346# CONFIG_DEBUG_SPINLOCK is not set
1345# CONFIG_DEBUG_MUTEXES is not set 1347# CONFIG_DEBUG_MUTEXES is not set
1346# CONFIG_DEBUG_RWSEMS is not set
1347# CONFIG_DEBUG_SPINLOCK_SLEEP is not set 1348# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
1348# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set 1349# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
1349# CONFIG_DEBUG_KOBJECT is not set 1350# CONFIG_DEBUG_KOBJECT is not set
@@ -1353,12 +1354,13 @@ CONFIG_DETECT_SOFTLOCKUP=y
1353# CONFIG_DEBUG_LIST is not set 1354# CONFIG_DEBUG_LIST is not set
1354CONFIG_FORCED_INLINING=y 1355CONFIG_FORCED_INLINING=y
1355# CONFIG_RCU_TORTURE_TEST is not set 1356# CONFIG_RCU_TORTURE_TEST is not set
1357# CONFIG_FAULT_INJECTION is not set
1356# CONFIG_DEBUG_STACKOVERFLOW is not set 1358# CONFIG_DEBUG_STACKOVERFLOW is not set
1357# CONFIG_DEBUG_STACK_USAGE is not set 1359# CONFIG_DEBUG_STACK_USAGE is not set
1360# CONFIG_DEBUG_PAGEALLOC is not set
1358# CONFIG_DEBUGGER is not set 1361# CONFIG_DEBUGGER is not set
1359# CONFIG_BDI_SWITCH is not set 1362# CONFIG_BDI_SWITCH is not set
1360# CONFIG_BOOTX_TEXT is not set 1363# CONFIG_BOOTX_TEXT is not set
1361# CONFIG_SERIAL_TEXT_DEBUG is not set
1362# CONFIG_PPC_EARLY_DEBUG is not set 1364# CONFIG_PPC_EARLY_DEBUG is not set
1363 1365
1364# 1366#
@@ -1387,8 +1389,11 @@ CONFIG_CRYPTO_MD5=y
1387# CONFIG_CRYPTO_GF128MUL is not set 1389# CONFIG_CRYPTO_GF128MUL is not set
1388# CONFIG_CRYPTO_ECB is not set 1390# CONFIG_CRYPTO_ECB is not set
1389CONFIG_CRYPTO_CBC=y 1391CONFIG_CRYPTO_CBC=y
1392CONFIG_CRYPTO_PCBC=m
1390# CONFIG_CRYPTO_LRW is not set 1393# CONFIG_CRYPTO_LRW is not set
1394# CONFIG_CRYPTO_CRYPTD is not set
1391CONFIG_CRYPTO_DES=y 1395CONFIG_CRYPTO_DES=y
1396# CONFIG_CRYPTO_FCRYPT is not set
1392# CONFIG_CRYPTO_BLOWFISH is not set 1397# CONFIG_CRYPTO_BLOWFISH is not set
1393# CONFIG_CRYPTO_TWOFISH is not set 1398# CONFIG_CRYPTO_TWOFISH is not set
1394# CONFIG_CRYPTO_SERPENT is not set 1399# CONFIG_CRYPTO_SERPENT is not set
@@ -1402,6 +1407,7 @@ CONFIG_CRYPTO_DES=y
1402# CONFIG_CRYPTO_DEFLATE is not set 1407# CONFIG_CRYPTO_DEFLATE is not set
1403# CONFIG_CRYPTO_MICHAEL_MIC is not set 1408# CONFIG_CRYPTO_MICHAEL_MIC is not set
1404# CONFIG_CRYPTO_CRC32C is not set 1409# CONFIG_CRYPTO_CRC32C is not set
1410# CONFIG_CRYPTO_CAMELLIA is not set
1405# CONFIG_CRYPTO_TEST is not set 1411# CONFIG_CRYPTO_TEST is not set
1406 1412
1407# 1413#
diff --git a/arch/powerpc/configs/mpc832x_mds_defconfig b/arch/powerpc/configs/mpc832x_mds_defconfig
index 83192c0dc5bb..75ce78139a11 100644
--- a/arch/powerpc/configs/mpc832x_mds_defconfig
+++ b/arch/powerpc/configs/mpc832x_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.21-rc5 3# Linux kernel version: 2.6.22-rc7
4# Mon Apr 9 16:09:16 2007 4# Sun Jul 1 23:56:55 2007
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7CONFIG_PPC32=y 7CONFIG_PPC32=y
@@ -45,6 +45,7 @@ CONFIG_PPC_FPU=y
45# CONFIG_PPC_DCR_MMIO is not set 45# CONFIG_PPC_DCR_MMIO is not set
46CONFIG_PPC_STD_MMU=y 46CONFIG_PPC_STD_MMU=y
47CONFIG_PPC_STD_MMU_32=y 47CONFIG_PPC_STD_MMU_32=y
48# CONFIG_PPC_MM_SLICES is not set
48# CONFIG_SMP is not set 49# CONFIG_SMP is not set
49CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 50CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
50 51
@@ -70,6 +71,7 @@ CONFIG_SYSVIPC_SYSCTL=y
70# CONFIG_UTS_NS is not set 71# CONFIG_UTS_NS is not set
71# CONFIG_AUDIT is not set 72# CONFIG_AUDIT is not set
72# CONFIG_IKCONFIG is not set 73# CONFIG_IKCONFIG is not set
74CONFIG_LOG_BUF_SHIFT=14
73CONFIG_SYSFS_DEPRECATED=y 75CONFIG_SYSFS_DEPRECATED=y
74# CONFIG_RELAY is not set 76# CONFIG_RELAY is not set
75CONFIG_BLK_DEV_INITRD=y 77CONFIG_BLK_DEV_INITRD=y
@@ -85,14 +87,19 @@ CONFIG_BUG=y
85CONFIG_ELF_CORE=y 87CONFIG_ELF_CORE=y
86CONFIG_BASE_FULL=y 88CONFIG_BASE_FULL=y
87CONFIG_FUTEX=y 89CONFIG_FUTEX=y
90CONFIG_ANON_INODES=y
88# CONFIG_EPOLL is not set 91# CONFIG_EPOLL is not set
92CONFIG_SIGNALFD=y
93CONFIG_TIMERFD=y
94CONFIG_EVENTFD=y
89CONFIG_SHMEM=y 95CONFIG_SHMEM=y
90CONFIG_SLAB=y
91CONFIG_VM_EVENT_COUNTERS=y 96CONFIG_VM_EVENT_COUNTERS=y
97CONFIG_SLAB=y
98# CONFIG_SLUB is not set
99# CONFIG_SLOB is not set
92CONFIG_RT_MUTEXES=y 100CONFIG_RT_MUTEXES=y
93# CONFIG_TINY_SHMEM is not set 101# CONFIG_TINY_SHMEM is not set
94CONFIG_BASE_SMALL=0 102CONFIG_BASE_SMALL=0
95# CONFIG_SLOB is not set
96 103
97# 104#
98# Loadable module support 105# Loadable module support
@@ -124,12 +131,15 @@ CONFIG_DEFAULT_AS=y
124# CONFIG_DEFAULT_CFQ is not set 131# CONFIG_DEFAULT_CFQ is not set
125# CONFIG_DEFAULT_NOOP is not set 132# CONFIG_DEFAULT_NOOP is not set
126CONFIG_DEFAULT_IOSCHED="anticipatory" 133CONFIG_DEFAULT_IOSCHED="anticipatory"
127CONFIG_QUICC_ENGINE=y
128# CONFIG_WANT_EARLY_SERIAL is not set
129 134
130# 135#
131# Platform support 136# Platform support
132# 137#
138# CONFIG_PPC_MPC52xx is not set
139# CONFIG_PPC_MPC5200 is not set
140# CONFIG_PPC_CELL is not set
141# CONFIG_PPC_CELL_NATIVE is not set
142# CONFIG_PQ2ADS is not set
133# CONFIG_MPC8313_RDB is not set 143# CONFIG_MPC8313_RDB is not set
134CONFIG_MPC832x_MDS=y 144CONFIG_MPC832x_MDS=y
135# CONFIG_MPC832x_RDB is not set 145# CONFIG_MPC832x_RDB is not set
@@ -138,6 +148,17 @@ CONFIG_MPC832x_MDS=y
138# CONFIG_MPC836x_MDS is not set 148# CONFIG_MPC836x_MDS is not set
139CONFIG_PPC_MPC832x=y 149CONFIG_PPC_MPC832x=y
140# CONFIG_MPIC is not set 150# CONFIG_MPIC is not set
151# CONFIG_MPIC_WEIRD is not set
152# CONFIG_PPC_I8259 is not set
153# CONFIG_PPC_RTAS is not set
154# CONFIG_MMIO_NVRAM is not set
155# CONFIG_PPC_MPC106 is not set
156# CONFIG_PPC_970_NAP is not set
157# CONFIG_PPC_INDIRECT_IO is not set
158# CONFIG_GENERIC_IOMAP is not set
159# CONFIG_CPU_FREQ is not set
160CONFIG_QUICC_ENGINE=y
161# CONFIG_CPM2 is not set
141 162
142# 163#
143# Kernel options 164# Kernel options
@@ -171,6 +192,8 @@ CONFIG_PROC_DEVICETREE=y
171# CONFIG_CMDLINE_BOOL is not set 192# CONFIG_CMDLINE_BOOL is not set
172# CONFIG_PM is not set 193# CONFIG_PM is not set
173CONFIG_SECCOMP=y 194CONFIG_SECCOMP=y
195CONFIG_WANT_DEVICE_TREE=y
196CONFIG_DEVICE_TREE=""
174CONFIG_ISA_DMA_API=y 197CONFIG_ISA_DMA_API=y
175 198
176# 199#
@@ -178,22 +201,19 @@ CONFIG_ISA_DMA_API=y
178# 201#
179CONFIG_ZONE_DMA=y 202CONFIG_ZONE_DMA=y
180CONFIG_GENERIC_ISA_DMA=y 203CONFIG_GENERIC_ISA_DMA=y
181# CONFIG_MPIC_WEIRD is not set
182# CONFIG_PPC_I8259 is not set
183CONFIG_PPC_INDIRECT_PCI=y 204CONFIG_PPC_INDIRECT_PCI=y
205# CONFIG_PPC_INDIRECT_PCI_BE is not set
184CONFIG_FSL_SOC=y 206CONFIG_FSL_SOC=y
185CONFIG_PCI=y 207CONFIG_PCI=y
186CONFIG_PCI_DOMAINS=y 208CONFIG_PCI_DOMAINS=y
187# CONFIG_PCIEPORTBUS is not set 209# CONFIG_PCIEPORTBUS is not set
210CONFIG_ARCH_SUPPORTS_MSI=y
211# CONFIG_PCI_MSI is not set
188 212
189# 213#
190# PCCARD (PCMCIA/CardBus) support 214# PCCARD (PCMCIA/CardBus) support
191# 215#
192# CONFIG_PCCARD is not set 216# CONFIG_PCCARD is not set
193
194#
195# PCI Hotplug Support
196#
197# CONFIG_HOTPLUG_PCI is not set 217# CONFIG_HOTPLUG_PCI is not set
198 218
199# 219#
@@ -218,7 +238,6 @@ CONFIG_NET=y
218# 238#
219# Networking options 239# Networking options
220# 240#
221# CONFIG_NETDEBUG is not set
222CONFIG_PACKET=y 241CONFIG_PACKET=y
223# CONFIG_PACKET_MMAP is not set 242# CONFIG_PACKET_MMAP is not set
224CONFIG_UNIX=y 243CONFIG_UNIX=y
@@ -259,20 +278,8 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
259# CONFIG_INET6_TUNNEL is not set 278# CONFIG_INET6_TUNNEL is not set
260# CONFIG_NETWORK_SECMARK is not set 279# CONFIG_NETWORK_SECMARK is not set
261# CONFIG_NETFILTER is not set 280# CONFIG_NETFILTER is not set
262
263#
264# DCCP Configuration (EXPERIMENTAL)
265#
266# CONFIG_IP_DCCP is not set 281# CONFIG_IP_DCCP is not set
267
268#
269# SCTP Configuration (EXPERIMENTAL)
270#
271# CONFIG_IP_SCTP is not set 282# CONFIG_IP_SCTP is not set
272
273#
274# TIPC Configuration (EXPERIMENTAL)
275#
276# CONFIG_TIPC is not set 283# CONFIG_TIPC is not set
277# CONFIG_ATM is not set 284# CONFIG_ATM is not set
278# CONFIG_BRIDGE is not set 285# CONFIG_BRIDGE is not set
@@ -298,7 +305,16 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
298# CONFIG_HAMRADIO is not set 305# CONFIG_HAMRADIO is not set
299# CONFIG_IRDA is not set 306# CONFIG_IRDA is not set
300# CONFIG_BT is not set 307# CONFIG_BT is not set
308# CONFIG_AF_RXRPC is not set
309
310#
311# Wireless
312#
313# CONFIG_CFG80211 is not set
314# CONFIG_WIRELESS_EXT is not set
315# CONFIG_MAC80211 is not set
301# CONFIG_IEEE80211 is not set 316# CONFIG_IEEE80211 is not set
317# CONFIG_RFKILL is not set
302 318
303# 319#
304# Device Drivers 320# Device Drivers
@@ -316,10 +332,6 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y
316# Connector - unified userspace <-> kernelspace linker 332# Connector - unified userspace <-> kernelspace linker
317# 333#
318# CONFIG_CONNECTOR is not set 334# CONFIG_CONNECTOR is not set
319
320#
321# Memory Technology Devices (MTD)
322#
323# CONFIG_MTD is not set 335# CONFIG_MTD is not set
324 336
325# 337#
@@ -355,12 +367,10 @@ CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
355# 367#
356# Misc devices 368# Misc devices
357# 369#
370# CONFIG_PHANTOM is not set
358# CONFIG_SGI_IOC4 is not set 371# CONFIG_SGI_IOC4 is not set
359# CONFIG_TIFM_CORE is not set 372# CONFIG_TIFM_CORE is not set
360 373# CONFIG_BLINK is not set
361#
362# ATA/ATAPI/MFM/RLL support
363#
364# CONFIG_IDE is not set 374# CONFIG_IDE is not set
365 375
366# 376#
@@ -389,6 +399,7 @@ CONFIG_SCSI_PROC_FS=y
389# CONFIG_SCSI_CONSTANTS is not set 399# CONFIG_SCSI_CONSTANTS is not set
390# CONFIG_SCSI_LOGGING is not set 400# CONFIG_SCSI_LOGGING is not set
391# CONFIG_SCSI_SCAN_ASYNC is not set 401# CONFIG_SCSI_SCAN_ASYNC is not set
402CONFIG_SCSI_WAIT_SCAN=m
392 403
393# 404#
394# SCSI Transports 405# SCSI Transports
@@ -436,10 +447,6 @@ CONFIG_SCSI_PROC_FS=y
436# CONFIG_SCSI_NSP32 is not set 447# CONFIG_SCSI_NSP32 is not set
437# CONFIG_SCSI_DEBUG is not set 448# CONFIG_SCSI_DEBUG is not set
438# CONFIG_SCSI_SRP is not set 449# CONFIG_SCSI_SRP is not set
439
440#
441# Serial ATA (prod) and Parallel ATA (experimental) drivers
442#
443# CONFIG_ATA is not set 450# CONFIG_ATA is not set
444 451
445# 452#
@@ -458,18 +465,14 @@ CONFIG_SCSI_PROC_FS=y
458# 465#
459# IEEE 1394 (FireWire) support 466# IEEE 1394 (FireWire) support
460# 467#
468# CONFIG_FIREWIRE is not set
461# CONFIG_IEEE1394 is not set 469# CONFIG_IEEE1394 is not set
462 470
463# 471#
464# I2O device support 472# I2O device support
465# 473#
466# CONFIG_I2O is not set 474# CONFIG_I2O is not set
467 475# CONFIG_MACINTOSH_DRIVERS is not set
468#
469# Macintosh device drivers
470#
471# CONFIG_MAC_EMUMOUSEBTN is not set
472# CONFIG_WINDFARM is not set
473 476
474# 477#
475# Network device support 478# Network device support
@@ -479,15 +482,7 @@ CONFIG_NETDEVICES=y
479# CONFIG_BONDING is not set 482# CONFIG_BONDING is not set
480# CONFIG_EQUALIZER is not set 483# CONFIG_EQUALIZER is not set
481# CONFIG_TUN is not set 484# CONFIG_TUN is not set
482
483#
484# ARCnet devices
485#
486# CONFIG_ARCNET is not set 485# CONFIG_ARCNET is not set
487
488#
489# PHY device support
490#
491CONFIG_PHYLIB=y 486CONFIG_PHYLIB=y
492 487
493# 488#
@@ -501,7 +496,6 @@ CONFIG_DAVICOM_PHY=y
501# CONFIG_VITESSE_PHY is not set 496# CONFIG_VITESSE_PHY is not set
502# CONFIG_SMSC_PHY is not set 497# CONFIG_SMSC_PHY is not set
503# CONFIG_BROADCOM_PHY is not set 498# CONFIG_BROADCOM_PHY is not set
504# CONFIG_ICPLUS_PHY is not set
505# CONFIG_FIXED_PHY is not set 499# CONFIG_FIXED_PHY is not set
506 500
507# 501#
@@ -520,10 +514,7 @@ CONFIG_MII=y
520# CONFIG_NET_TULIP is not set 514# CONFIG_NET_TULIP is not set
521# CONFIG_HP100 is not set 515# CONFIG_HP100 is not set
522# CONFIG_NET_PCI is not set 516# CONFIG_NET_PCI is not set
523 517CONFIG_NETDEV_1000=y
524#
525# Ethernet (1000 Mbit)
526#
527# CONFIG_ACENIC is not set 518# CONFIG_ACENIC is not set
528# CONFIG_DL2K is not set 519# CONFIG_DL2K is not set
529# CONFIG_E1000 is not set 520# CONFIG_E1000 is not set
@@ -535,6 +526,7 @@ CONFIG_MII=y
535# CONFIG_SKGE is not set 526# CONFIG_SKGE is not set
536# CONFIG_SKY2 is not set 527# CONFIG_SKY2 is not set
537# CONFIG_SK98LIN is not set 528# CONFIG_SK98LIN is not set
529# CONFIG_VIA_VELOCITY is not set
538# CONFIG_TIGON3 is not set 530# CONFIG_TIGON3 is not set
539# CONFIG_BNX2 is not set 531# CONFIG_BNX2 is not set
540# CONFIG_GIANFAR is not set 532# CONFIG_GIANFAR is not set
@@ -542,33 +534,24 @@ CONFIG_UCC_GETH=y
542# CONFIG_UGETH_NAPI is not set 534# CONFIG_UGETH_NAPI is not set
543# CONFIG_UGETH_MAGIC_PACKET is not set 535# CONFIG_UGETH_MAGIC_PACKET is not set
544# CONFIG_UGETH_FILTERING is not set 536# CONFIG_UGETH_FILTERING is not set
545# CONFIG_UGETH_TX_ON_DEMOND is not set 537# CONFIG_UGETH_TX_ON_DEMAND is not set
546# CONFIG_QLA3XXX is not set 538# CONFIG_QLA3XXX is not set
547# CONFIG_ATL1 is not set 539# CONFIG_ATL1 is not set
548 540CONFIG_NETDEV_10000=y
549#
550# Ethernet (10000 Mbit)
551#
552# CONFIG_CHELSIO_T1 is not set 541# CONFIG_CHELSIO_T1 is not set
553# CONFIG_CHELSIO_T3 is not set 542# CONFIG_CHELSIO_T3 is not set
554# CONFIG_IXGB is not set 543# CONFIG_IXGB is not set
555# CONFIG_S2IO is not set 544# CONFIG_S2IO is not set
556# CONFIG_MYRI10GE is not set 545# CONFIG_MYRI10GE is not set
557# CONFIG_NETXEN_NIC is not set 546# CONFIG_NETXEN_NIC is not set
558 547# CONFIG_MLX4_CORE is not set
559#
560# Token Ring devices
561#
562# CONFIG_TR is not set 548# CONFIG_TR is not set
563 549
564# 550#
565# Wireless LAN (non-hamradio) 551# Wireless LAN
566#
567# CONFIG_NET_RADIO is not set
568
569#
570# Wan interfaces
571# 552#
553# CONFIG_WLAN_PRE80211 is not set
554# CONFIG_WLAN_80211 is not set
572# CONFIG_WAN is not set 555# CONFIG_WAN is not set
573# CONFIG_FDDI is not set 556# CONFIG_FDDI is not set
574# CONFIG_HIPPI is not set 557# CONFIG_HIPPI is not set
@@ -595,6 +578,7 @@ CONFIG_UCC_GETH=y
595# 578#
596CONFIG_INPUT=y 579CONFIG_INPUT=y
597# CONFIG_INPUT_FF_MEMLESS is not set 580# CONFIG_INPUT_FF_MEMLESS is not set
581# CONFIG_INPUT_POLLDEV is not set
598 582
599# 583#
600# Userland interfaces 584# Userland interfaces
@@ -611,6 +595,7 @@ CONFIG_INPUT=y
611# CONFIG_INPUT_KEYBOARD is not set 595# CONFIG_INPUT_KEYBOARD is not set
612# CONFIG_INPUT_MOUSE is not set 596# CONFIG_INPUT_MOUSE is not set
613# CONFIG_INPUT_JOYSTICK is not set 597# CONFIG_INPUT_JOYSTICK is not set
598# CONFIG_INPUT_TABLET is not set
614# CONFIG_INPUT_TOUCHSCREEN is not set 599# CONFIG_INPUT_TOUCHSCREEN is not set
615# CONFIG_INPUT_MISC is not set 600# CONFIG_INPUT_MISC is not set
616 601
@@ -652,10 +637,6 @@ CONFIG_LEGACY_PTY_COUNT=256
652# IPMI 637# IPMI
653# 638#
654# CONFIG_IPMI_HANDLER is not set 639# CONFIG_IPMI_HANDLER is not set
655
656#
657# Watchdog Cards
658#
659CONFIG_WATCHDOG=y 640CONFIG_WATCHDOG=y
660# CONFIG_WATCHDOG_NOWAYOUT is not set 641# CONFIG_WATCHDOG_NOWAYOUT is not set
661 642
@@ -674,7 +655,6 @@ CONFIG_HW_RANDOM=y
674# CONFIG_NVRAM is not set 655# CONFIG_NVRAM is not set
675CONFIG_GEN_RTC=y 656CONFIG_GEN_RTC=y
676# CONFIG_GEN_RTC_X is not set 657# CONFIG_GEN_RTC_X is not set
677# CONFIG_DTLK is not set
678# CONFIG_R3964 is not set 658# CONFIG_R3964 is not set
679# CONFIG_APPLICOM is not set 659# CONFIG_APPLICOM is not set
680# CONFIG_AGP is not set 660# CONFIG_AGP is not set
@@ -685,11 +665,9 @@ CONFIG_GEN_RTC=y
685# TPM devices 665# TPM devices
686# 666#
687# CONFIG_TCG_TPM is not set 667# CONFIG_TCG_TPM is not set
688 668CONFIG_DEVPORT=y
689#
690# I2C support
691#
692CONFIG_I2C=y 669CONFIG_I2C=y
670CONFIG_I2C_BOARDINFO=y
693CONFIG_I2C_CHARDEV=y 671CONFIG_I2C_CHARDEV=y
694 672
695# 673#
@@ -714,9 +692,9 @@ CONFIG_I2C_MPC=y
714# CONFIG_I2C_NFORCE2 is not set 692# CONFIG_I2C_NFORCE2 is not set
715# CONFIG_I2C_OCORES is not set 693# CONFIG_I2C_OCORES is not set
716# CONFIG_I2C_PARPORT_LIGHT is not set 694# CONFIG_I2C_PARPORT_LIGHT is not set
717# CONFIG_I2C_PASEMI is not set
718# CONFIG_I2C_PROSAVAGE is not set 695# CONFIG_I2C_PROSAVAGE is not set
719# CONFIG_I2C_SAVAGE4 is not set 696# CONFIG_I2C_SAVAGE4 is not set
697# CONFIG_I2C_SIMTEC is not set
720# CONFIG_I2C_SIS5595 is not set 698# CONFIG_I2C_SIS5595 is not set
721# CONFIG_I2C_SIS630 is not set 699# CONFIG_I2C_SIS630 is not set
722# CONFIG_I2C_SIS96X is not set 700# CONFIG_I2C_SIS96X is not set
@@ -724,7 +702,6 @@ CONFIG_I2C_MPC=y
724# CONFIG_I2C_VIA is not set 702# CONFIG_I2C_VIA is not set
725# CONFIG_I2C_VIAPRO is not set 703# CONFIG_I2C_VIAPRO is not set
726# CONFIG_I2C_VOODOO3 is not set 704# CONFIG_I2C_VOODOO3 is not set
727# CONFIG_I2C_PCA_ISA is not set
728 705
729# 706#
730# Miscellaneous I2C Chip support 707# Miscellaneous I2C Chip support
@@ -752,13 +729,10 @@ CONFIG_I2C_MPC=y
752# Dallas's 1-wire bus 729# Dallas's 1-wire bus
753# 730#
754# CONFIG_W1 is not set 731# CONFIG_W1 is not set
755
756#
757# Hardware Monitoring support
758#
759CONFIG_HWMON=y 732CONFIG_HWMON=y
760# CONFIG_HWMON_VID is not set 733# CONFIG_HWMON_VID is not set
761# CONFIG_SENSORS_ABITUGURU is not set 734# CONFIG_SENSORS_ABITUGURU is not set
735# CONFIG_SENSORS_AD7418 is not set
762# CONFIG_SENSORS_ADM1021 is not set 736# CONFIG_SENSORS_ADM1021 is not set
763# CONFIG_SENSORS_ADM1025 is not set 737# CONFIG_SENSORS_ADM1025 is not set
764# CONFIG_SENSORS_ADM1026 is not set 738# CONFIG_SENSORS_ADM1026 is not set
@@ -785,6 +759,7 @@ CONFIG_HWMON=y
785# CONFIG_SENSORS_LM90 is not set 759# CONFIG_SENSORS_LM90 is not set
786# CONFIG_SENSORS_LM92 is not set 760# CONFIG_SENSORS_LM92 is not set
787# CONFIG_SENSORS_MAX1619 is not set 761# CONFIG_SENSORS_MAX1619 is not set
762# CONFIG_SENSORS_MAX6650 is not set
788# CONFIG_SENSORS_PC87360 is not set 763# CONFIG_SENSORS_PC87360 is not set
789# CONFIG_SENSORS_PC87427 is not set 764# CONFIG_SENSORS_PC87427 is not set
790# CONFIG_SENSORS_SIS5595 is not set 765# CONFIG_SENSORS_SIS5595 is not set
@@ -812,16 +787,19 @@ CONFIG_HWMON=y
812# Multimedia devices 787# Multimedia devices
813# 788#
814# CONFIG_VIDEO_DEV is not set 789# CONFIG_VIDEO_DEV is not set
790# CONFIG_DVB_CORE is not set
791CONFIG_DAB=y
815 792
816# 793#
817# Digital Video Broadcasting Devices 794# Graphics support
818# 795#
819# CONFIG_DVB is not set 796# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
820 797
821# 798#
822# Graphics support 799# Display device support
823# 800#
824# CONFIG_BACKLIGHT_LCD_SUPPORT is not set 801# CONFIG_DISPLAY_SUPPORT is not set
802# CONFIG_VGASTATE is not set
825# CONFIG_FB is not set 803# CONFIG_FB is not set
826# CONFIG_FB_IBM_GXT4500 is not set 804# CONFIG_FB_IBM_GXT4500 is not set
827 805
@@ -852,10 +830,6 @@ CONFIG_USB_ARCH_HAS_EHCI=y
852# USB Gadget Support 830# USB Gadget Support
853# 831#
854# CONFIG_USB_GADGET is not set 832# CONFIG_USB_GADGET is not set
855
856#
857# MMC/SD Card support
858#
859# CONFIG_MMC is not set 833# CONFIG_MMC is not set
860 834
861# 835#
@@ -899,14 +873,6 @@ CONFIG_USB_ARCH_HAS_EHCI=y
899# 873#
900 874
901# 875#
902# Auxiliary Display support
903#
904
905#
906# Virtualization
907#
908
909#
910# File systems 876# File systems
911# 877#
912CONFIG_EXT2_FS=y 878CONFIG_EXT2_FS=y
@@ -994,6 +960,7 @@ CONFIG_LOCKD_V4=y
994CONFIG_NFS_COMMON=y 960CONFIG_NFS_COMMON=y
995CONFIG_SUNRPC=y 961CONFIG_SUNRPC=y
996CONFIG_SUNRPC_GSS=y 962CONFIG_SUNRPC_GSS=y
963# CONFIG_SUNRPC_BIND34 is not set
997CONFIG_RPCSEC_GSS_KRB5=y 964CONFIG_RPCSEC_GSS_KRB5=y
998# CONFIG_RPCSEC_GSS_SPKM3 is not set 965# CONFIG_RPCSEC_GSS_SPKM3 is not set
999# CONFIG_SMB_FS is not set 966# CONFIG_SMB_FS is not set
@@ -1019,6 +986,7 @@ CONFIG_PARTITION_ADVANCED=y
1019# CONFIG_SUN_PARTITION is not set 986# CONFIG_SUN_PARTITION is not set
1020# CONFIG_KARMA_PARTITION is not set 987# CONFIG_KARMA_PARTITION is not set
1021# CONFIG_EFI_PARTITION is not set 988# CONFIG_EFI_PARTITION is not set
989# CONFIG_SYSV68_PARTITION is not set
1022 990
1023# 991#
1024# Native Language Support 992# Native Language Support
@@ -1039,11 +1007,13 @@ CONFIG_UCC=y
1039CONFIG_BITREVERSE=y 1007CONFIG_BITREVERSE=y
1040# CONFIG_CRC_CCITT is not set 1008# CONFIG_CRC_CCITT is not set
1041# CONFIG_CRC16 is not set 1009# CONFIG_CRC16 is not set
1010# CONFIG_CRC_ITU_T is not set
1042CONFIG_CRC32=y 1011CONFIG_CRC32=y
1043# CONFIG_LIBCRC32C is not set 1012# CONFIG_LIBCRC32C is not set
1044CONFIG_PLIST=y 1013CONFIG_PLIST=y
1045CONFIG_HAS_IOMEM=y 1014CONFIG_HAS_IOMEM=y
1046CONFIG_HAS_IOPORT=y 1015CONFIG_HAS_IOPORT=y
1016CONFIG_HAS_DMA=y
1047 1017
1048# 1018#
1049# Instrumentation Support 1019# Instrumentation Support
@@ -1060,7 +1030,6 @@ CONFIG_ENABLE_MUST_CHECK=y
1060# CONFIG_DEBUG_FS is not set 1030# CONFIG_DEBUG_FS is not set
1061# CONFIG_HEADERS_CHECK is not set 1031# CONFIG_HEADERS_CHECK is not set
1062# CONFIG_DEBUG_KERNEL is not set 1032# CONFIG_DEBUG_KERNEL is not set
1063CONFIG_LOG_BUF_SHIFT=14
1064# CONFIG_DEBUG_BUGVERBOSE is not set 1033# CONFIG_DEBUG_BUGVERBOSE is not set
1065# CONFIG_BOOTX_TEXT is not set 1034# CONFIG_BOOTX_TEXT is not set
1066# CONFIG_PPC_EARLY_DEBUG is not set 1035# CONFIG_PPC_EARLY_DEBUG is not set
@@ -1093,6 +1062,7 @@ CONFIG_CRYPTO_ECB=m
1093CONFIG_CRYPTO_CBC=y 1062CONFIG_CRYPTO_CBC=y
1094CONFIG_CRYPTO_PCBC=m 1063CONFIG_CRYPTO_PCBC=m
1095# CONFIG_CRYPTO_LRW is not set 1064# CONFIG_CRYPTO_LRW is not set
1065# CONFIG_CRYPTO_CRYPTD is not set
1096CONFIG_CRYPTO_DES=y 1066CONFIG_CRYPTO_DES=y
1097# CONFIG_CRYPTO_FCRYPT is not set 1067# CONFIG_CRYPTO_FCRYPT is not set
1098# CONFIG_CRYPTO_BLOWFISH is not set 1068# CONFIG_CRYPTO_BLOWFISH is not set
diff --git a/arch/powerpc/configs/mpc832x_rdb_defconfig b/arch/powerpc/configs/mpc832x_rdb_defconfig
index 4a4da875fa4e..6a83b66dd99e 100644
--- a/arch/powerpc/configs/mpc832x_rdb_defconfig
+++ b/arch/powerpc/configs/mpc832x_rdb_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.21-rc5 3# Linux kernel version: 2.6.22-rc7
4# Mon Apr 9 16:12:43 2007 4# Sun Jul 1 23:56:56 2007
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7CONFIG_PPC32=y 7CONFIG_PPC32=y
@@ -45,6 +45,7 @@ CONFIG_PPC_FPU=y
45# CONFIG_PPC_DCR_MMIO is not set 45# CONFIG_PPC_DCR_MMIO is not set
46CONFIG_PPC_STD_MMU=y 46CONFIG_PPC_STD_MMU=y
47CONFIG_PPC_STD_MMU_32=y 47CONFIG_PPC_STD_MMU_32=y
48# CONFIG_PPC_MM_SLICES is not set
48# CONFIG_SMP is not set 49# CONFIG_SMP is not set
49CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 50CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
50 51
@@ -70,6 +71,7 @@ CONFIG_SYSVIPC_SYSCTL=y
70# CONFIG_UTS_NS is not set 71# CONFIG_UTS_NS is not set
71# CONFIG_AUDIT is not set 72# CONFIG_AUDIT is not set
72# CONFIG_IKCONFIG is not set 73# CONFIG_IKCONFIG is not set
74CONFIG_LOG_BUF_SHIFT=14
73CONFIG_SYSFS_DEPRECATED=y 75CONFIG_SYSFS_DEPRECATED=y
74# CONFIG_RELAY is not set 76# CONFIG_RELAY is not set
75CONFIG_BLK_DEV_INITRD=y 77CONFIG_BLK_DEV_INITRD=y
@@ -85,14 +87,19 @@ CONFIG_BUG=y
85CONFIG_ELF_CORE=y 87CONFIG_ELF_CORE=y
86CONFIG_BASE_FULL=y 88CONFIG_BASE_FULL=y
87CONFIG_FUTEX=y 89CONFIG_FUTEX=y
90CONFIG_ANON_INODES=y
88# CONFIG_EPOLL is not set 91# CONFIG_EPOLL is not set
92CONFIG_SIGNALFD=y
93CONFIG_TIMERFD=y
94CONFIG_EVENTFD=y
89CONFIG_SHMEM=y 95CONFIG_SHMEM=y
90CONFIG_SLAB=y
91CONFIG_VM_EVENT_COUNTERS=y 96CONFIG_VM_EVENT_COUNTERS=y
97CONFIG_SLAB=y
98# CONFIG_SLUB is not set
99# CONFIG_SLOB is not set
92CONFIG_RT_MUTEXES=y 100CONFIG_RT_MUTEXES=y
93# CONFIG_TINY_SHMEM is not set 101# CONFIG_TINY_SHMEM is not set
94CONFIG_BASE_SMALL=0 102CONFIG_BASE_SMALL=0
95# CONFIG_SLOB is not set
96 103
97# 104#
98# Loadable module support 105# Loadable module support
@@ -124,12 +131,15 @@ CONFIG_DEFAULT_AS=y
124# CONFIG_DEFAULT_CFQ is not set 131# CONFIG_DEFAULT_CFQ is not set
125# CONFIG_DEFAULT_NOOP is not set 132# CONFIG_DEFAULT_NOOP is not set
126CONFIG_DEFAULT_IOSCHED="anticipatory" 133CONFIG_DEFAULT_IOSCHED="anticipatory"
127CONFIG_QUICC_ENGINE=y
128# CONFIG_WANT_EARLY_SERIAL is not set
129 134
130# 135#
131# Platform support 136# Platform support
132# 137#
138# CONFIG_PPC_MPC52xx is not set
139# CONFIG_PPC_MPC5200 is not set
140# CONFIG_PPC_CELL is not set
141# CONFIG_PPC_CELL_NATIVE is not set
142# CONFIG_PQ2ADS is not set
133# CONFIG_MPC8313_RDB is not set 143# CONFIG_MPC8313_RDB is not set
134# CONFIG_MPC832x_MDS is not set 144# CONFIG_MPC832x_MDS is not set
135CONFIG_MPC832x_RDB=y 145CONFIG_MPC832x_RDB=y
@@ -138,6 +148,17 @@ CONFIG_MPC832x_RDB=y
138# CONFIG_MPC836x_MDS is not set 148# CONFIG_MPC836x_MDS is not set
139CONFIG_PPC_MPC832x=y 149CONFIG_PPC_MPC832x=y
140# CONFIG_MPIC is not set 150# CONFIG_MPIC is not set
151# CONFIG_MPIC_WEIRD is not set
152# CONFIG_PPC_I8259 is not set
153# CONFIG_PPC_RTAS is not set
154# CONFIG_MMIO_NVRAM is not set
155# CONFIG_PPC_MPC106 is not set
156# CONFIG_PPC_970_NAP is not set
157# CONFIG_PPC_INDIRECT_IO is not set
158# CONFIG_GENERIC_IOMAP is not set
159# CONFIG_CPU_FREQ is not set
160CONFIG_QUICC_ENGINE=y
161# CONFIG_CPM2 is not set
141 162
142# 163#
143# Kernel options 164# Kernel options
@@ -171,6 +192,8 @@ CONFIG_PROC_DEVICETREE=y
171# CONFIG_CMDLINE_BOOL is not set 192# CONFIG_CMDLINE_BOOL is not set
172# CONFIG_PM is not set 193# CONFIG_PM is not set
173CONFIG_SECCOMP=y 194CONFIG_SECCOMP=y
195CONFIG_WANT_DEVICE_TREE=y
196CONFIG_DEVICE_TREE=""
174CONFIG_ISA_DMA_API=y 197CONFIG_ISA_DMA_API=y
175 198
176# 199#
@@ -178,22 +201,19 @@ CONFIG_ISA_DMA_API=y
178# 201#
179CONFIG_ZONE_DMA=y 202CONFIG_ZONE_DMA=y
180CONFIG_GENERIC_ISA_DMA=y 203CONFIG_GENERIC_ISA_DMA=y
181# CONFIG_MPIC_WEIRD is not set
182# CONFIG_PPC_I8259 is not set
183CONFIG_PPC_INDIRECT_PCI=y 204CONFIG_PPC_INDIRECT_PCI=y
205# CONFIG_PPC_INDIRECT_PCI_BE is not set
184CONFIG_FSL_SOC=y 206CONFIG_FSL_SOC=y
185CONFIG_PCI=y 207CONFIG_PCI=y
186CONFIG_PCI_DOMAINS=y 208CONFIG_PCI_DOMAINS=y
187# CONFIG_PCIEPORTBUS is not set 209# CONFIG_PCIEPORTBUS is not set
210CONFIG_ARCH_SUPPORTS_MSI=y
211# CONFIG_PCI_MSI is not set
188 212
189# 213#
190# PCCARD (PCMCIA/CardBus) support 214# PCCARD (PCMCIA/CardBus) support
191# 215#
192# CONFIG_PCCARD is not set 216# CONFIG_PCCARD is not set
193
194#
195# PCI Hotplug Support
196#
197# CONFIG_HOTPLUG_PCI is not set 217# CONFIG_HOTPLUG_PCI is not set
198 218
199# 219#
@@ -218,7 +238,6 @@ CONFIG_NET=y
218# 238#
219# Networking options 239# Networking options
220# 240#
221# CONFIG_NETDEBUG is not set
222CONFIG_PACKET=y 241CONFIG_PACKET=y
223# CONFIG_PACKET_MMAP is not set 242# CONFIG_PACKET_MMAP is not set
224CONFIG_UNIX=y 243CONFIG_UNIX=y
@@ -259,20 +278,8 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
259# CONFIG_INET6_TUNNEL is not set 278# CONFIG_INET6_TUNNEL is not set
260# CONFIG_NETWORK_SECMARK is not set 279# CONFIG_NETWORK_SECMARK is not set
261# CONFIG_NETFILTER is not set 280# CONFIG_NETFILTER is not set
262
263#
264# DCCP Configuration (EXPERIMENTAL)
265#
266# CONFIG_IP_DCCP is not set 281# CONFIG_IP_DCCP is not set
267
268#
269# SCTP Configuration (EXPERIMENTAL)
270#
271# CONFIG_IP_SCTP is not set 282# CONFIG_IP_SCTP is not set
272
273#
274# TIPC Configuration (EXPERIMENTAL)
275#
276# CONFIG_TIPC is not set 283# CONFIG_TIPC is not set
277# CONFIG_ATM is not set 284# CONFIG_ATM is not set
278# CONFIG_BRIDGE is not set 285# CONFIG_BRIDGE is not set
@@ -298,7 +305,16 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
298# CONFIG_HAMRADIO is not set 305# CONFIG_HAMRADIO is not set
299# CONFIG_IRDA is not set 306# CONFIG_IRDA is not set
300# CONFIG_BT is not set 307# CONFIG_BT is not set
308# CONFIG_AF_RXRPC is not set
309
310#
311# Wireless
312#
313# CONFIG_CFG80211 is not set
314# CONFIG_WIRELESS_EXT is not set
315# CONFIG_MAC80211 is not set
301# CONFIG_IEEE80211 is not set 316# CONFIG_IEEE80211 is not set
317# CONFIG_RFKILL is not set
302 318
303# 319#
304# Device Drivers 320# Device Drivers
@@ -316,10 +332,6 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y
316# Connector - unified userspace <-> kernelspace linker 332# Connector - unified userspace <-> kernelspace linker
317# 333#
318# CONFIG_CONNECTOR is not set 334# CONFIG_CONNECTOR is not set
319
320#
321# Memory Technology Devices (MTD)
322#
323# CONFIG_MTD is not set 335# CONFIG_MTD is not set
324 336
325# 337#
@@ -356,12 +368,10 @@ CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
356# 368#
357# Misc devices 369# Misc devices
358# 370#
371# CONFIG_PHANTOM is not set
359# CONFIG_SGI_IOC4 is not set 372# CONFIG_SGI_IOC4 is not set
360# CONFIG_TIFM_CORE is not set 373# CONFIG_TIFM_CORE is not set
361 374# CONFIG_BLINK is not set
362#
363# ATA/ATAPI/MFM/RLL support
364#
365# CONFIG_IDE is not set 375# CONFIG_IDE is not set
366 376
367# 377#
@@ -390,6 +400,7 @@ CONFIG_BLK_DEV_SD=y
390# CONFIG_SCSI_CONSTANTS is not set 400# CONFIG_SCSI_CONSTANTS is not set
391# CONFIG_SCSI_LOGGING is not set 401# CONFIG_SCSI_LOGGING is not set
392# CONFIG_SCSI_SCAN_ASYNC is not set 402# CONFIG_SCSI_SCAN_ASYNC is not set
403CONFIG_SCSI_WAIT_SCAN=m
393 404
394# 405#
395# SCSI Transports 406# SCSI Transports
@@ -437,10 +448,6 @@ CONFIG_BLK_DEV_SD=y
437# CONFIG_SCSI_NSP32 is not set 448# CONFIG_SCSI_NSP32 is not set
438# CONFIG_SCSI_DEBUG is not set 449# CONFIG_SCSI_DEBUG is not set
439# CONFIG_SCSI_SRP is not set 450# CONFIG_SCSI_SRP is not set
440
441#
442# Serial ATA (prod) and Parallel ATA (experimental) drivers
443#
444# CONFIG_ATA is not set 451# CONFIG_ATA is not set
445 452
446# 453#
@@ -459,18 +466,14 @@ CONFIG_BLK_DEV_SD=y
459# 466#
460# IEEE 1394 (FireWire) support 467# IEEE 1394 (FireWire) support
461# 468#
469# CONFIG_FIREWIRE is not set
462# CONFIG_IEEE1394 is not set 470# CONFIG_IEEE1394 is not set
463 471
464# 472#
465# I2O device support 473# I2O device support
466# 474#
467# CONFIG_I2O is not set 475# CONFIG_I2O is not set
468 476# CONFIG_MACINTOSH_DRIVERS is not set
469#
470# Macintosh device drivers
471#
472# CONFIG_MAC_EMUMOUSEBTN is not set
473# CONFIG_WINDFARM is not set
474 477
475# 478#
476# Network device support 479# Network device support
@@ -480,15 +483,7 @@ CONFIG_NETDEVICES=y
480# CONFIG_BONDING is not set 483# CONFIG_BONDING is not set
481# CONFIG_EQUALIZER is not set 484# CONFIG_EQUALIZER is not set
482# CONFIG_TUN is not set 485# CONFIG_TUN is not set
483
484#
485# ARCnet devices
486#
487# CONFIG_ARCNET is not set 486# CONFIG_ARCNET is not set
488
489#
490# PHY device support
491#
492CONFIG_PHYLIB=y 487CONFIG_PHYLIB=y
493 488
494# 489#
@@ -502,7 +497,6 @@ CONFIG_PHYLIB=y
502# CONFIG_VITESSE_PHY is not set 497# CONFIG_VITESSE_PHY is not set
503# CONFIG_SMSC_PHY is not set 498# CONFIG_SMSC_PHY is not set
504# CONFIG_BROADCOM_PHY is not set 499# CONFIG_BROADCOM_PHY is not set
505CONFIG_ICPLUS_PHY=y
506# CONFIG_FIXED_PHY is not set 500# CONFIG_FIXED_PHY is not set
507 501
508# 502#
@@ -521,10 +515,7 @@ CONFIG_MII=y
521# CONFIG_NET_TULIP is not set 515# CONFIG_NET_TULIP is not set
522# CONFIG_HP100 is not set 516# CONFIG_HP100 is not set
523# CONFIG_NET_PCI is not set 517# CONFIG_NET_PCI is not set
524 518CONFIG_NETDEV_1000=y
525#
526# Ethernet (1000 Mbit)
527#
528# CONFIG_ACENIC is not set 519# CONFIG_ACENIC is not set
529# CONFIG_DL2K is not set 520# CONFIG_DL2K is not set
530CONFIG_E1000=y 521CONFIG_E1000=y
@@ -538,6 +529,7 @@ CONFIG_E1000=y
538# CONFIG_SKGE is not set 529# CONFIG_SKGE is not set
539# CONFIG_SKY2 is not set 530# CONFIG_SKY2 is not set
540# CONFIG_SK98LIN is not set 531# CONFIG_SK98LIN is not set
532# CONFIG_VIA_VELOCITY is not set
541# CONFIG_TIGON3 is not set 533# CONFIG_TIGON3 is not set
542# CONFIG_BNX2 is not set 534# CONFIG_BNX2 is not set
543# CONFIG_GIANFAR is not set 535# CONFIG_GIANFAR is not set
@@ -545,33 +537,34 @@ CONFIG_UCC_GETH=y
545CONFIG_UGETH_NAPI=y 537CONFIG_UGETH_NAPI=y
546# CONFIG_UGETH_MAGIC_PACKET is not set 538# CONFIG_UGETH_MAGIC_PACKET is not set
547# CONFIG_UGETH_FILTERING is not set 539# CONFIG_UGETH_FILTERING is not set
548# CONFIG_UGETH_TX_ON_DEMOND is not set 540# CONFIG_UGETH_TX_ON_DEMAND is not set
549# CONFIG_QLA3XXX is not set 541# CONFIG_QLA3XXX is not set
550# CONFIG_ATL1 is not set 542# CONFIG_ATL1 is not set
551 543CONFIG_NETDEV_10000=y
552#
553# Ethernet (10000 Mbit)
554#
555# CONFIG_CHELSIO_T1 is not set 544# CONFIG_CHELSIO_T1 is not set
556# CONFIG_CHELSIO_T3 is not set 545# CONFIG_CHELSIO_T3 is not set
557# CONFIG_IXGB is not set 546# CONFIG_IXGB is not set
558# CONFIG_S2IO is not set 547# CONFIG_S2IO is not set
559# CONFIG_MYRI10GE is not set 548# CONFIG_MYRI10GE is not set
560# CONFIG_NETXEN_NIC is not set 549# CONFIG_NETXEN_NIC is not set
561 550# CONFIG_MLX4_CORE is not set
562#
563# Token Ring devices
564#
565# CONFIG_TR is not set 551# CONFIG_TR is not set
566 552
567# 553#
568# Wireless LAN (non-hamradio) 554# Wireless LAN
569# 555#
570# CONFIG_NET_RADIO is not set 556# CONFIG_WLAN_PRE80211 is not set
557# CONFIG_WLAN_80211 is not set
571 558
572# 559#
573# Wan interfaces 560# USB Network Adapters
574# 561#
562# CONFIG_USB_CATC is not set
563# CONFIG_USB_KAWETH is not set
564# CONFIG_USB_PEGASUS is not set
565# CONFIG_USB_RTL8150 is not set
566# CONFIG_USB_USBNET_MII is not set
567# CONFIG_USB_USBNET is not set
575# CONFIG_WAN is not set 568# CONFIG_WAN is not set
576# CONFIG_FDDI is not set 569# CONFIG_FDDI is not set
577# CONFIG_HIPPI is not set 570# CONFIG_HIPPI is not set
@@ -598,6 +591,7 @@ CONFIG_UGETH_NAPI=y
598# 591#
599CONFIG_INPUT=y 592CONFIG_INPUT=y
600# CONFIG_INPUT_FF_MEMLESS is not set 593# CONFIG_INPUT_FF_MEMLESS is not set
594# CONFIG_INPUT_POLLDEV is not set
601 595
602# 596#
603# Userland interfaces 597# Userland interfaces
@@ -614,6 +608,7 @@ CONFIG_INPUT=y
614# CONFIG_INPUT_KEYBOARD is not set 608# CONFIG_INPUT_KEYBOARD is not set
615# CONFIG_INPUT_MOUSE is not set 609# CONFIG_INPUT_MOUSE is not set
616# CONFIG_INPUT_JOYSTICK is not set 610# CONFIG_INPUT_JOYSTICK is not set
611# CONFIG_INPUT_TABLET is not set
617# CONFIG_INPUT_TOUCHSCREEN is not set 612# CONFIG_INPUT_TOUCHSCREEN is not set
618# CONFIG_INPUT_MISC is not set 613# CONFIG_INPUT_MISC is not set
619 614
@@ -655,10 +650,6 @@ CONFIG_LEGACY_PTY_COUNT=256
655# IPMI 650# IPMI
656# 651#
657# CONFIG_IPMI_HANDLER is not set 652# CONFIG_IPMI_HANDLER is not set
658
659#
660# Watchdog Cards
661#
662CONFIG_WATCHDOG=y 653CONFIG_WATCHDOG=y
663# CONFIG_WATCHDOG_NOWAYOUT is not set 654# CONFIG_WATCHDOG_NOWAYOUT is not set
664 655
@@ -682,7 +673,6 @@ CONFIG_HW_RANDOM=y
682# CONFIG_NVRAM is not set 673# CONFIG_NVRAM is not set
683CONFIG_GEN_RTC=y 674CONFIG_GEN_RTC=y
684# CONFIG_GEN_RTC_X is not set 675# CONFIG_GEN_RTC_X is not set
685# CONFIG_DTLK is not set
686# CONFIG_R3964 is not set 676# CONFIG_R3964 is not set
687# CONFIG_APPLICOM is not set 677# CONFIG_APPLICOM is not set
688# CONFIG_AGP is not set 678# CONFIG_AGP is not set
@@ -693,11 +683,9 @@ CONFIG_GEN_RTC=y
693# TPM devices 683# TPM devices
694# 684#
695# CONFIG_TCG_TPM is not set 685# CONFIG_TCG_TPM is not set
696 686CONFIG_DEVPORT=y
697#
698# I2C support
699#
700CONFIG_I2C=y 687CONFIG_I2C=y
688CONFIG_I2C_BOARDINFO=y
701CONFIG_I2C_CHARDEV=y 689CONFIG_I2C_CHARDEV=y
702 690
703# 691#
@@ -722,17 +710,17 @@ CONFIG_I2C_MPC=y
722# CONFIG_I2C_NFORCE2 is not set 710# CONFIG_I2C_NFORCE2 is not set
723# CONFIG_I2C_OCORES is not set 711# CONFIG_I2C_OCORES is not set
724# CONFIG_I2C_PARPORT_LIGHT is not set 712# CONFIG_I2C_PARPORT_LIGHT is not set
725# CONFIG_I2C_PASEMI is not set
726# CONFIG_I2C_PROSAVAGE is not set 713# CONFIG_I2C_PROSAVAGE is not set
727# CONFIG_I2C_SAVAGE4 is not set 714# CONFIG_I2C_SAVAGE4 is not set
715# CONFIG_I2C_SIMTEC is not set
728# CONFIG_I2C_SIS5595 is not set 716# CONFIG_I2C_SIS5595 is not set
729# CONFIG_I2C_SIS630 is not set 717# CONFIG_I2C_SIS630 is not set
730# CONFIG_I2C_SIS96X is not set 718# CONFIG_I2C_SIS96X is not set
731# CONFIG_I2C_STUB is not set 719# CONFIG_I2C_STUB is not set
720# CONFIG_I2C_TINY_USB is not set
732# CONFIG_I2C_VIA is not set 721# CONFIG_I2C_VIA is not set
733# CONFIG_I2C_VIAPRO is not set 722# CONFIG_I2C_VIAPRO is not set
734# CONFIG_I2C_VOODOO3 is not set 723# CONFIG_I2C_VOODOO3 is not set
735# CONFIG_I2C_PCA_ISA is not set
736 724
737# 725#
738# Miscellaneous I2C Chip support 726# Miscellaneous I2C Chip support
@@ -760,13 +748,10 @@ CONFIG_I2C_MPC=y
760# Dallas's 1-wire bus 748# Dallas's 1-wire bus
761# 749#
762# CONFIG_W1 is not set 750# CONFIG_W1 is not set
763
764#
765# Hardware Monitoring support
766#
767CONFIG_HWMON=y 751CONFIG_HWMON=y
768# CONFIG_HWMON_VID is not set 752# CONFIG_HWMON_VID is not set
769# CONFIG_SENSORS_ABITUGURU is not set 753# CONFIG_SENSORS_ABITUGURU is not set
754# CONFIG_SENSORS_AD7418 is not set
770# CONFIG_SENSORS_ADM1021 is not set 755# CONFIG_SENSORS_ADM1021 is not set
771# CONFIG_SENSORS_ADM1025 is not set 756# CONFIG_SENSORS_ADM1025 is not set
772# CONFIG_SENSORS_ADM1026 is not set 757# CONFIG_SENSORS_ADM1026 is not set
@@ -793,6 +778,7 @@ CONFIG_HWMON=y
793# CONFIG_SENSORS_LM90 is not set 778# CONFIG_SENSORS_LM90 is not set
794# CONFIG_SENSORS_LM92 is not set 779# CONFIG_SENSORS_LM92 is not set
795# CONFIG_SENSORS_MAX1619 is not set 780# CONFIG_SENSORS_MAX1619 is not set
781# CONFIG_SENSORS_MAX6650 is not set
796# CONFIG_SENSORS_PC87360 is not set 782# CONFIG_SENSORS_PC87360 is not set
797# CONFIG_SENSORS_PC87427 is not set 783# CONFIG_SENSORS_PC87427 is not set
798# CONFIG_SENSORS_SIS5595 is not set 784# CONFIG_SENSORS_SIS5595 is not set
@@ -820,17 +806,20 @@ CONFIG_HWMON=y
820# Multimedia devices 806# Multimedia devices
821# 807#
822# CONFIG_VIDEO_DEV is not set 808# CONFIG_VIDEO_DEV is not set
823 809# CONFIG_DVB_CORE is not set
824# 810CONFIG_DAB=y
825# Digital Video Broadcasting Devices
826#
827# CONFIG_DVB is not set
828# CONFIG_USB_DABUSB is not set 811# CONFIG_USB_DABUSB is not set
829 812
830# 813#
831# Graphics support 814# Graphics support
832# 815#
833# CONFIG_BACKLIGHT_LCD_SUPPORT is not set 816# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
817
818#
819# Display device support
820#
821# CONFIG_DISPLAY_SUPPORT is not set
822# CONFIG_VGASTATE is not set
834# CONFIG_FB is not set 823# CONFIG_FB is not set
835# CONFIG_FB_IBM_GXT4500 is not set 824# CONFIG_FB_IBM_GXT4500 is not set
836 825
@@ -846,6 +835,17 @@ CONFIG_HID=y
846# CONFIG_HID_DEBUG is not set 835# CONFIG_HID_DEBUG is not set
847 836
848# 837#
838# USB Input Devices
839#
840# CONFIG_USB_HID is not set
841
842#
843# USB HID Boot Protocol drivers
844#
845# CONFIG_USB_KBD is not set
846# CONFIG_USB_MOUSE is not set
847
848#
849# USB support 849# USB support
850# 850#
851CONFIG_USB_ARCH_HAS_HCD=y 851CONFIG_USB_ARCH_HAS_HCD=y
@@ -858,6 +858,7 @@ CONFIG_USB=y
858# Miscellaneous USB options 858# Miscellaneous USB options
859# 859#
860CONFIG_USB_DEVICEFS=y 860CONFIG_USB_DEVICEFS=y
861CONFIG_USB_DEVICE_CLASS=y
861# CONFIG_USB_DYNAMIC_MINORS is not set 862# CONFIG_USB_DYNAMIC_MINORS is not set
862# CONFIG_USB_OTG is not set 863# CONFIG_USB_OTG is not set
863 864
@@ -908,44 +909,10 @@ CONFIG_USB_STORAGE=y
908# CONFIG_USB_LIBUSUAL is not set 909# CONFIG_USB_LIBUSUAL is not set
909 910
910# 911#
911# USB Input Devices
912#
913# CONFIG_USB_HID is not set
914
915#
916# USB HID Boot Protocol drivers
917#
918# CONFIG_USB_KBD is not set
919# CONFIG_USB_MOUSE is not set
920# CONFIG_USB_AIPTEK is not set
921# CONFIG_USB_WACOM is not set
922# CONFIG_USB_ACECAD is not set
923# CONFIG_USB_KBTAB is not set
924# CONFIG_USB_POWERMATE is not set
925# CONFIG_USB_TOUCHSCREEN is not set
926# CONFIG_USB_YEALINK is not set
927# CONFIG_USB_XPAD is not set
928# CONFIG_USB_ATI_REMOTE is not set
929# CONFIG_USB_ATI_REMOTE2 is not set
930# CONFIG_USB_KEYSPAN_REMOTE is not set
931# CONFIG_USB_APPLETOUCH is not set
932# CONFIG_USB_GTCO is not set
933
934#
935# USB Imaging devices 912# USB Imaging devices
936# 913#
937# CONFIG_USB_MDC800 is not set 914# CONFIG_USB_MDC800 is not set
938# CONFIG_USB_MICROTEK is not set 915# CONFIG_USB_MICROTEK is not set
939
940#
941# USB Network Adapters
942#
943# CONFIG_USB_CATC is not set
944# CONFIG_USB_KAWETH is not set
945# CONFIG_USB_PEGASUS is not set
946# CONFIG_USB_RTL8150 is not set
947# CONFIG_USB_USBNET_MII is not set
948# CONFIG_USB_USBNET is not set
949CONFIG_USB_MON=y 916CONFIG_USB_MON=y
950 917
951# 918#
@@ -989,10 +956,6 @@ CONFIG_USB_MON=y
989# USB Gadget Support 956# USB Gadget Support
990# 957#
991# CONFIG_USB_GADGET is not set 958# CONFIG_USB_GADGET is not set
992
993#
994# MMC/SD Card support
995#
996# CONFIG_MMC is not set 959# CONFIG_MMC is not set
997 960
998# 961#
@@ -1036,14 +999,6 @@ CONFIG_USB_MON=y
1036# 999#
1037 1000
1038# 1001#
1039# Auxiliary Display support
1040#
1041
1042#
1043# Virtualization
1044#
1045
1046#
1047# File systems 1002# File systems
1048# 1003#
1049CONFIG_EXT2_FS=y 1004CONFIG_EXT2_FS=y
@@ -1134,6 +1089,7 @@ CONFIG_LOCKD_V4=y
1134CONFIG_NFS_COMMON=y 1089CONFIG_NFS_COMMON=y
1135CONFIG_SUNRPC=y 1090CONFIG_SUNRPC=y
1136CONFIG_SUNRPC_GSS=y 1091CONFIG_SUNRPC_GSS=y
1092# CONFIG_SUNRPC_BIND34 is not set
1137CONFIG_RPCSEC_GSS_KRB5=y 1093CONFIG_RPCSEC_GSS_KRB5=y
1138# CONFIG_RPCSEC_GSS_SPKM3 is not set 1094# CONFIG_RPCSEC_GSS_SPKM3 is not set
1139# CONFIG_SMB_FS is not set 1095# CONFIG_SMB_FS is not set
@@ -1164,6 +1120,7 @@ CONFIG_LDM_PARTITION=y
1164# CONFIG_SUN_PARTITION is not set 1120# CONFIG_SUN_PARTITION is not set
1165# CONFIG_KARMA_PARTITION is not set 1121# CONFIG_KARMA_PARTITION is not set
1166# CONFIG_EFI_PARTITION is not set 1122# CONFIG_EFI_PARTITION is not set
1123# CONFIG_SYSV68_PARTITION is not set
1167 1124
1168# 1125#
1169# Native Language Support 1126# Native Language Support
@@ -1223,11 +1180,13 @@ CONFIG_UCC=y
1223CONFIG_BITREVERSE=y 1180CONFIG_BITREVERSE=y
1224# CONFIG_CRC_CCITT is not set 1181# CONFIG_CRC_CCITT is not set
1225# CONFIG_CRC16 is not set 1182# CONFIG_CRC16 is not set
1183# CONFIG_CRC_ITU_T is not set
1226CONFIG_CRC32=y 1184CONFIG_CRC32=y
1227# CONFIG_LIBCRC32C is not set 1185# CONFIG_LIBCRC32C is not set
1228CONFIG_PLIST=y 1186CONFIG_PLIST=y
1229CONFIG_HAS_IOMEM=y 1187CONFIG_HAS_IOMEM=y
1230CONFIG_HAS_IOPORT=y 1188CONFIG_HAS_IOPORT=y
1189CONFIG_HAS_DMA=y
1231 1190
1232# 1191#
1233# Instrumentation Support 1192# Instrumentation Support
@@ -1244,7 +1203,6 @@ CONFIG_ENABLE_MUST_CHECK=y
1244# CONFIG_DEBUG_FS is not set 1203# CONFIG_DEBUG_FS is not set
1245# CONFIG_HEADERS_CHECK is not set 1204# CONFIG_HEADERS_CHECK is not set
1246# CONFIG_DEBUG_KERNEL is not set 1205# CONFIG_DEBUG_KERNEL is not set
1247CONFIG_LOG_BUF_SHIFT=14
1248# CONFIG_DEBUG_BUGVERBOSE is not set 1206# CONFIG_DEBUG_BUGVERBOSE is not set
1249# CONFIG_BOOTX_TEXT is not set 1207# CONFIG_BOOTX_TEXT is not set
1250# CONFIG_PPC_EARLY_DEBUG is not set 1208# CONFIG_PPC_EARLY_DEBUG is not set
@@ -1277,6 +1235,7 @@ CONFIG_CRYPTO_ECB=m
1277CONFIG_CRYPTO_CBC=y 1235CONFIG_CRYPTO_CBC=y
1278CONFIG_CRYPTO_PCBC=m 1236CONFIG_CRYPTO_PCBC=m
1279# CONFIG_CRYPTO_LRW is not set 1237# CONFIG_CRYPTO_LRW is not set
1238# CONFIG_CRYPTO_CRYPTD is not set
1280CONFIG_CRYPTO_DES=y 1239CONFIG_CRYPTO_DES=y
1281# CONFIG_CRYPTO_FCRYPT is not set 1240# CONFIG_CRYPTO_FCRYPT is not set
1282# CONFIG_CRYPTO_BLOWFISH is not set 1241# CONFIG_CRYPTO_BLOWFISH is not set
diff --git a/arch/powerpc/configs/mpc834x_itx_defconfig b/arch/powerpc/configs/mpc834x_itx_defconfig
index 23d8964846e0..85470b8cae09 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.20 3# Linux kernel version: 2.6.22-rc7
4# Wed Feb 7 13:12:18 2007 4# Sun Jul 1 23:56:56 2007
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7CONFIG_PPC32=y 7CONFIG_PPC32=y
@@ -45,6 +45,7 @@ CONFIG_PPC_FPU=y
45# CONFIG_PPC_DCR_MMIO is not set 45# CONFIG_PPC_DCR_MMIO is not set
46CONFIG_PPC_STD_MMU=y 46CONFIG_PPC_STD_MMU=y
47CONFIG_PPC_STD_MMU_32=y 47CONFIG_PPC_STD_MMU_32=y
48# CONFIG_PPC_MM_SLICES is not set
48# CONFIG_SMP is not set 49# CONFIG_SMP is not set
49CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 50CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
50 51
@@ -63,14 +64,17 @@ CONFIG_LOCALVERSION_AUTO=y
63CONFIG_SWAP=y 64CONFIG_SWAP=y
64CONFIG_SYSVIPC=y 65CONFIG_SYSVIPC=y
65# CONFIG_IPC_NS is not set 66# CONFIG_IPC_NS is not set
67CONFIG_SYSVIPC_SYSCTL=y
66# CONFIG_POSIX_MQUEUE is not set 68# CONFIG_POSIX_MQUEUE is not set
67# CONFIG_BSD_PROCESS_ACCT is not set 69# CONFIG_BSD_PROCESS_ACCT is not set
68# CONFIG_TASKSTATS is not set 70# CONFIG_TASKSTATS is not set
69# CONFIG_UTS_NS is not set 71# CONFIG_UTS_NS is not set
70# CONFIG_AUDIT is not set 72# CONFIG_AUDIT is not set
71# CONFIG_IKCONFIG is not set 73# CONFIG_IKCONFIG is not set
74CONFIG_LOG_BUF_SHIFT=14
72CONFIG_SYSFS_DEPRECATED=y 75CONFIG_SYSFS_DEPRECATED=y
73# CONFIG_RELAY is not set 76# CONFIG_RELAY is not set
77CONFIG_BLK_DEV_INITRD=y
74CONFIG_INITRAMFS_SOURCE="" 78CONFIG_INITRAMFS_SOURCE=""
75# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 79# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
76CONFIG_SYSCTL=y 80CONFIG_SYSCTL=y
@@ -83,14 +87,19 @@ CONFIG_BUG=y
83CONFIG_ELF_CORE=y 87CONFIG_ELF_CORE=y
84CONFIG_BASE_FULL=y 88CONFIG_BASE_FULL=y
85CONFIG_FUTEX=y 89CONFIG_FUTEX=y
90CONFIG_ANON_INODES=y
86# CONFIG_EPOLL is not set 91# CONFIG_EPOLL is not set
92CONFIG_SIGNALFD=y
93CONFIG_TIMERFD=y
94CONFIG_EVENTFD=y
87CONFIG_SHMEM=y 95CONFIG_SHMEM=y
88CONFIG_SLAB=y
89CONFIG_VM_EVENT_COUNTERS=y 96CONFIG_VM_EVENT_COUNTERS=y
97CONFIG_SLAB=y
98# CONFIG_SLUB is not set
99# CONFIG_SLOB is not set
90CONFIG_RT_MUTEXES=y 100CONFIG_RT_MUTEXES=y
91# CONFIG_TINY_SHMEM is not set 101# CONFIG_TINY_SHMEM is not set
92CONFIG_BASE_SMALL=0 102CONFIG_BASE_SMALL=0
93# CONFIG_SLOB is not set
94 103
95# 104#
96# Loadable module support 105# Loadable module support
@@ -122,18 +131,33 @@ CONFIG_DEFAULT_AS=y
122# CONFIG_DEFAULT_CFQ is not set 131# CONFIG_DEFAULT_CFQ is not set
123# CONFIG_DEFAULT_NOOP is not set 132# CONFIG_DEFAULT_NOOP is not set
124CONFIG_DEFAULT_IOSCHED="anticipatory" 133CONFIG_DEFAULT_IOSCHED="anticipatory"
125CONFIG_PPC_GEN550=y
126# CONFIG_WANT_EARLY_SERIAL is not set
127 134
128# 135#
129# Platform support 136# Platform support
130# 137#
138# CONFIG_PPC_MPC52xx is not set
139# CONFIG_PPC_MPC5200 is not set
140# CONFIG_PPC_CELL is not set
141# CONFIG_PPC_CELL_NATIVE is not set
142# CONFIG_PQ2ADS is not set
143# CONFIG_MPC8313_RDB is not set
131# CONFIG_MPC832x_MDS is not set 144# CONFIG_MPC832x_MDS is not set
132# CONFIG_MPC834x_SYS is not set 145# CONFIG_MPC832x_RDB is not set
146# CONFIG_MPC834x_MDS is not set
133CONFIG_MPC834x_ITX=y 147CONFIG_MPC834x_ITX=y
134# CONFIG_MPC8360E_PB is not set 148# CONFIG_MPC836x_MDS is not set
135CONFIG_MPC834x=y 149CONFIG_MPC834x=y
136# CONFIG_MPIC is not set 150# CONFIG_MPIC is not set
151# CONFIG_MPIC_WEIRD is not set
152# CONFIG_PPC_I8259 is not set
153# CONFIG_PPC_RTAS is not set
154# CONFIG_MMIO_NVRAM is not set
155# CONFIG_PPC_MPC106 is not set
156# CONFIG_PPC_970_NAP is not set
157# CONFIG_PPC_INDIRECT_IO is not set
158# CONFIG_GENERIC_IOMAP is not set
159# CONFIG_CPU_FREQ is not set
160# CONFIG_CPM2 is not set
137 161
138# 162#
139# Kernel options 163# Kernel options
@@ -161,32 +185,33 @@ CONFIG_FLAT_NODE_MEM_MAP=y
161# CONFIG_SPARSEMEM_STATIC is not set 185# CONFIG_SPARSEMEM_STATIC is not set
162CONFIG_SPLIT_PTLOCK_CPUS=4 186CONFIG_SPLIT_PTLOCK_CPUS=4
163# CONFIG_RESOURCES_64BIT is not set 187# CONFIG_RESOURCES_64BIT is not set
188CONFIG_ZONE_DMA_FLAG=1
164CONFIG_PROC_DEVICETREE=y 189CONFIG_PROC_DEVICETREE=y
165# CONFIG_CMDLINE_BOOL is not set 190# CONFIG_CMDLINE_BOOL is not set
166# CONFIG_PM is not set 191# CONFIG_PM is not set
167CONFIG_SECCOMP=y 192CONFIG_SECCOMP=y
193CONFIG_WANT_DEVICE_TREE=y
194CONFIG_DEVICE_TREE=""
168CONFIG_ISA_DMA_API=y 195CONFIG_ISA_DMA_API=y
169 196
170# 197#
171# Bus options 198# Bus options
172# 199#
200CONFIG_ZONE_DMA=y
173CONFIG_GENERIC_ISA_DMA=y 201CONFIG_GENERIC_ISA_DMA=y
174# CONFIG_MPIC_WEIRD is not set
175# CONFIG_PPC_I8259 is not set
176CONFIG_PPC_INDIRECT_PCI=y 202CONFIG_PPC_INDIRECT_PCI=y
203# CONFIG_PPC_INDIRECT_PCI_BE is not set
177CONFIG_FSL_SOC=y 204CONFIG_FSL_SOC=y
178CONFIG_PCI=y 205CONFIG_PCI=y
179CONFIG_PCI_DOMAINS=y 206CONFIG_PCI_DOMAINS=y
180# CONFIG_PCIEPORTBUS is not set 207# CONFIG_PCIEPORTBUS is not set
208CONFIG_ARCH_SUPPORTS_MSI=y
209# CONFIG_PCI_MSI is not set
181 210
182# 211#
183# PCCARD (PCMCIA/CardBus) support 212# PCCARD (PCMCIA/CardBus) support
184# 213#
185# CONFIG_PCCARD is not set 214# CONFIG_PCCARD is not set
186
187#
188# PCI Hotplug Support
189#
190# CONFIG_HOTPLUG_PCI is not set 215# CONFIG_HOTPLUG_PCI is not set
191 216
192# 217#
@@ -211,13 +236,13 @@ CONFIG_NET=y
211# 236#
212# Networking options 237# Networking options
213# 238#
214# CONFIG_NETDEBUG is not set
215CONFIG_PACKET=y 239CONFIG_PACKET=y
216# CONFIG_PACKET_MMAP is not set 240# CONFIG_PACKET_MMAP is not set
217CONFIG_UNIX=y 241CONFIG_UNIX=y
218CONFIG_XFRM=y 242CONFIG_XFRM=y
219# CONFIG_XFRM_USER is not set 243# CONFIG_XFRM_USER is not set
220# CONFIG_XFRM_SUB_POLICY is not set 244# CONFIG_XFRM_SUB_POLICY is not set
245# CONFIG_XFRM_MIGRATE is not set
221# CONFIG_NET_KEY is not set 246# CONFIG_NET_KEY is not set
222CONFIG_INET=y 247CONFIG_INET=y
223CONFIG_IP_MULTICAST=y 248CONFIG_IP_MULTICAST=y
@@ -251,20 +276,8 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
251# CONFIG_INET6_TUNNEL is not set 276# CONFIG_INET6_TUNNEL is not set
252# CONFIG_NETWORK_SECMARK is not set 277# CONFIG_NETWORK_SECMARK is not set
253# CONFIG_NETFILTER is not set 278# CONFIG_NETFILTER is not set
254
255#
256# DCCP Configuration (EXPERIMENTAL)
257#
258# CONFIG_IP_DCCP is not set 279# CONFIG_IP_DCCP is not set
259
260#
261# SCTP Configuration (EXPERIMENTAL)
262#
263# CONFIG_IP_SCTP is not set 280# CONFIG_IP_SCTP is not set
264
265#
266# TIPC Configuration (EXPERIMENTAL)
267#
268# CONFIG_TIPC is not set 281# CONFIG_TIPC is not set
269# CONFIG_ATM is not set 282# CONFIG_ATM is not set
270# CONFIG_BRIDGE is not set 283# CONFIG_BRIDGE is not set
@@ -290,7 +303,16 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
290# CONFIG_HAMRADIO is not set 303# CONFIG_HAMRADIO is not set
291# CONFIG_IRDA is not set 304# CONFIG_IRDA is not set
292# CONFIG_BT is not set 305# CONFIG_BT is not set
306# CONFIG_AF_RXRPC is not set
307
308#
309# Wireless
310#
311# CONFIG_CFG80211 is not set
312# CONFIG_WIRELESS_EXT is not set
313# CONFIG_MAC80211 is not set
293# CONFIG_IEEE80211 is not set 314# CONFIG_IEEE80211 is not set
315# CONFIG_RFKILL is not set
294 316
295# 317#
296# Device Drivers 318# Device Drivers
@@ -308,10 +330,6 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y
308# Connector - unified userspace <-> kernelspace linker 330# Connector - unified userspace <-> kernelspace linker
309# 331#
310# CONFIG_CONNECTOR is not set 332# CONFIG_CONNECTOR is not set
311
312#
313# Memory Technology Devices (MTD)
314#
315CONFIG_MTD=y 333CONFIG_MTD=y
316# CONFIG_MTD_DEBUG is not set 334# CONFIG_MTD_DEBUG is not set
317# CONFIG_MTD_CONCAT is not set 335# CONFIG_MTD_CONCAT is not set
@@ -354,7 +372,6 @@ CONFIG_MTD_CFI_UTIL=y
354# CONFIG_MTD_RAM is not set 372# CONFIG_MTD_RAM is not set
355# CONFIG_MTD_ROM is not set 373# CONFIG_MTD_ROM is not set
356# CONFIG_MTD_ABSENT is not set 374# CONFIG_MTD_ABSENT is not set
357# CONFIG_MTD_OBSOLETE_CHIPS is not set
358 375
359# 376#
360# Mapping drivers for chip access 377# Mapping drivers for chip access
@@ -384,17 +401,13 @@ CONFIG_MTD_PHYSMAP_BANKWIDTH=2
384# CONFIG_MTD_DOC2000 is not set 401# CONFIG_MTD_DOC2000 is not set
385# CONFIG_MTD_DOC2001 is not set 402# CONFIG_MTD_DOC2001 is not set
386# CONFIG_MTD_DOC2001PLUS is not set 403# CONFIG_MTD_DOC2001PLUS is not set
387
388#
389# NAND Flash Device Drivers
390#
391# CONFIG_MTD_NAND is not set 404# CONFIG_MTD_NAND is not set
392# CONFIG_MTD_NAND_CAFE is not set 405# CONFIG_MTD_ONENAND is not set
393 406
394# 407#
395# OneNAND Flash Device Drivers 408# UBI - Unsorted block images
396# 409#
397# CONFIG_MTD_ONENAND is not set 410# CONFIG_MTD_UBI is not set
398 411
399# 412#
400# Parallel port support 413# Parallel port support
@@ -404,6 +417,7 @@ CONFIG_MTD_PHYSMAP_BANKWIDTH=2
404# 417#
405# Plug and Play support 418# Plug and Play support
406# 419#
420# CONFIG_PNPACPI is not set
407 421
408# 422#
409# Block devices 423# Block devices
@@ -423,19 +437,16 @@ CONFIG_BLK_DEV_RAM=y
423CONFIG_BLK_DEV_RAM_COUNT=16 437CONFIG_BLK_DEV_RAM_COUNT=16
424CONFIG_BLK_DEV_RAM_SIZE=32768 438CONFIG_BLK_DEV_RAM_SIZE=32768
425CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 439CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
426CONFIG_BLK_DEV_INITRD=y
427# CONFIG_CDROM_PKTCDVD is not set 440# CONFIG_CDROM_PKTCDVD is not set
428# CONFIG_ATA_OVER_ETH is not set 441# CONFIG_ATA_OVER_ETH is not set
429 442
430# 443#
431# Misc devices 444# Misc devices
432# 445#
446# CONFIG_PHANTOM is not set
433# CONFIG_SGI_IOC4 is not set 447# CONFIG_SGI_IOC4 is not set
434# CONFIG_TIFM_CORE is not set 448# CONFIG_TIFM_CORE is not set
435 449# CONFIG_BLINK is not set
436#
437# ATA/ATAPI/MFM/RLL support
438#
439CONFIG_IDE=y 450CONFIG_IDE=y
440CONFIG_IDE_MAX_HWIFS=4 451CONFIG_IDE_MAX_HWIFS=4
441# CONFIG_BLK_DEV_IDE is not set 452# CONFIG_BLK_DEV_IDE is not set
@@ -468,6 +479,7 @@ CONFIG_CHR_DEV_SG=y
468# CONFIG_SCSI_CONSTANTS is not set 479# CONFIG_SCSI_CONSTANTS is not set
469# CONFIG_SCSI_LOGGING is not set 480# CONFIG_SCSI_LOGGING is not set
470# CONFIG_SCSI_SCAN_ASYNC is not set 481# CONFIG_SCSI_SCAN_ASYNC is not set
482CONFIG_SCSI_WAIT_SCAN=m
471 483
472# 484#
473# SCSI Transports 485# SCSI Transports
@@ -516,10 +528,6 @@ CONFIG_SCSI_SPI_ATTRS=y
516# CONFIG_SCSI_NSP32 is not set 528# CONFIG_SCSI_NSP32 is not set
517# CONFIG_SCSI_DEBUG is not set 529# CONFIG_SCSI_DEBUG is not set
518# CONFIG_SCSI_SRP is not set 530# CONFIG_SCSI_SRP is not set
519
520#
521# Serial ATA (prod) and Parallel ATA (experimental) drivers
522#
523CONFIG_ATA=y 531CONFIG_ATA=y
524# CONFIG_ATA_NONSTANDARD is not set 532# CONFIG_ATA_NONSTANDARD is not set
525# CONFIG_SATA_AHCI is not set 533# CONFIG_SATA_AHCI is not set
@@ -537,10 +545,12 @@ CONFIG_SATA_SIL=y
537# CONFIG_SATA_ULI is not set 545# CONFIG_SATA_ULI is not set
538# CONFIG_SATA_VIA is not set 546# CONFIG_SATA_VIA is not set
539# CONFIG_SATA_VITESSE is not set 547# CONFIG_SATA_VITESSE is not set
548# CONFIG_SATA_INIC162X is not set
540# CONFIG_PATA_ALI is not set 549# CONFIG_PATA_ALI is not set
541# CONFIG_PATA_AMD is not set 550# CONFIG_PATA_AMD is not set
542# CONFIG_PATA_ARTOP is not set 551# CONFIG_PATA_ARTOP is not set
543# CONFIG_PATA_ATIIXP is not set 552# CONFIG_PATA_ATIIXP is not set
553# CONFIG_PATA_CMD640_PCI is not set
544# CONFIG_PATA_CMD64X is not set 554# CONFIG_PATA_CMD64X is not set
545# CONFIG_PATA_CS5520 is not set 555# CONFIG_PATA_CS5520 is not set
546# CONFIG_PATA_CS5530 is not set 556# CONFIG_PATA_CS5530 is not set
@@ -552,6 +562,7 @@ CONFIG_SATA_SIL=y
552# CONFIG_PATA_HPT3X2N is not set 562# CONFIG_PATA_HPT3X2N is not set
553# CONFIG_PATA_HPT3X3 is not set 563# CONFIG_PATA_HPT3X3 is not set
554# CONFIG_PATA_IT821X is not set 564# CONFIG_PATA_IT821X is not set
565# CONFIG_PATA_IT8213 is not set
555# CONFIG_PATA_JMICRON is not set 566# CONFIG_PATA_JMICRON is not set
556# CONFIG_PATA_TRIFLEX is not set 567# CONFIG_PATA_TRIFLEX is not set
557# CONFIG_PATA_MARVELL is not set 568# CONFIG_PATA_MARVELL is not set
@@ -598,18 +609,14 @@ CONFIG_MD_RAID1=y
598# 609#
599# IEEE 1394 (FireWire) support 610# IEEE 1394 (FireWire) support
600# 611#
612# CONFIG_FIREWIRE is not set
601# CONFIG_IEEE1394 is not set 613# CONFIG_IEEE1394 is not set
602 614
603# 615#
604# I2O device support 616# I2O device support
605# 617#
606# CONFIG_I2O is not set 618# CONFIG_I2O is not set
607 619# CONFIG_MACINTOSH_DRIVERS is not set
608#
609# Macintosh device drivers
610#
611# CONFIG_MAC_EMUMOUSEBTN is not set
612# CONFIG_WINDFARM is not set
613 620
614# 621#
615# Network device support 622# Network device support
@@ -619,15 +626,7 @@ CONFIG_NETDEVICES=y
619# CONFIG_BONDING is not set 626# CONFIG_BONDING is not set
620# CONFIG_EQUALIZER is not set 627# CONFIG_EQUALIZER is not set
621# CONFIG_TUN is not set 628# CONFIG_TUN is not set
622
623#
624# ARCnet devices
625#
626# CONFIG_ARCNET is not set 629# CONFIG_ARCNET is not set
627
628#
629# PHY device support
630#
631CONFIG_PHYLIB=y 630CONFIG_PHYLIB=y
632 631
633# 632#
@@ -647,10 +646,7 @@ CONFIG_CICADA_PHY=y
647# Ethernet (10 or 100Mbit) 646# Ethernet (10 or 100Mbit)
648# 647#
649# CONFIG_NET_ETHERNET is not set 648# CONFIG_NET_ETHERNET is not set
650 649CONFIG_NETDEV_1000=y
651#
652# Ethernet (1000 Mbit)
653#
654# CONFIG_ACENIC is not set 650# CONFIG_ACENIC is not set
655# CONFIG_DL2K is not set 651# CONFIG_DL2K is not set
656# CONFIG_E1000 is not set 652# CONFIG_E1000 is not set
@@ -662,34 +658,38 @@ CONFIG_CICADA_PHY=y
662# CONFIG_SKGE is not set 658# CONFIG_SKGE is not set
663# CONFIG_SKY2 is not set 659# CONFIG_SKY2 is not set
664# CONFIG_SK98LIN is not set 660# CONFIG_SK98LIN is not set
661# CONFIG_VIA_VELOCITY is not set
665# CONFIG_TIGON3 is not set 662# CONFIG_TIGON3 is not set
666# CONFIG_BNX2 is not set 663# CONFIG_BNX2 is not set
667CONFIG_GIANFAR=y 664CONFIG_GIANFAR=y
668CONFIG_GFAR_NAPI=y 665CONFIG_GFAR_NAPI=y
669# CONFIG_QLA3XXX is not set 666# CONFIG_QLA3XXX is not set
670 667# CONFIG_ATL1 is not set
671# 668CONFIG_NETDEV_10000=y
672# Ethernet (10000 Mbit)
673#
674# CONFIG_CHELSIO_T1 is not set 669# CONFIG_CHELSIO_T1 is not set
670# CONFIG_CHELSIO_T3 is not set
675# CONFIG_IXGB is not set 671# CONFIG_IXGB is not set
676# CONFIG_S2IO is not set 672# CONFIG_S2IO is not set
677# CONFIG_MYRI10GE is not set 673# CONFIG_MYRI10GE is not set
678# CONFIG_NETXEN_NIC is not set 674# CONFIG_NETXEN_NIC is not set
679 675# CONFIG_MLX4_CORE is not set
680#
681# Token Ring devices
682#
683# CONFIG_TR is not set 676# CONFIG_TR is not set
684 677
685# 678#
686# Wireless LAN (non-hamradio) 679# Wireless LAN
687# 680#
688# CONFIG_NET_RADIO is not set 681# CONFIG_WLAN_PRE80211 is not set
682# CONFIG_WLAN_80211 is not set
689 683
690# 684#
691# Wan interfaces 685# USB Network Adapters
692# 686#
687# CONFIG_USB_CATC is not set
688# CONFIG_USB_KAWETH is not set
689# CONFIG_USB_PEGASUS is not set
690# CONFIG_USB_RTL8150 is not set
691# CONFIG_USB_USBNET_MII is not set
692# CONFIG_USB_USBNET is not set
693# CONFIG_WAN is not set 693# CONFIG_WAN is not set
694# CONFIG_FDDI is not set 694# CONFIG_FDDI is not set
695# CONFIG_HIPPI is not set 695# CONFIG_HIPPI is not set
@@ -745,6 +745,7 @@ CONFIG_SERIAL_8250_RUNTIME_UARTS=4
745CONFIG_SERIAL_CORE=y 745CONFIG_SERIAL_CORE=y
746CONFIG_SERIAL_CORE_CONSOLE=y 746CONFIG_SERIAL_CORE_CONSOLE=y
747# CONFIG_SERIAL_JSM is not set 747# CONFIG_SERIAL_JSM is not set
748# CONFIG_SERIAL_OF_PLATFORM is not set
748CONFIG_UNIX98_PTYS=y 749CONFIG_UNIX98_PTYS=y
749CONFIG_LEGACY_PTYS=y 750CONFIG_LEGACY_PTYS=y
750CONFIG_LEGACY_PTY_COUNT=256 751CONFIG_LEGACY_PTY_COUNT=256
@@ -753,10 +754,6 @@ CONFIG_LEGACY_PTY_COUNT=256
753# IPMI 754# IPMI
754# 755#
755# CONFIG_IPMI_HANDLER is not set 756# CONFIG_IPMI_HANDLER is not set
756
757#
758# Watchdog Cards
759#
760CONFIG_WATCHDOG=y 757CONFIG_WATCHDOG=y
761# CONFIG_WATCHDOG_NOWAYOUT is not set 758# CONFIG_WATCHDOG_NOWAYOUT is not set
762 759
@@ -779,7 +776,6 @@ CONFIG_83xx_WDT=y
779CONFIG_HW_RANDOM=y 776CONFIG_HW_RANDOM=y
780# CONFIG_NVRAM is not set 777# CONFIG_NVRAM is not set
781# CONFIG_GEN_RTC is not set 778# CONFIG_GEN_RTC is not set
782# CONFIG_DTLK is not set
783# CONFIG_R3964 is not set 779# CONFIG_R3964 is not set
784# CONFIG_APPLICOM is not set 780# CONFIG_APPLICOM is not set
785# CONFIG_AGP is not set 781# CONFIG_AGP is not set
@@ -790,11 +786,9 @@ CONFIG_HW_RANDOM=y
790# TPM devices 786# TPM devices
791# 787#
792# CONFIG_TCG_TPM is not set 788# CONFIG_TCG_TPM is not set
793 789CONFIG_DEVPORT=y
794#
795# I2C support
796#
797CONFIG_I2C=y 790CONFIG_I2C=y
791CONFIG_I2C_BOARDINFO=y
798CONFIG_I2C_CHARDEV=y 792CONFIG_I2C_CHARDEV=y
799 793
800# 794#
@@ -821,14 +815,15 @@ CONFIG_I2C_MPC=y
821# CONFIG_I2C_PARPORT_LIGHT is not set 815# CONFIG_I2C_PARPORT_LIGHT is not set
822# CONFIG_I2C_PROSAVAGE is not set 816# CONFIG_I2C_PROSAVAGE is not set
823# CONFIG_I2C_SAVAGE4 is not set 817# CONFIG_I2C_SAVAGE4 is not set
818# CONFIG_I2C_SIMTEC is not set
824# CONFIG_I2C_SIS5595 is not set 819# CONFIG_I2C_SIS5595 is not set
825# CONFIG_I2C_SIS630 is not set 820# CONFIG_I2C_SIS630 is not set
826# CONFIG_I2C_SIS96X is not set 821# CONFIG_I2C_SIS96X is not set
827# CONFIG_I2C_STUB is not set 822# CONFIG_I2C_STUB is not set
823# CONFIG_I2C_TINY_USB is not set
828# CONFIG_I2C_VIA is not set 824# CONFIG_I2C_VIA is not set
829# CONFIG_I2C_VIAPRO is not set 825# CONFIG_I2C_VIAPRO is not set
830# CONFIG_I2C_VOODOO3 is not set 826# CONFIG_I2C_VOODOO3 is not set
831# CONFIG_I2C_PCA_ISA is not set
832 827
833# 828#
834# Miscellaneous I2C Chip support 829# Miscellaneous I2C Chip support
@@ -861,36 +856,40 @@ CONFIG_SPI_MPC83xx=y
861# 856#
862# SPI Protocol Masters 857# SPI Protocol Masters
863# 858#
859# CONFIG_SPI_AT25 is not set
860# CONFIG_SPI_SPIDEV is not set
864 861
865# 862#
866# Dallas's 1-wire bus 863# Dallas's 1-wire bus
867# 864#
868# CONFIG_W1 is not set 865# CONFIG_W1 is not set
866# CONFIG_HWMON is not set
869 867
870# 868#
871# Hardware Monitoring support 869# Multifunction device drivers
872# 870#
873# CONFIG_HWMON is not set 871# CONFIG_MFD_SM501 is not set
874# CONFIG_HWMON_VID is not set
875 872
876# 873#
877# Multimedia devices 874# Multimedia devices
878# 875#
879# CONFIG_VIDEO_DEV is not set 876# CONFIG_VIDEO_DEV is not set
877# CONFIG_DVB_CORE is not set
878CONFIG_DAB=y
879# CONFIG_USB_DABUSB is not set
880 880
881# 881#
882# Digital Video Broadcasting Devices 882# Graphics support
883# 883#
884# CONFIG_DVB is not set 884# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
885# CONFIG_USB_DABUSB is not set
886 885
887# 886#
888# Graphics support 887# Display device support
889# 888#
890# CONFIG_FIRMWARE_EDID is not set 889# CONFIG_DISPLAY_SUPPORT is not set
890# CONFIG_VGASTATE is not set
891# CONFIG_FB is not set 891# CONFIG_FB is not set
892# CONFIG_FB_IBM_GXT4500 is not set 892# CONFIG_FB_IBM_GXT4500 is not set
893# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
894 893
895# 894#
896# Sound 895# Sound
@@ -910,7 +909,7 @@ CONFIG_USB=y
910# Miscellaneous USB options 909# Miscellaneous USB options
911# 910#
912CONFIG_USB_DEVICEFS=y 911CONFIG_USB_DEVICEFS=y
913# CONFIG_USB_BANDWIDTH is not set 912CONFIG_USB_DEVICE_CLASS=y
914# CONFIG_USB_DYNAMIC_MINORS is not set 913# CONFIG_USB_DYNAMIC_MINORS is not set
915# CONFIG_USB_OTG is not set 914# CONFIG_USB_OTG is not set
916 915
@@ -921,6 +920,7 @@ CONFIG_USB_EHCI_HCD=y
921# CONFIG_USB_EHCI_SPLIT_ISO is not set 920# CONFIG_USB_EHCI_SPLIT_ISO is not set
922# CONFIG_USB_EHCI_ROOT_HUB_TT is not set 921# CONFIG_USB_EHCI_ROOT_HUB_TT is not set
923# CONFIG_USB_EHCI_TT_NEWSCHED is not set 922# CONFIG_USB_EHCI_TT_NEWSCHED is not set
923# CONFIG_USB_EHCI_BIG_ENDIAN_MMIO is not set
924# CONFIG_USB_ISP116X_HCD is not set 924# CONFIG_USB_ISP116X_HCD is not set
925# CONFIG_USB_OHCI_HCD is not set 925# CONFIG_USB_OHCI_HCD is not set
926# CONFIG_USB_UHCI_HCD is not set 926# CONFIG_USB_UHCI_HCD is not set
@@ -953,28 +953,10 @@ CONFIG_USB_STORAGE=y
953# CONFIG_USB_LIBUSUAL is not set 953# CONFIG_USB_LIBUSUAL is not set
954 954
955# 955#
956# USB Input Devices
957#
958
959#
960# USB HID Boot Protocol drivers
961#
962
963#
964# USB Imaging devices 956# USB Imaging devices
965# 957#
966# CONFIG_USB_MDC800 is not set 958# CONFIG_USB_MDC800 is not set
967# CONFIG_USB_MICROTEK is not set 959# CONFIG_USB_MICROTEK is not set
968
969#
970# USB Network Adapters
971#
972# CONFIG_USB_CATC is not set
973# CONFIG_USB_KAWETH is not set
974# CONFIG_USB_PEGASUS is not set
975# CONFIG_USB_RTL8150 is not set
976# CONFIG_USB_USBNET_MII is not set
977# CONFIG_USB_USBNET is not set
978CONFIG_USB_MON=y 960CONFIG_USB_MON=y
979 961
980# 962#
@@ -996,6 +978,7 @@ CONFIG_USB_MON=y
996# CONFIG_USB_RIO500 is not set 978# CONFIG_USB_RIO500 is not set
997# CONFIG_USB_LEGOTOWER is not set 979# CONFIG_USB_LEGOTOWER is not set
998# CONFIG_USB_LCD is not set 980# CONFIG_USB_LCD is not set
981# CONFIG_USB_BERRY_CHARGE is not set
999# CONFIG_USB_LED is not set 982# CONFIG_USB_LED is not set
1000# CONFIG_USB_CYPRESS_CY7C63 is not set 983# CONFIG_USB_CYPRESS_CY7C63 is not set
1001# CONFIG_USB_CYTHERM is not set 984# CONFIG_USB_CYTHERM is not set
@@ -1006,6 +989,7 @@ CONFIG_USB_MON=y
1006# CONFIG_USB_SISUSBVGA is not set 989# CONFIG_USB_SISUSBVGA is not set
1007# CONFIG_USB_LD is not set 990# CONFIG_USB_LD is not set
1008# CONFIG_USB_TRANCEVIBRATOR is not set 991# CONFIG_USB_TRANCEVIBRATOR is not set
992# CONFIG_USB_IOWARRIOR is not set
1009# CONFIG_USB_TEST is not set 993# CONFIG_USB_TEST is not set
1010 994
1011# 995#
@@ -1016,10 +1000,6 @@ CONFIG_USB_MON=y
1016# USB Gadget Support 1000# USB Gadget Support
1017# 1001#
1018# CONFIG_USB_GADGET is not set 1002# CONFIG_USB_GADGET is not set
1019
1020#
1021# MMC/SD Card support
1022#
1023# CONFIG_MMC is not set 1003# CONFIG_MMC is not set
1024 1004
1025# 1005#
@@ -1060,26 +1040,39 @@ CONFIG_RTC_INTF_SYSFS=y
1060CONFIG_RTC_INTF_PROC=y 1040CONFIG_RTC_INTF_PROC=y
1061CONFIG_RTC_INTF_DEV=y 1041CONFIG_RTC_INTF_DEV=y
1062CONFIG_RTC_INTF_DEV_UIE_EMUL=y 1042CONFIG_RTC_INTF_DEV_UIE_EMUL=y
1043# CONFIG_RTC_DRV_TEST is not set
1063 1044
1064# 1045#
1065# RTC drivers 1046# I2C RTC drivers
1066# 1047#
1067# CONFIG_RTC_DRV_X1205 is not set
1068CONFIG_RTC_DRV_DS1307=y 1048CONFIG_RTC_DRV_DS1307=y
1069# CONFIG_RTC_DRV_DS1553 is not set
1070# CONFIG_RTC_DRV_ISL1208 is not set
1071# CONFIG_RTC_DRV_DS1672 is not set 1049# CONFIG_RTC_DRV_DS1672 is not set
1072# CONFIG_RTC_DRV_DS1742 is not set 1050# CONFIG_RTC_DRV_MAX6900 is not set
1051# CONFIG_RTC_DRV_RS5C372 is not set
1052# CONFIG_RTC_DRV_ISL1208 is not set
1053# CONFIG_RTC_DRV_X1205 is not set
1073# CONFIG_RTC_DRV_PCF8563 is not set 1054# CONFIG_RTC_DRV_PCF8563 is not set
1074# CONFIG_RTC_DRV_PCF8583 is not set 1055# CONFIG_RTC_DRV_PCF8583 is not set
1056
1057#
1058# SPI RTC drivers
1059#
1075# CONFIG_RTC_DRV_RS5C348 is not set 1060# CONFIG_RTC_DRV_RS5C348 is not set
1076# CONFIG_RTC_DRV_RS5C372 is not set
1077# CONFIG_RTC_DRV_M48T86 is not set
1078# CONFIG_RTC_DRV_TEST is not set
1079# CONFIG_RTC_DRV_MAX6902 is not set 1061# CONFIG_RTC_DRV_MAX6902 is not set
1062
1063#
1064# Platform RTC drivers
1065#
1066# CONFIG_RTC_DRV_DS1553 is not set
1067# CONFIG_RTC_DRV_DS1742 is not set
1068# CONFIG_RTC_DRV_M48T86 is not set
1080# CONFIG_RTC_DRV_V3020 is not set 1069# CONFIG_RTC_DRV_V3020 is not set
1081 1070
1082# 1071#
1072# on-CPU RTC drivers
1073#
1074
1075#
1083# DMA Engine support 1076# DMA Engine support
1084# 1077#
1085CONFIG_DMA_ENGINE=y 1078CONFIG_DMA_ENGINE=y
@@ -1095,10 +1088,6 @@ CONFIG_NET_DMA=y
1095CONFIG_INTEL_IOATDMA=y 1088CONFIG_INTEL_IOATDMA=y
1096 1089
1097# 1090#
1098# Virtualization
1099#
1100
1101#
1102# File systems 1091# File systems
1103# 1092#
1104CONFIG_EXT2_FS=y 1093CONFIG_EXT2_FS=y
@@ -1190,6 +1179,7 @@ CONFIG_LOCKD_V4=y
1190CONFIG_NFS_COMMON=y 1179CONFIG_NFS_COMMON=y
1191CONFIG_SUNRPC=y 1180CONFIG_SUNRPC=y
1192CONFIG_SUNRPC_GSS=y 1181CONFIG_SUNRPC_GSS=y
1182# CONFIG_SUNRPC_BIND34 is not set
1193CONFIG_RPCSEC_GSS_KRB5=y 1183CONFIG_RPCSEC_GSS_KRB5=y
1194# CONFIG_RPCSEC_GSS_SPKM3 is not set 1184# CONFIG_RPCSEC_GSS_SPKM3 is not set
1195# CONFIG_SMB_FS is not set 1185# CONFIG_SMB_FS is not set
@@ -1219,6 +1209,7 @@ CONFIG_MSDOS_PARTITION=y
1219# CONFIG_SUN_PARTITION is not set 1209# CONFIG_SUN_PARTITION is not set
1220# CONFIG_KARMA_PARTITION is not set 1210# CONFIG_KARMA_PARTITION is not set
1221# CONFIG_EFI_PARTITION is not set 1211# CONFIG_EFI_PARTITION is not set
1212# CONFIG_SYSV68_PARTITION is not set
1222 1213
1223# 1214#
1224# Native Language Support 1215# Native Language Support
@@ -1268,6 +1259,7 @@ CONFIG_NLS_DEFAULT="iso8859-1"
1268# Distributed Lock Manager 1259# Distributed Lock Manager
1269# 1260#
1270# CONFIG_DLM is not set 1261# CONFIG_DLM is not set
1262# CONFIG_UCC_SLOW is not set
1271 1263
1272# 1264#
1273# Library routines 1265# Library routines
@@ -1275,10 +1267,13 @@ CONFIG_NLS_DEFAULT="iso8859-1"
1275CONFIG_BITREVERSE=y 1267CONFIG_BITREVERSE=y
1276# CONFIG_CRC_CCITT is not set 1268# CONFIG_CRC_CCITT is not set
1277# CONFIG_CRC16 is not set 1269# CONFIG_CRC16 is not set
1270# CONFIG_CRC_ITU_T is not set
1278CONFIG_CRC32=y 1271CONFIG_CRC32=y
1279# CONFIG_LIBCRC32C is not set 1272# CONFIG_LIBCRC32C is not set
1280CONFIG_PLIST=y 1273CONFIG_PLIST=y
1281CONFIG_IOMAP_COPY=y 1274CONFIG_HAS_IOMEM=y
1275CONFIG_HAS_IOPORT=y
1276CONFIG_HAS_DMA=y
1282 1277
1283# 1278#
1284# Instrumentation Support 1279# Instrumentation Support
@@ -1295,10 +1290,8 @@ CONFIG_ENABLE_MUST_CHECK=y
1295# CONFIG_DEBUG_FS is not set 1290# CONFIG_DEBUG_FS is not set
1296# CONFIG_HEADERS_CHECK is not set 1291# CONFIG_HEADERS_CHECK is not set
1297# CONFIG_DEBUG_KERNEL is not set 1292# CONFIG_DEBUG_KERNEL is not set
1298CONFIG_LOG_BUF_SHIFT=14
1299# CONFIG_DEBUG_BUGVERBOSE is not set 1293# CONFIG_DEBUG_BUGVERBOSE is not set
1300# CONFIG_BOOTX_TEXT is not set 1294# CONFIG_BOOTX_TEXT is not set
1301# CONFIG_SERIAL_TEXT_DEBUG is not set
1302# CONFIG_PPC_EARLY_DEBUG is not set 1295# CONFIG_PPC_EARLY_DEBUG is not set
1303 1296
1304# 1297#
@@ -1327,8 +1320,11 @@ CONFIG_CRYPTO_MD5=y
1327# CONFIG_CRYPTO_GF128MUL is not set 1320# CONFIG_CRYPTO_GF128MUL is not set
1328# CONFIG_CRYPTO_ECB is not set 1321# CONFIG_CRYPTO_ECB is not set
1329CONFIG_CRYPTO_CBC=y 1322CONFIG_CRYPTO_CBC=y
1323CONFIG_CRYPTO_PCBC=m
1330# CONFIG_CRYPTO_LRW is not set 1324# CONFIG_CRYPTO_LRW is not set
1325# CONFIG_CRYPTO_CRYPTD is not set
1331CONFIG_CRYPTO_DES=y 1326CONFIG_CRYPTO_DES=y
1327# CONFIG_CRYPTO_FCRYPT is not set
1332# CONFIG_CRYPTO_BLOWFISH is not set 1328# CONFIG_CRYPTO_BLOWFISH is not set
1333# CONFIG_CRYPTO_TWOFISH is not set 1329# CONFIG_CRYPTO_TWOFISH is not set
1334# CONFIG_CRYPTO_SERPENT is not set 1330# CONFIG_CRYPTO_SERPENT is not set
@@ -1342,6 +1338,7 @@ CONFIG_CRYPTO_DES=y
1342# CONFIG_CRYPTO_DEFLATE is not set 1338# CONFIG_CRYPTO_DEFLATE is not set
1343# CONFIG_CRYPTO_MICHAEL_MIC is not set 1339# CONFIG_CRYPTO_MICHAEL_MIC is not set
1344# CONFIG_CRYPTO_CRC32C is not set 1340# CONFIG_CRYPTO_CRC32C is not set
1341# CONFIG_CRYPTO_CAMELLIA is not set
1345# CONFIG_CRYPTO_TEST is not set 1342# CONFIG_CRYPTO_TEST is not set
1346 1343
1347# 1344#
diff --git a/arch/powerpc/configs/mpc834x_itxgp_defconfig b/arch/powerpc/configs/mpc834x_itxgp_defconfig
index 4aa666c9cb94..704ee8b285bf 100644
--- a/arch/powerpc/configs/mpc834x_itxgp_defconfig
+++ b/arch/powerpc/configs/mpc834x_itxgp_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 3# Linux kernel version: 2.6.22-rc7
4# Fri Feb 9 13:28:19 2007 4# Sun Jul 1 23:56:56 2007
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7CONFIG_PPC32=y 7CONFIG_PPC32=y
@@ -45,6 +45,7 @@ CONFIG_PPC_FPU=y
45# CONFIG_PPC_DCR_MMIO is not set 45# CONFIG_PPC_DCR_MMIO is not set
46CONFIG_PPC_STD_MMU=y 46CONFIG_PPC_STD_MMU=y
47CONFIG_PPC_STD_MMU_32=y 47CONFIG_PPC_STD_MMU_32=y
48# CONFIG_PPC_MM_SLICES is not set
48# CONFIG_SMP is not set 49# CONFIG_SMP is not set
49CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 50CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
50 51
@@ -63,14 +64,17 @@ CONFIG_LOCALVERSION_AUTO=y
63CONFIG_SWAP=y 64CONFIG_SWAP=y
64CONFIG_SYSVIPC=y 65CONFIG_SYSVIPC=y
65# CONFIG_IPC_NS is not set 66# CONFIG_IPC_NS is not set
67CONFIG_SYSVIPC_SYSCTL=y
66# CONFIG_POSIX_MQUEUE is not set 68# CONFIG_POSIX_MQUEUE is not set
67# CONFIG_BSD_PROCESS_ACCT is not set 69# CONFIG_BSD_PROCESS_ACCT is not set
68# CONFIG_TASKSTATS is not set 70# CONFIG_TASKSTATS is not set
69# CONFIG_UTS_NS is not set 71# CONFIG_UTS_NS is not set
70# CONFIG_AUDIT is not set 72# CONFIG_AUDIT is not set
71# CONFIG_IKCONFIG is not set 73# CONFIG_IKCONFIG is not set
74CONFIG_LOG_BUF_SHIFT=14
72CONFIG_SYSFS_DEPRECATED=y 75CONFIG_SYSFS_DEPRECATED=y
73# CONFIG_RELAY is not set 76# CONFIG_RELAY is not set
77CONFIG_BLK_DEV_INITRD=y
74CONFIG_INITRAMFS_SOURCE="" 78CONFIG_INITRAMFS_SOURCE=""
75# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 79# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
76CONFIG_SYSCTL=y 80CONFIG_SYSCTL=y
@@ -83,14 +87,19 @@ CONFIG_BUG=y
83CONFIG_ELF_CORE=y 87CONFIG_ELF_CORE=y
84CONFIG_BASE_FULL=y 88CONFIG_BASE_FULL=y
85CONFIG_FUTEX=y 89CONFIG_FUTEX=y
90CONFIG_ANON_INODES=y
86# CONFIG_EPOLL is not set 91# CONFIG_EPOLL is not set
92CONFIG_SIGNALFD=y
93CONFIG_TIMERFD=y
94CONFIG_EVENTFD=y
87CONFIG_SHMEM=y 95CONFIG_SHMEM=y
88CONFIG_SLAB=y
89CONFIG_VM_EVENT_COUNTERS=y 96CONFIG_VM_EVENT_COUNTERS=y
97CONFIG_SLAB=y
98# CONFIG_SLUB is not set
99# CONFIG_SLOB is not set
90CONFIG_RT_MUTEXES=y 100CONFIG_RT_MUTEXES=y
91# CONFIG_TINY_SHMEM is not set 101# CONFIG_TINY_SHMEM is not set
92CONFIG_BASE_SMALL=0 102CONFIG_BASE_SMALL=0
93# CONFIG_SLOB is not set
94 103
95# 104#
96# Loadable module support 105# Loadable module support
@@ -122,18 +131,33 @@ CONFIG_DEFAULT_AS=y
122# CONFIG_DEFAULT_CFQ is not set 131# CONFIG_DEFAULT_CFQ is not set
123# CONFIG_DEFAULT_NOOP is not set 132# CONFIG_DEFAULT_NOOP is not set
124CONFIG_DEFAULT_IOSCHED="anticipatory" 133CONFIG_DEFAULT_IOSCHED="anticipatory"
125CONFIG_PPC_GEN550=y
126# CONFIG_WANT_EARLY_SERIAL is not set
127 134
128# 135#
129# Platform support 136# Platform support
130# 137#
138# CONFIG_PPC_MPC52xx is not set
139# CONFIG_PPC_MPC5200 is not set
140# CONFIG_PPC_CELL is not set
141# CONFIG_PPC_CELL_NATIVE is not set
142# CONFIG_PQ2ADS is not set
143# CONFIG_MPC8313_RDB is not set
131# CONFIG_MPC832x_MDS is not set 144# CONFIG_MPC832x_MDS is not set
132# CONFIG_MPC834x_SYS is not set 145# CONFIG_MPC832x_RDB is not set
146# CONFIG_MPC834x_MDS is not set
133CONFIG_MPC834x_ITX=y 147CONFIG_MPC834x_ITX=y
134# CONFIG_MPC8360E_PB is not set 148# CONFIG_MPC836x_MDS is not set
135CONFIG_MPC834x=y 149CONFIG_MPC834x=y
136# CONFIG_MPIC is not set 150# CONFIG_MPIC is not set
151# CONFIG_MPIC_WEIRD is not set
152# CONFIG_PPC_I8259 is not set
153# CONFIG_PPC_RTAS is not set
154# CONFIG_MMIO_NVRAM is not set
155# CONFIG_PPC_MPC106 is not set
156# CONFIG_PPC_970_NAP is not set
157# CONFIG_PPC_INDIRECT_IO is not set
158# CONFIG_GENERIC_IOMAP is not set
159# CONFIG_CPU_FREQ is not set
160# CONFIG_CPM2 is not set
137 161
138# 162#
139# Kernel options 163# Kernel options
@@ -161,32 +185,33 @@ CONFIG_FLAT_NODE_MEM_MAP=y
161# CONFIG_SPARSEMEM_STATIC is not set 185# CONFIG_SPARSEMEM_STATIC is not set
162CONFIG_SPLIT_PTLOCK_CPUS=4 186CONFIG_SPLIT_PTLOCK_CPUS=4
163# CONFIG_RESOURCES_64BIT is not set 187# CONFIG_RESOURCES_64BIT is not set
188CONFIG_ZONE_DMA_FLAG=1
164CONFIG_PROC_DEVICETREE=y 189CONFIG_PROC_DEVICETREE=y
165# CONFIG_CMDLINE_BOOL is not set 190# CONFIG_CMDLINE_BOOL is not set
166# CONFIG_PM is not set 191# CONFIG_PM is not set
167CONFIG_SECCOMP=y 192CONFIG_SECCOMP=y
193CONFIG_WANT_DEVICE_TREE=y
194CONFIG_DEVICE_TREE=""
168CONFIG_ISA_DMA_API=y 195CONFIG_ISA_DMA_API=y
169 196
170# 197#
171# Bus options 198# Bus options
172# 199#
200CONFIG_ZONE_DMA=y
173CONFIG_GENERIC_ISA_DMA=y 201CONFIG_GENERIC_ISA_DMA=y
174# CONFIG_MPIC_WEIRD is not set
175# CONFIG_PPC_I8259 is not set
176CONFIG_PPC_INDIRECT_PCI=y 202CONFIG_PPC_INDIRECT_PCI=y
203# CONFIG_PPC_INDIRECT_PCI_BE is not set
177CONFIG_FSL_SOC=y 204CONFIG_FSL_SOC=y
178CONFIG_PCI=y 205CONFIG_PCI=y
179CONFIG_PCI_DOMAINS=y 206CONFIG_PCI_DOMAINS=y
180# CONFIG_PCIEPORTBUS is not set 207# CONFIG_PCIEPORTBUS is not set
208CONFIG_ARCH_SUPPORTS_MSI=y
209# CONFIG_PCI_MSI is not set
181 210
182# 211#
183# PCCARD (PCMCIA/CardBus) support 212# PCCARD (PCMCIA/CardBus) support
184# 213#
185# CONFIG_PCCARD is not set 214# CONFIG_PCCARD is not set
186
187#
188# PCI Hotplug Support
189#
190# CONFIG_HOTPLUG_PCI is not set 215# CONFIG_HOTPLUG_PCI is not set
191 216
192# 217#
@@ -211,13 +236,13 @@ CONFIG_NET=y
211# 236#
212# Networking options 237# Networking options
213# 238#
214# CONFIG_NETDEBUG is not set
215CONFIG_PACKET=y 239CONFIG_PACKET=y
216# CONFIG_PACKET_MMAP is not set 240# CONFIG_PACKET_MMAP is not set
217CONFIG_UNIX=y 241CONFIG_UNIX=y
218CONFIG_XFRM=y 242CONFIG_XFRM=y
219# CONFIG_XFRM_USER is not set 243# CONFIG_XFRM_USER is not set
220# CONFIG_XFRM_SUB_POLICY is not set 244# CONFIG_XFRM_SUB_POLICY is not set
245# CONFIG_XFRM_MIGRATE is not set
221# CONFIG_NET_KEY is not set 246# CONFIG_NET_KEY is not set
222CONFIG_INET=y 247CONFIG_INET=y
223CONFIG_IP_MULTICAST=y 248CONFIG_IP_MULTICAST=y
@@ -251,20 +276,8 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
251# CONFIG_INET6_TUNNEL is not set 276# CONFIG_INET6_TUNNEL is not set
252# CONFIG_NETWORK_SECMARK is not set 277# CONFIG_NETWORK_SECMARK is not set
253# CONFIG_NETFILTER is not set 278# CONFIG_NETFILTER is not set
254
255#
256# DCCP Configuration (EXPERIMENTAL)
257#
258# CONFIG_IP_DCCP is not set 279# CONFIG_IP_DCCP is not set
259
260#
261# SCTP Configuration (EXPERIMENTAL)
262#
263# CONFIG_IP_SCTP is not set 280# CONFIG_IP_SCTP is not set
264
265#
266# TIPC Configuration (EXPERIMENTAL)
267#
268# CONFIG_TIPC is not set 281# CONFIG_TIPC is not set
269# CONFIG_ATM is not set 282# CONFIG_ATM is not set
270# CONFIG_BRIDGE is not set 283# CONFIG_BRIDGE is not set
@@ -290,7 +303,16 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
290# CONFIG_HAMRADIO is not set 303# CONFIG_HAMRADIO is not set
291# CONFIG_IRDA is not set 304# CONFIG_IRDA is not set
292# CONFIG_BT is not set 305# CONFIG_BT is not set
306# CONFIG_AF_RXRPC is not set
307
308#
309# Wireless
310#
311# CONFIG_CFG80211 is not set
312# CONFIG_WIRELESS_EXT is not set
313# CONFIG_MAC80211 is not set
293# CONFIG_IEEE80211 is not set 314# CONFIG_IEEE80211 is not set
315# CONFIG_RFKILL is not set
294 316
295# 317#
296# Device Drivers 318# Device Drivers
@@ -308,10 +330,6 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y
308# Connector - unified userspace <-> kernelspace linker 330# Connector - unified userspace <-> kernelspace linker
309# 331#
310# CONFIG_CONNECTOR is not set 332# CONFIG_CONNECTOR is not set
311
312#
313# Memory Technology Devices (MTD)
314#
315CONFIG_MTD=y 333CONFIG_MTD=y
316# CONFIG_MTD_DEBUG is not set 334# CONFIG_MTD_DEBUG is not set
317# CONFIG_MTD_CONCAT is not set 335# CONFIG_MTD_CONCAT is not set
@@ -354,7 +372,6 @@ CONFIG_MTD_CFI_UTIL=y
354# CONFIG_MTD_RAM is not set 372# CONFIG_MTD_RAM is not set
355# CONFIG_MTD_ROM is not set 373# CONFIG_MTD_ROM is not set
356# CONFIG_MTD_ABSENT is not set 374# CONFIG_MTD_ABSENT is not set
357# CONFIG_MTD_OBSOLETE_CHIPS is not set
358 375
359# 376#
360# Mapping drivers for chip access 377# Mapping drivers for chip access
@@ -384,17 +401,13 @@ CONFIG_MTD_PHYSMAP_BANKWIDTH=2
384# CONFIG_MTD_DOC2000 is not set 401# CONFIG_MTD_DOC2000 is not set
385# CONFIG_MTD_DOC2001 is not set 402# CONFIG_MTD_DOC2001 is not set
386# CONFIG_MTD_DOC2001PLUS is not set 403# CONFIG_MTD_DOC2001PLUS is not set
387
388#
389# NAND Flash Device Drivers
390#
391# CONFIG_MTD_NAND is not set 404# CONFIG_MTD_NAND is not set
392# CONFIG_MTD_NAND_CAFE is not set 405# CONFIG_MTD_ONENAND is not set
393 406
394# 407#
395# OneNAND Flash Device Drivers 408# UBI - Unsorted block images
396# 409#
397# CONFIG_MTD_ONENAND is not set 410# CONFIG_MTD_UBI is not set
398 411
399# 412#
400# Parallel port support 413# Parallel port support
@@ -404,6 +417,7 @@ CONFIG_MTD_PHYSMAP_BANKWIDTH=2
404# 417#
405# Plug and Play support 418# Plug and Play support
406# 419#
420# CONFIG_PNPACPI is not set
407 421
408# 422#
409# Block devices 423# Block devices
@@ -422,19 +436,16 @@ CONFIG_BLK_DEV_RAM=y
422CONFIG_BLK_DEV_RAM_COUNT=16 436CONFIG_BLK_DEV_RAM_COUNT=16
423CONFIG_BLK_DEV_RAM_SIZE=32768 437CONFIG_BLK_DEV_RAM_SIZE=32768
424CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 438CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
425CONFIG_BLK_DEV_INITRD=y
426# CONFIG_CDROM_PKTCDVD is not set 439# CONFIG_CDROM_PKTCDVD is not set
427# CONFIG_ATA_OVER_ETH is not set 440# CONFIG_ATA_OVER_ETH is not set
428 441
429# 442#
430# Misc devices 443# Misc devices
431# 444#
445# CONFIG_PHANTOM is not set
432# CONFIG_SGI_IOC4 is not set 446# CONFIG_SGI_IOC4 is not set
433# CONFIG_TIFM_CORE is not set 447# CONFIG_TIFM_CORE is not set
434 448# CONFIG_BLINK is not set
435#
436# ATA/ATAPI/MFM/RLL support
437#
438# CONFIG_IDE is not set 449# CONFIG_IDE is not set
439 450
440# 451#
@@ -463,6 +474,7 @@ CONFIG_CHR_DEV_SG=y
463# CONFIG_SCSI_CONSTANTS is not set 474# CONFIG_SCSI_CONSTANTS is not set
464# CONFIG_SCSI_LOGGING is not set 475# CONFIG_SCSI_LOGGING is not set
465# CONFIG_SCSI_SCAN_ASYNC is not set 476# CONFIG_SCSI_SCAN_ASYNC is not set
477CONFIG_SCSI_WAIT_SCAN=m
466 478
467# 479#
468# SCSI Transports 480# SCSI Transports
@@ -510,10 +522,6 @@ CONFIG_SCSI_SPI_ATTRS=y
510# CONFIG_SCSI_NSP32 is not set 522# CONFIG_SCSI_NSP32 is not set
511# CONFIG_SCSI_DEBUG is not set 523# CONFIG_SCSI_DEBUG is not set
512# CONFIG_SCSI_SRP is not set 524# CONFIG_SCSI_SRP is not set
513
514#
515# Serial ATA (prod) and Parallel ATA (experimental) drivers
516#
517# CONFIG_ATA is not set 525# CONFIG_ATA is not set
518 526
519# 527#
@@ -532,18 +540,14 @@ CONFIG_SCSI_SPI_ATTRS=y
532# 540#
533# IEEE 1394 (FireWire) support 541# IEEE 1394 (FireWire) support
534# 542#
543# CONFIG_FIREWIRE is not set
535# CONFIG_IEEE1394 is not set 544# CONFIG_IEEE1394 is not set
536 545
537# 546#
538# I2O device support 547# I2O device support
539# 548#
540# CONFIG_I2O is not set 549# CONFIG_I2O is not set
541 550# CONFIG_MACINTOSH_DRIVERS is not set
542#
543# Macintosh device drivers
544#
545# CONFIG_MAC_EMUMOUSEBTN is not set
546# CONFIG_WINDFARM is not set
547 551
548# 552#
549# Network device support 553# Network device support
@@ -553,15 +557,7 @@ CONFIG_NETDEVICES=y
553# CONFIG_BONDING is not set 557# CONFIG_BONDING is not set
554# CONFIG_EQUALIZER is not set 558# CONFIG_EQUALIZER is not set
555# CONFIG_TUN is not set 559# CONFIG_TUN is not set
556
557#
558# ARCnet devices
559#
560# CONFIG_ARCNET is not set 560# CONFIG_ARCNET is not set
561
562#
563# PHY device support
564#
565CONFIG_PHYLIB=y 561CONFIG_PHYLIB=y
566 562
567# 563#
@@ -581,10 +577,7 @@ CONFIG_CICADA_PHY=y
581# Ethernet (10 or 100Mbit) 577# Ethernet (10 or 100Mbit)
582# 578#
583# CONFIG_NET_ETHERNET is not set 579# CONFIG_NET_ETHERNET is not set
584 580CONFIG_NETDEV_1000=y
585#
586# Ethernet (1000 Mbit)
587#
588# CONFIG_ACENIC is not set 581# CONFIG_ACENIC is not set
589# CONFIG_DL2K is not set 582# CONFIG_DL2K is not set
590# CONFIG_E1000 is not set 583# CONFIG_E1000 is not set
@@ -596,34 +589,28 @@ CONFIG_CICADA_PHY=y
596# CONFIG_SKGE is not set 589# CONFIG_SKGE is not set
597# CONFIG_SKY2 is not set 590# CONFIG_SKY2 is not set
598# CONFIG_SK98LIN is not set 591# CONFIG_SK98LIN is not set
592# CONFIG_VIA_VELOCITY is not set
599# CONFIG_TIGON3 is not set 593# CONFIG_TIGON3 is not set
600# CONFIG_BNX2 is not set 594# CONFIG_BNX2 is not set
601CONFIG_GIANFAR=y 595CONFIG_GIANFAR=y
602CONFIG_GFAR_NAPI=y 596CONFIG_GFAR_NAPI=y
603# CONFIG_QLA3XXX is not set 597# CONFIG_QLA3XXX is not set
604 598# CONFIG_ATL1 is not set
605# 599CONFIG_NETDEV_10000=y
606# Ethernet (10000 Mbit)
607#
608# CONFIG_CHELSIO_T1 is not set 600# CONFIG_CHELSIO_T1 is not set
601# CONFIG_CHELSIO_T3 is not set
609# CONFIG_IXGB is not set 602# CONFIG_IXGB is not set
610# CONFIG_S2IO is not set 603# CONFIG_S2IO is not set
611# CONFIG_MYRI10GE is not set 604# CONFIG_MYRI10GE is not set
612# CONFIG_NETXEN_NIC is not set 605# CONFIG_NETXEN_NIC is not set
613 606# CONFIG_MLX4_CORE is not set
614#
615# Token Ring devices
616#
617# CONFIG_TR is not set 607# CONFIG_TR is not set
618 608
619# 609#
620# Wireless LAN (non-hamradio) 610# Wireless LAN
621#
622# CONFIG_NET_RADIO is not set
623
624#
625# Wan interfaces
626# 611#
612# CONFIG_WLAN_PRE80211 is not set
613# CONFIG_WLAN_80211 is not set
627# CONFIG_WAN is not set 614# CONFIG_WAN is not set
628# CONFIG_FDDI is not set 615# CONFIG_FDDI is not set
629# CONFIG_HIPPI is not set 616# CONFIG_HIPPI is not set
@@ -679,6 +666,7 @@ CONFIG_SERIAL_8250_RUNTIME_UARTS=4
679CONFIG_SERIAL_CORE=y 666CONFIG_SERIAL_CORE=y
680CONFIG_SERIAL_CORE_CONSOLE=y 667CONFIG_SERIAL_CORE_CONSOLE=y
681# CONFIG_SERIAL_JSM is not set 668# CONFIG_SERIAL_JSM is not set
669# CONFIG_SERIAL_OF_PLATFORM is not set
682CONFIG_UNIX98_PTYS=y 670CONFIG_UNIX98_PTYS=y
683CONFIG_LEGACY_PTYS=y 671CONFIG_LEGACY_PTYS=y
684CONFIG_LEGACY_PTY_COUNT=256 672CONFIG_LEGACY_PTY_COUNT=256
@@ -687,10 +675,6 @@ CONFIG_LEGACY_PTY_COUNT=256
687# IPMI 675# IPMI
688# 676#
689# CONFIG_IPMI_HANDLER is not set 677# CONFIG_IPMI_HANDLER is not set
690
691#
692# Watchdog Cards
693#
694CONFIG_WATCHDOG=y 678CONFIG_WATCHDOG=y
695# CONFIG_WATCHDOG_NOWAYOUT is not set 679# CONFIG_WATCHDOG_NOWAYOUT is not set
696 680
@@ -708,7 +692,6 @@ CONFIG_83xx_WDT=y
708CONFIG_HW_RANDOM=y 692CONFIG_HW_RANDOM=y
709# CONFIG_NVRAM is not set 693# CONFIG_NVRAM is not set
710# CONFIG_GEN_RTC is not set 694# CONFIG_GEN_RTC is not set
711# CONFIG_DTLK is not set
712# CONFIG_R3964 is not set 695# CONFIG_R3964 is not set
713# CONFIG_APPLICOM is not set 696# CONFIG_APPLICOM is not set
714# CONFIG_AGP is not set 697# CONFIG_AGP is not set
@@ -719,11 +702,9 @@ CONFIG_HW_RANDOM=y
719# TPM devices 702# TPM devices
720# 703#
721# CONFIG_TCG_TPM is not set 704# CONFIG_TCG_TPM is not set
722 705CONFIG_DEVPORT=y
723#
724# I2C support
725#
726CONFIG_I2C=y 706CONFIG_I2C=y
707CONFIG_I2C_BOARDINFO=y
727CONFIG_I2C_CHARDEV=y 708CONFIG_I2C_CHARDEV=y
728 709
729# 710#
@@ -750,6 +731,7 @@ CONFIG_I2C_MPC=y
750# CONFIG_I2C_PARPORT_LIGHT is not set 731# CONFIG_I2C_PARPORT_LIGHT is not set
751# CONFIG_I2C_PROSAVAGE is not set 732# CONFIG_I2C_PROSAVAGE is not set
752# CONFIG_I2C_SAVAGE4 is not set 733# CONFIG_I2C_SAVAGE4 is not set
734# CONFIG_I2C_SIMTEC is not set
753# CONFIG_I2C_SIS5595 is not set 735# CONFIG_I2C_SIS5595 is not set
754# CONFIG_I2C_SIS630 is not set 736# CONFIG_I2C_SIS630 is not set
755# CONFIG_I2C_SIS96X is not set 737# CONFIG_I2C_SIS96X is not set
@@ -757,7 +739,6 @@ CONFIG_I2C_MPC=y
757# CONFIG_I2C_VIA is not set 739# CONFIG_I2C_VIA is not set
758# CONFIG_I2C_VIAPRO is not set 740# CONFIG_I2C_VIAPRO is not set
759# CONFIG_I2C_VOODOO3 is not set 741# CONFIG_I2C_VOODOO3 is not set
760# CONFIG_I2C_PCA_ISA is not set
761 742
762# 743#
763# Miscellaneous I2C Chip support 744# Miscellaneous I2C Chip support
@@ -790,35 +771,39 @@ CONFIG_SPI_MPC83xx=y
790# 771#
791# SPI Protocol Masters 772# SPI Protocol Masters
792# 773#
774# CONFIG_SPI_AT25 is not set
775# CONFIG_SPI_SPIDEV is not set
793 776
794# 777#
795# Dallas's 1-wire bus 778# Dallas's 1-wire bus
796# 779#
797# CONFIG_W1 is not set 780# CONFIG_W1 is not set
781# CONFIG_HWMON is not set
798 782
799# 783#
800# Hardware Monitoring support 784# Multifunction device drivers
801# 785#
802# CONFIG_HWMON is not set 786# CONFIG_MFD_SM501 is not set
803# CONFIG_HWMON_VID is not set
804 787
805# 788#
806# Multimedia devices 789# Multimedia devices
807# 790#
808# CONFIG_VIDEO_DEV is not set 791# CONFIG_VIDEO_DEV is not set
792# CONFIG_DVB_CORE is not set
793CONFIG_DAB=y
809 794
810# 795#
811# Digital Video Broadcasting Devices 796# Graphics support
812# 797#
813# CONFIG_DVB is not set 798# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
814 799
815# 800#
816# Graphics support 801# Display device support
817# 802#
818# CONFIG_FIRMWARE_EDID is not set 803# CONFIG_DISPLAY_SUPPORT is not set
804# CONFIG_VGASTATE is not set
819# CONFIG_FB is not set 805# CONFIG_FB is not set
820# CONFIG_FB_IBM_GXT4500 is not set 806# CONFIG_FB_IBM_GXT4500 is not set
821# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
822 807
823# 808#
824# Sound 809# Sound
@@ -841,10 +826,6 @@ CONFIG_USB_ARCH_HAS_EHCI=y
841# USB Gadget Support 826# USB Gadget Support
842# 827#
843# CONFIG_USB_GADGET is not set 828# CONFIG_USB_GADGET is not set
844
845#
846# MMC/SD Card support
847#
848# CONFIG_MMC is not set 829# CONFIG_MMC is not set
849 830
850# 831#
@@ -885,26 +866,39 @@ CONFIG_RTC_INTF_SYSFS=y
885CONFIG_RTC_INTF_PROC=y 866CONFIG_RTC_INTF_PROC=y
886CONFIG_RTC_INTF_DEV=y 867CONFIG_RTC_INTF_DEV=y
887CONFIG_RTC_INTF_DEV_UIE_EMUL=y 868CONFIG_RTC_INTF_DEV_UIE_EMUL=y
869# CONFIG_RTC_DRV_TEST is not set
888 870
889# 871#
890# RTC drivers 872# I2C RTC drivers
891# 873#
892# CONFIG_RTC_DRV_X1205 is not set
893CONFIG_RTC_DRV_DS1307=y 874CONFIG_RTC_DRV_DS1307=y
894# CONFIG_RTC_DRV_DS1553 is not set
895# CONFIG_RTC_DRV_ISL1208 is not set
896# CONFIG_RTC_DRV_DS1672 is not set 875# CONFIG_RTC_DRV_DS1672 is not set
897# CONFIG_RTC_DRV_DS1742 is not set 876# CONFIG_RTC_DRV_MAX6900 is not set
877# CONFIG_RTC_DRV_RS5C372 is not set
878# CONFIG_RTC_DRV_ISL1208 is not set
879# CONFIG_RTC_DRV_X1205 is not set
898# CONFIG_RTC_DRV_PCF8563 is not set 880# CONFIG_RTC_DRV_PCF8563 is not set
899# CONFIG_RTC_DRV_PCF8583 is not set 881# CONFIG_RTC_DRV_PCF8583 is not set
882
883#
884# SPI RTC drivers
885#
900# CONFIG_RTC_DRV_RS5C348 is not set 886# CONFIG_RTC_DRV_RS5C348 is not set
901# CONFIG_RTC_DRV_RS5C372 is not set
902# CONFIG_RTC_DRV_M48T86 is not set
903# CONFIG_RTC_DRV_TEST is not set
904# CONFIG_RTC_DRV_MAX6902 is not set 887# CONFIG_RTC_DRV_MAX6902 is not set
888
889#
890# Platform RTC drivers
891#
892# CONFIG_RTC_DRV_DS1553 is not set
893# CONFIG_RTC_DRV_DS1742 is not set
894# CONFIG_RTC_DRV_M48T86 is not set
905# CONFIG_RTC_DRV_V3020 is not set 895# CONFIG_RTC_DRV_V3020 is not set
906 896
907# 897#
898# on-CPU RTC drivers
899#
900
901#
908# DMA Engine support 902# DMA Engine support
909# 903#
910CONFIG_DMA_ENGINE=y 904CONFIG_DMA_ENGINE=y
@@ -920,10 +914,6 @@ CONFIG_NET_DMA=y
920CONFIG_INTEL_IOATDMA=y 914CONFIG_INTEL_IOATDMA=y
921 915
922# 916#
923# Virtualization
924#
925
926#
927# File systems 917# File systems
928# 918#
929CONFIG_EXT2_FS=y 919CONFIG_EXT2_FS=y
@@ -1015,6 +1005,7 @@ CONFIG_LOCKD_V4=y
1015CONFIG_NFS_COMMON=y 1005CONFIG_NFS_COMMON=y
1016CONFIG_SUNRPC=y 1006CONFIG_SUNRPC=y
1017CONFIG_SUNRPC_GSS=y 1007CONFIG_SUNRPC_GSS=y
1008# CONFIG_SUNRPC_BIND34 is not set
1018CONFIG_RPCSEC_GSS_KRB5=y 1009CONFIG_RPCSEC_GSS_KRB5=y
1019# CONFIG_RPCSEC_GSS_SPKM3 is not set 1010# CONFIG_RPCSEC_GSS_SPKM3 is not set
1020# CONFIG_SMB_FS is not set 1011# CONFIG_SMB_FS is not set
@@ -1044,6 +1035,7 @@ CONFIG_MSDOS_PARTITION=y
1044# CONFIG_SUN_PARTITION is not set 1035# CONFIG_SUN_PARTITION is not set
1045# CONFIG_KARMA_PARTITION is not set 1036# CONFIG_KARMA_PARTITION is not set
1046# CONFIG_EFI_PARTITION is not set 1037# CONFIG_EFI_PARTITION is not set
1038# CONFIG_SYSV68_PARTITION is not set
1047 1039
1048# 1040#
1049# Native Language Support 1041# Native Language Support
@@ -1093,6 +1085,7 @@ CONFIG_NLS_DEFAULT="iso8859-1"
1093# Distributed Lock Manager 1085# Distributed Lock Manager
1094# 1086#
1095# CONFIG_DLM is not set 1087# CONFIG_DLM is not set
1088# CONFIG_UCC_SLOW is not set
1096 1089
1097# 1090#
1098# Library routines 1091# Library routines
@@ -1100,10 +1093,13 @@ CONFIG_NLS_DEFAULT="iso8859-1"
1100CONFIG_BITREVERSE=y 1093CONFIG_BITREVERSE=y
1101# CONFIG_CRC_CCITT is not set 1094# CONFIG_CRC_CCITT is not set
1102# CONFIG_CRC16 is not set 1095# CONFIG_CRC16 is not set
1096# CONFIG_CRC_ITU_T is not set
1103CONFIG_CRC32=y 1097CONFIG_CRC32=y
1104# CONFIG_LIBCRC32C is not set 1098# CONFIG_LIBCRC32C is not set
1105CONFIG_PLIST=y 1099CONFIG_PLIST=y
1106CONFIG_IOMAP_COPY=y 1100CONFIG_HAS_IOMEM=y
1101CONFIG_HAS_IOPORT=y
1102CONFIG_HAS_DMA=y
1107 1103
1108# 1104#
1109# Instrumentation Support 1105# Instrumentation Support
@@ -1120,10 +1116,8 @@ CONFIG_ENABLE_MUST_CHECK=y
1120# CONFIG_DEBUG_FS is not set 1116# CONFIG_DEBUG_FS is not set
1121# CONFIG_HEADERS_CHECK is not set 1117# CONFIG_HEADERS_CHECK is not set
1122# CONFIG_DEBUG_KERNEL is not set 1118# CONFIG_DEBUG_KERNEL is not set
1123CONFIG_LOG_BUF_SHIFT=14
1124# CONFIG_DEBUG_BUGVERBOSE is not set 1119# CONFIG_DEBUG_BUGVERBOSE is not set
1125# CONFIG_BOOTX_TEXT is not set 1120# CONFIG_BOOTX_TEXT is not set
1126# CONFIG_SERIAL_TEXT_DEBUG is not set
1127# CONFIG_PPC_EARLY_DEBUG is not set 1121# CONFIG_PPC_EARLY_DEBUG is not set
1128 1122
1129# 1123#
@@ -1152,8 +1146,11 @@ CONFIG_CRYPTO_MD5=y
1152# CONFIG_CRYPTO_GF128MUL is not set 1146# CONFIG_CRYPTO_GF128MUL is not set
1153# CONFIG_CRYPTO_ECB is not set 1147# CONFIG_CRYPTO_ECB is not set
1154CONFIG_CRYPTO_CBC=y 1148CONFIG_CRYPTO_CBC=y
1149CONFIG_CRYPTO_PCBC=m
1155# CONFIG_CRYPTO_LRW is not set 1150# CONFIG_CRYPTO_LRW is not set
1151# CONFIG_CRYPTO_CRYPTD is not set
1156CONFIG_CRYPTO_DES=y 1152CONFIG_CRYPTO_DES=y
1153# CONFIG_CRYPTO_FCRYPT is not set
1157# CONFIG_CRYPTO_BLOWFISH is not set 1154# CONFIG_CRYPTO_BLOWFISH is not set
1158# CONFIG_CRYPTO_TWOFISH is not set 1155# CONFIG_CRYPTO_TWOFISH is not set
1159# CONFIG_CRYPTO_SERPENT is not set 1156# CONFIG_CRYPTO_SERPENT is not set
@@ -1167,6 +1164,7 @@ CONFIG_CRYPTO_DES=y
1167# CONFIG_CRYPTO_DEFLATE is not set 1164# CONFIG_CRYPTO_DEFLATE is not set
1168# CONFIG_CRYPTO_MICHAEL_MIC is not set 1165# CONFIG_CRYPTO_MICHAEL_MIC is not set
1169# CONFIG_CRYPTO_CRC32C is not set 1166# CONFIG_CRYPTO_CRC32C is not set
1167# CONFIG_CRYPTO_CAMELLIA is not set
1170# CONFIG_CRYPTO_TEST is not set 1168# CONFIG_CRYPTO_TEST is not set
1171 1169
1172# 1170#
diff --git a/arch/powerpc/configs/mpc834x_mds_defconfig b/arch/powerpc/configs/mpc834x_mds_defconfig
index 2e3f8efb6ab1..c28b3ee3cb12 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.20 3# Linux kernel version: 2.6.22-rc7
4# Thu Feb 8 01:00:48 2007 4# Sun Jul 1 23:56:57 2007
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7CONFIG_PPC32=y 7CONFIG_PPC32=y
@@ -45,6 +45,7 @@ CONFIG_PPC_FPU=y
45# CONFIG_PPC_DCR_MMIO is not set 45# CONFIG_PPC_DCR_MMIO is not set
46CONFIG_PPC_STD_MMU=y 46CONFIG_PPC_STD_MMU=y
47CONFIG_PPC_STD_MMU_32=y 47CONFIG_PPC_STD_MMU_32=y
48# CONFIG_PPC_MM_SLICES is not set
48# CONFIG_SMP is not set 49# CONFIG_SMP is not set
49CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 50CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
50 51
@@ -63,14 +64,17 @@ CONFIG_LOCALVERSION_AUTO=y
63CONFIG_SWAP=y 64CONFIG_SWAP=y
64CONFIG_SYSVIPC=y 65CONFIG_SYSVIPC=y
65# CONFIG_IPC_NS is not set 66# CONFIG_IPC_NS is not set
67CONFIG_SYSVIPC_SYSCTL=y
66# CONFIG_POSIX_MQUEUE is not set 68# CONFIG_POSIX_MQUEUE is not set
67# CONFIG_BSD_PROCESS_ACCT is not set 69# CONFIG_BSD_PROCESS_ACCT is not set
68# CONFIG_TASKSTATS is not set 70# CONFIG_TASKSTATS is not set
69# CONFIG_UTS_NS is not set 71# CONFIG_UTS_NS is not set
70# CONFIG_AUDIT is not set 72# CONFIG_AUDIT is not set
71# CONFIG_IKCONFIG is not set 73# CONFIG_IKCONFIG is not set
74CONFIG_LOG_BUF_SHIFT=14
72CONFIG_SYSFS_DEPRECATED=y 75CONFIG_SYSFS_DEPRECATED=y
73# CONFIG_RELAY is not set 76# CONFIG_RELAY is not set
77CONFIG_BLK_DEV_INITRD=y
74CONFIG_INITRAMFS_SOURCE="" 78CONFIG_INITRAMFS_SOURCE=""
75# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 79# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
76CONFIG_SYSCTL=y 80CONFIG_SYSCTL=y
@@ -83,14 +87,19 @@ CONFIG_BUG=y
83CONFIG_ELF_CORE=y 87CONFIG_ELF_CORE=y
84CONFIG_BASE_FULL=y 88CONFIG_BASE_FULL=y
85CONFIG_FUTEX=y 89CONFIG_FUTEX=y
90CONFIG_ANON_INODES=y
86# CONFIG_EPOLL is not set 91# CONFIG_EPOLL is not set
92CONFIG_SIGNALFD=y
93CONFIG_TIMERFD=y
94CONFIG_EVENTFD=y
87CONFIG_SHMEM=y 95CONFIG_SHMEM=y
88CONFIG_SLAB=y
89CONFIG_VM_EVENT_COUNTERS=y 96CONFIG_VM_EVENT_COUNTERS=y
97CONFIG_SLAB=y
98# CONFIG_SLUB is not set
99# CONFIG_SLOB is not set
90CONFIG_RT_MUTEXES=y 100CONFIG_RT_MUTEXES=y
91# CONFIG_TINY_SHMEM is not set 101# CONFIG_TINY_SHMEM is not set
92CONFIG_BASE_SMALL=0 102CONFIG_BASE_SMALL=0
93# CONFIG_SLOB is not set
94 103
95# 104#
96# Loadable module support 105# Loadable module support
@@ -122,19 +131,33 @@ CONFIG_DEFAULT_AS=y
122# CONFIG_DEFAULT_CFQ is not set 131# CONFIG_DEFAULT_CFQ is not set
123# CONFIG_DEFAULT_NOOP is not set 132# CONFIG_DEFAULT_NOOP is not set
124CONFIG_DEFAULT_IOSCHED="anticipatory" 133CONFIG_DEFAULT_IOSCHED="anticipatory"
125CONFIG_PPC_GEN550=y
126# CONFIG_WANT_EARLY_SERIAL is not set
127 134
128# 135#
129# Platform support 136# Platform support
130# 137#
138# CONFIG_PPC_MPC52xx is not set
139# CONFIG_PPC_MPC5200 is not set
140# CONFIG_PPC_CELL is not set
141# CONFIG_PPC_CELL_NATIVE is not set
142# CONFIG_PQ2ADS is not set
131# CONFIG_MPC8313_RDB is not set 143# CONFIG_MPC8313_RDB is not set
132# CONFIG_MPC832x_MDS is not set 144# CONFIG_MPC832x_MDS is not set
145# CONFIG_MPC832x_RDB is not set
133CONFIG_MPC834x_MDS=y 146CONFIG_MPC834x_MDS=y
134# CONFIG_MPC834x_ITX is not set 147# CONFIG_MPC834x_ITX is not set
135# CONFIG_MPC8360E_PB is not set 148# CONFIG_MPC836x_MDS is not set
136CONFIG_MPC834x=y 149CONFIG_MPC834x=y
137# CONFIG_MPIC is not set 150# CONFIG_MPIC is not set
151# CONFIG_MPIC_WEIRD is not set
152# CONFIG_PPC_I8259 is not set
153# CONFIG_PPC_RTAS is not set
154# CONFIG_MMIO_NVRAM is not set
155# CONFIG_PPC_MPC106 is not set
156# CONFIG_PPC_970_NAP is not set
157# CONFIG_PPC_INDIRECT_IO is not set
158# CONFIG_GENERIC_IOMAP is not set
159# CONFIG_CPU_FREQ is not set
160# CONFIG_CPM2 is not set
138 161
139# 162#
140# Kernel options 163# Kernel options
@@ -162,32 +185,33 @@ CONFIG_FLAT_NODE_MEM_MAP=y
162# CONFIG_SPARSEMEM_STATIC is not set 185# CONFIG_SPARSEMEM_STATIC is not set
163CONFIG_SPLIT_PTLOCK_CPUS=4 186CONFIG_SPLIT_PTLOCK_CPUS=4
164# CONFIG_RESOURCES_64BIT is not set 187# CONFIG_RESOURCES_64BIT is not set
188CONFIG_ZONE_DMA_FLAG=1
165CONFIG_PROC_DEVICETREE=y 189CONFIG_PROC_DEVICETREE=y
166# CONFIG_CMDLINE_BOOL is not set 190# CONFIG_CMDLINE_BOOL is not set
167# CONFIG_PM is not set 191# CONFIG_PM is not set
168CONFIG_SECCOMP=y 192CONFIG_SECCOMP=y
193CONFIG_WANT_DEVICE_TREE=y
194CONFIG_DEVICE_TREE=""
169CONFIG_ISA_DMA_API=y 195CONFIG_ISA_DMA_API=y
170 196
171# 197#
172# Bus options 198# Bus options
173# 199#
200CONFIG_ZONE_DMA=y
174CONFIG_GENERIC_ISA_DMA=y 201CONFIG_GENERIC_ISA_DMA=y
175# CONFIG_MPIC_WEIRD is not set
176# CONFIG_PPC_I8259 is not set
177CONFIG_PPC_INDIRECT_PCI=y 202CONFIG_PPC_INDIRECT_PCI=y
203# CONFIG_PPC_INDIRECT_PCI_BE is not set
178CONFIG_FSL_SOC=y 204CONFIG_FSL_SOC=y
179CONFIG_PCI=y 205CONFIG_PCI=y
180CONFIG_PCI_DOMAINS=y 206CONFIG_PCI_DOMAINS=y
181# CONFIG_PCIEPORTBUS is not set 207# CONFIG_PCIEPORTBUS is not set
208CONFIG_ARCH_SUPPORTS_MSI=y
209# CONFIG_PCI_MSI is not set
182 210
183# 211#
184# PCCARD (PCMCIA/CardBus) support 212# PCCARD (PCMCIA/CardBus) support
185# 213#
186# CONFIG_PCCARD is not set 214# CONFIG_PCCARD is not set
187
188#
189# PCI Hotplug Support
190#
191# CONFIG_HOTPLUG_PCI is not set 215# CONFIG_HOTPLUG_PCI is not set
192 216
193# 217#
@@ -212,13 +236,13 @@ CONFIG_NET=y
212# 236#
213# Networking options 237# Networking options
214# 238#
215# CONFIG_NETDEBUG is not set
216CONFIG_PACKET=y 239CONFIG_PACKET=y
217# CONFIG_PACKET_MMAP is not set 240# CONFIG_PACKET_MMAP is not set
218CONFIG_UNIX=y 241CONFIG_UNIX=y
219CONFIG_XFRM=y 242CONFIG_XFRM=y
220CONFIG_XFRM_USER=m 243CONFIG_XFRM_USER=m
221# CONFIG_XFRM_SUB_POLICY is not set 244# CONFIG_XFRM_SUB_POLICY is not set
245# CONFIG_XFRM_MIGRATE is not set
222# CONFIG_NET_KEY is not set 246# CONFIG_NET_KEY is not set
223CONFIG_INET=y 247CONFIG_INET=y
224CONFIG_IP_MULTICAST=y 248CONFIG_IP_MULTICAST=y
@@ -252,20 +276,8 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
252# CONFIG_INET6_TUNNEL is not set 276# CONFIG_INET6_TUNNEL is not set
253# CONFIG_NETWORK_SECMARK is not set 277# CONFIG_NETWORK_SECMARK is not set
254# CONFIG_NETFILTER is not set 278# CONFIG_NETFILTER is not set
255
256#
257# DCCP Configuration (EXPERIMENTAL)
258#
259# CONFIG_IP_DCCP is not set 279# CONFIG_IP_DCCP is not set
260
261#
262# SCTP Configuration (EXPERIMENTAL)
263#
264# CONFIG_IP_SCTP is not set 280# CONFIG_IP_SCTP is not set
265
266#
267# TIPC Configuration (EXPERIMENTAL)
268#
269# CONFIG_TIPC is not set 281# CONFIG_TIPC is not set
270# CONFIG_ATM is not set 282# CONFIG_ATM is not set
271# CONFIG_BRIDGE is not set 283# CONFIG_BRIDGE is not set
@@ -291,7 +303,16 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
291# CONFIG_HAMRADIO is not set 303# CONFIG_HAMRADIO is not set
292# CONFIG_IRDA is not set 304# CONFIG_IRDA is not set
293# CONFIG_BT is not set 305# CONFIG_BT is not set
306# CONFIG_AF_RXRPC is not set
307
308#
309# Wireless
310#
311# CONFIG_CFG80211 is not set
312# CONFIG_WIRELESS_EXT is not set
313# CONFIG_MAC80211 is not set
294# CONFIG_IEEE80211 is not set 314# CONFIG_IEEE80211 is not set
315# CONFIG_RFKILL is not set
295 316
296# 317#
297# Device Drivers 318# Device Drivers
@@ -309,10 +330,6 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y
309# Connector - unified userspace <-> kernelspace linker 330# Connector - unified userspace <-> kernelspace linker
310# 331#
311# CONFIG_CONNECTOR is not set 332# CONFIG_CONNECTOR is not set
312
313#
314# Memory Technology Devices (MTD)
315#
316# CONFIG_MTD is not set 333# CONFIG_MTD is not set
317 334
318# 335#
@@ -323,6 +340,7 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y
323# 340#
324# Plug and Play support 341# Plug and Play support
325# 342#
343# CONFIG_PNPACPI is not set
326 344
327# 345#
328# Block devices 346# Block devices
@@ -341,19 +359,16 @@ CONFIG_BLK_DEV_RAM=y
341CONFIG_BLK_DEV_RAM_COUNT=16 359CONFIG_BLK_DEV_RAM_COUNT=16
342CONFIG_BLK_DEV_RAM_SIZE=32768 360CONFIG_BLK_DEV_RAM_SIZE=32768
343CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 361CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
344CONFIG_BLK_DEV_INITRD=y
345# CONFIG_CDROM_PKTCDVD is not set 362# CONFIG_CDROM_PKTCDVD is not set
346# CONFIG_ATA_OVER_ETH is not set 363# CONFIG_ATA_OVER_ETH is not set
347 364
348# 365#
349# Misc devices 366# Misc devices
350# 367#
368# CONFIG_PHANTOM is not set
351# CONFIG_SGI_IOC4 is not set 369# CONFIG_SGI_IOC4 is not set
352# CONFIG_TIFM_CORE is not set 370# CONFIG_TIFM_CORE is not set
353 371# CONFIG_BLINK is not set
354#
355# ATA/ATAPI/MFM/RLL support
356#
357# CONFIG_IDE is not set 372# CONFIG_IDE is not set
358 373
359# 374#
@@ -362,10 +377,6 @@ CONFIG_BLK_DEV_INITRD=y
362# CONFIG_RAID_ATTRS is not set 377# CONFIG_RAID_ATTRS is not set
363# CONFIG_SCSI is not set 378# CONFIG_SCSI is not set
364# CONFIG_SCSI_NETLINK is not set 379# CONFIG_SCSI_NETLINK is not set
365
366#
367# Serial ATA (prod) and Parallel ATA (experimental) drivers
368#
369# CONFIG_ATA is not set 380# CONFIG_ATA is not set
370 381
371# 382#
@@ -381,18 +392,14 @@ CONFIG_BLK_DEV_INITRD=y
381# 392#
382# IEEE 1394 (FireWire) support 393# IEEE 1394 (FireWire) support
383# 394#
395# CONFIG_FIREWIRE is not set
384# CONFIG_IEEE1394 is not set 396# CONFIG_IEEE1394 is not set
385 397
386# 398#
387# I2O device support 399# I2O device support
388# 400#
389# CONFIG_I2O is not set 401# CONFIG_I2O is not set
390 402# CONFIG_MACINTOSH_DRIVERS is not set
391#
392# Macintosh device drivers
393#
394# CONFIG_MAC_EMUMOUSEBTN is not set
395# CONFIG_WINDFARM is not set
396 403
397# 404#
398# Network device support 405# Network device support
@@ -402,15 +409,7 @@ CONFIG_NETDEVICES=y
402# CONFIG_BONDING is not set 409# CONFIG_BONDING is not set
403# CONFIG_EQUALIZER is not set 410# CONFIG_EQUALIZER is not set
404# CONFIG_TUN is not set 411# CONFIG_TUN is not set
405
406#
407# ARCnet devices
408#
409# CONFIG_ARCNET is not set 412# CONFIG_ARCNET is not set
410
411#
412# PHY device support
413#
414CONFIG_PHYLIB=y 413CONFIG_PHYLIB=y
415 414
416# 415#
@@ -460,10 +459,8 @@ CONFIG_E100=y
460# CONFIG_SUNDANCE is not set 459# CONFIG_SUNDANCE is not set
461# CONFIG_TLAN is not set 460# CONFIG_TLAN is not set
462# CONFIG_VIA_RHINE is not set 461# CONFIG_VIA_RHINE is not set
463 462# CONFIG_SC92031 is not set
464# 463CONFIG_NETDEV_1000=y
465# Ethernet (1000 Mbit)
466#
467# CONFIG_ACENIC is not set 464# CONFIG_ACENIC is not set
468# CONFIG_DL2K is not set 465# CONFIG_DL2K is not set
469# CONFIG_E1000 is not set 466# CONFIG_E1000 is not set
@@ -481,29 +478,22 @@ CONFIG_E100=y
481CONFIG_GIANFAR=y 478CONFIG_GIANFAR=y
482# CONFIG_GFAR_NAPI is not set 479# CONFIG_GFAR_NAPI is not set
483# CONFIG_QLA3XXX is not set 480# CONFIG_QLA3XXX is not set
484 481# CONFIG_ATL1 is not set
485# 482CONFIG_NETDEV_10000=y
486# Ethernet (10000 Mbit)
487#
488# CONFIG_CHELSIO_T1 is not set 483# CONFIG_CHELSIO_T1 is not set
484# CONFIG_CHELSIO_T3 is not set
489# CONFIG_IXGB is not set 485# CONFIG_IXGB is not set
490# CONFIG_S2IO is not set 486# CONFIG_S2IO is not set
491# CONFIG_MYRI10GE is not set 487# CONFIG_MYRI10GE is not set
492# CONFIG_NETXEN_NIC is not set 488# CONFIG_NETXEN_NIC is not set
493 489# CONFIG_MLX4_CORE is not set
494#
495# Token Ring devices
496#
497# CONFIG_TR is not set 490# CONFIG_TR is not set
498 491
499# 492#
500# Wireless LAN (non-hamradio) 493# Wireless LAN
501#
502# CONFIG_NET_RADIO is not set
503
504#
505# Wan interfaces
506# 494#
495# CONFIG_WLAN_PRE80211 is not set
496# CONFIG_WLAN_80211 is not set
507# CONFIG_WAN is not set 497# CONFIG_WAN is not set
508# CONFIG_FDDI is not set 498# CONFIG_FDDI is not set
509# CONFIG_HIPPI is not set 499# CONFIG_HIPPI is not set
@@ -529,6 +519,7 @@ CONFIG_GIANFAR=y
529# 519#
530CONFIG_INPUT=y 520CONFIG_INPUT=y
531# CONFIG_INPUT_FF_MEMLESS is not set 521# CONFIG_INPUT_FF_MEMLESS is not set
522# CONFIG_INPUT_POLLDEV is not set
532 523
533# 524#
534# Userland interfaces 525# Userland interfaces
@@ -545,6 +536,7 @@ CONFIG_INPUT=y
545# CONFIG_INPUT_KEYBOARD is not set 536# CONFIG_INPUT_KEYBOARD is not set
546# CONFIG_INPUT_MOUSE is not set 537# CONFIG_INPUT_MOUSE is not set
547# CONFIG_INPUT_JOYSTICK is not set 538# CONFIG_INPUT_JOYSTICK is not set
539# CONFIG_INPUT_TABLET is not set
548# CONFIG_INPUT_TOUCHSCREEN is not set 540# CONFIG_INPUT_TOUCHSCREEN is not set
549# CONFIG_INPUT_MISC is not set 541# CONFIG_INPUT_MISC is not set
550 542
@@ -577,6 +569,7 @@ CONFIG_SERIAL_8250_RUNTIME_UARTS=4
577CONFIG_SERIAL_CORE=y 569CONFIG_SERIAL_CORE=y
578CONFIG_SERIAL_CORE_CONSOLE=y 570CONFIG_SERIAL_CORE_CONSOLE=y
579# CONFIG_SERIAL_JSM is not set 571# CONFIG_SERIAL_JSM is not set
572# CONFIG_SERIAL_OF_PLATFORM is not set
580CONFIG_UNIX98_PTYS=y 573CONFIG_UNIX98_PTYS=y
581CONFIG_LEGACY_PTYS=y 574CONFIG_LEGACY_PTYS=y
582CONFIG_LEGACY_PTY_COUNT=256 575CONFIG_LEGACY_PTY_COUNT=256
@@ -585,10 +578,6 @@ CONFIG_LEGACY_PTY_COUNT=256
585# IPMI 578# IPMI
586# 579#
587# CONFIG_IPMI_HANDLER is not set 580# CONFIG_IPMI_HANDLER is not set
588
589#
590# Watchdog Cards
591#
592CONFIG_WATCHDOG=y 581CONFIG_WATCHDOG=y
593# CONFIG_WATCHDOG_NOWAYOUT is not set 582# CONFIG_WATCHDOG_NOWAYOUT is not set
594 583
@@ -607,7 +596,6 @@ CONFIG_83xx_WDT=y
607# CONFIG_NVRAM is not set 596# CONFIG_NVRAM is not set
608CONFIG_GEN_RTC=y 597CONFIG_GEN_RTC=y
609# CONFIG_GEN_RTC_X is not set 598# CONFIG_GEN_RTC_X is not set
610# CONFIG_DTLK is not set
611# CONFIG_R3964 is not set 599# CONFIG_R3964 is not set
612# CONFIG_APPLICOM is not set 600# CONFIG_APPLICOM is not set
613# CONFIG_AGP is not set 601# CONFIG_AGP is not set
@@ -618,11 +606,9 @@ CONFIG_GEN_RTC=y
618# TPM devices 606# TPM devices
619# 607#
620# CONFIG_TCG_TPM is not set 608# CONFIG_TCG_TPM is not set
621 609CONFIG_DEVPORT=y
622#
623# I2C support
624#
625CONFIG_I2C=y 610CONFIG_I2C=y
611CONFIG_I2C_BOARDINFO=y
626CONFIG_I2C_CHARDEV=y 612CONFIG_I2C_CHARDEV=y
627 613
628# 614#
@@ -649,6 +635,7 @@ CONFIG_I2C_MPC=y
649# CONFIG_I2C_PARPORT_LIGHT is not set 635# CONFIG_I2C_PARPORT_LIGHT is not set
650# CONFIG_I2C_PROSAVAGE is not set 636# CONFIG_I2C_PROSAVAGE is not set
651# CONFIG_I2C_SAVAGE4 is not set 637# CONFIG_I2C_SAVAGE4 is not set
638# CONFIG_I2C_SIMTEC is not set
652# CONFIG_I2C_SIS5595 is not set 639# CONFIG_I2C_SIS5595 is not set
653# CONFIG_I2C_SIS630 is not set 640# CONFIG_I2C_SIS630 is not set
654# CONFIG_I2C_SIS96X is not set 641# CONFIG_I2C_SIS96X is not set
@@ -656,7 +643,6 @@ CONFIG_I2C_MPC=y
656# CONFIG_I2C_VIA is not set 643# CONFIG_I2C_VIA is not set
657# CONFIG_I2C_VIAPRO is not set 644# CONFIG_I2C_VIAPRO is not set
658# CONFIG_I2C_VOODOO3 is not set 645# CONFIG_I2C_VOODOO3 is not set
659# CONFIG_I2C_PCA_ISA is not set
660 646
661# 647#
662# Miscellaneous I2C Chip support 648# Miscellaneous I2C Chip support
@@ -684,16 +670,14 @@ CONFIG_I2C_MPC=y
684# Dallas's 1-wire bus 670# Dallas's 1-wire bus
685# 671#
686# CONFIG_W1 is not set 672# CONFIG_W1 is not set
687
688#
689# Hardware Monitoring support
690#
691CONFIG_HWMON=y 673CONFIG_HWMON=y
692# CONFIG_HWMON_VID is not set 674# CONFIG_HWMON_VID is not set
693# CONFIG_SENSORS_ABITUGURU is not set 675# CONFIG_SENSORS_ABITUGURU is not set
676# CONFIG_SENSORS_AD7418 is not set
694# CONFIG_SENSORS_ADM1021 is not set 677# CONFIG_SENSORS_ADM1021 is not set
695# CONFIG_SENSORS_ADM1025 is not set 678# CONFIG_SENSORS_ADM1025 is not set
696# CONFIG_SENSORS_ADM1026 is not set 679# CONFIG_SENSORS_ADM1026 is not set
680# CONFIG_SENSORS_ADM1029 is not set
697# CONFIG_SENSORS_ADM1031 is not set 681# CONFIG_SENSORS_ADM1031 is not set
698# CONFIG_SENSORS_ADM9240 is not set 682# CONFIG_SENSORS_ADM9240 is not set
699# CONFIG_SENSORS_ASB100 is not set 683# CONFIG_SENSORS_ASB100 is not set
@@ -716,6 +700,7 @@ CONFIG_HWMON=y
716# CONFIG_SENSORS_LM90 is not set 700# CONFIG_SENSORS_LM90 is not set
717# CONFIG_SENSORS_LM92 is not set 701# CONFIG_SENSORS_LM92 is not set
718# CONFIG_SENSORS_MAX1619 is not set 702# CONFIG_SENSORS_MAX1619 is not set
703# CONFIG_SENSORS_MAX6650 is not set
719# CONFIG_SENSORS_PC87360 is not set 704# CONFIG_SENSORS_PC87360 is not set
720# CONFIG_SENSORS_PC87427 is not set 705# CONFIG_SENSORS_PC87427 is not set
721# CONFIG_SENSORS_SIS5595 is not set 706# CONFIG_SENSORS_SIS5595 is not set
@@ -735,22 +720,29 @@ CONFIG_HWMON=y
735# CONFIG_HWMON_DEBUG_CHIP is not set 720# CONFIG_HWMON_DEBUG_CHIP is not set
736 721
737# 722#
723# Multifunction device drivers
724#
725# CONFIG_MFD_SM501 is not set
726
727#
738# Multimedia devices 728# Multimedia devices
739# 729#
740# CONFIG_VIDEO_DEV is not set 730# CONFIG_VIDEO_DEV is not set
731# CONFIG_DVB_CORE is not set
732CONFIG_DAB=y
741 733
742# 734#
743# Digital Video Broadcasting Devices 735# Graphics support
744# 736#
745# CONFIG_DVB is not set 737# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
746 738
747# 739#
748# Graphics support 740# Display device support
749# 741#
750CONFIG_FIRMWARE_EDID=y 742# CONFIG_DISPLAY_SUPPORT is not set
743# CONFIG_VGASTATE is not set
751# CONFIG_FB is not set 744# CONFIG_FB is not set
752# CONFIG_FB_IBM_GXT4500 is not set 745# CONFIG_FB_IBM_GXT4500 is not set
753# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
754 746
755# 747#
756# Sound 748# Sound
@@ -761,6 +753,7 @@ CONFIG_FIRMWARE_EDID=y
761# HID Devices 753# HID Devices
762# 754#
763CONFIG_HID=y 755CONFIG_HID=y
756# CONFIG_HID_DEBUG is not set
764 757
765# 758#
766# USB support 759# USB support
@@ -778,10 +771,6 @@ CONFIG_USB_ARCH_HAS_EHCI=y
778# USB Gadget Support 771# USB Gadget Support
779# 772#
780# CONFIG_USB_GADGET is not set 773# CONFIG_USB_GADGET is not set
781
782#
783# MMC/SD Card support
784#
785# CONFIG_MMC is not set 774# CONFIG_MMC is not set
786 775
787# 776#
@@ -825,10 +814,6 @@ CONFIG_USB_ARCH_HAS_EHCI=y
825# 814#
826 815
827# 816#
828# Virtualization
829#
830
831#
832# File systems 817# File systems
833# 818#
834CONFIG_EXT2_FS=y 819CONFIG_EXT2_FS=y
@@ -916,6 +901,7 @@ CONFIG_LOCKD_V4=y
916CONFIG_NFS_COMMON=y 901CONFIG_NFS_COMMON=y
917CONFIG_SUNRPC=y 902CONFIG_SUNRPC=y
918CONFIG_SUNRPC_GSS=y 903CONFIG_SUNRPC_GSS=y
904# CONFIG_SUNRPC_BIND34 is not set
919CONFIG_RPCSEC_GSS_KRB5=y 905CONFIG_RPCSEC_GSS_KRB5=y
920# CONFIG_RPCSEC_GSS_SPKM3 is not set 906# CONFIG_RPCSEC_GSS_SPKM3 is not set
921# CONFIG_SMB_FS is not set 907# CONFIG_SMB_FS is not set
@@ -941,6 +927,7 @@ CONFIG_PARTITION_ADVANCED=y
941# CONFIG_SUN_PARTITION is not set 927# CONFIG_SUN_PARTITION is not set
942# CONFIG_KARMA_PARTITION is not set 928# CONFIG_KARMA_PARTITION is not set
943# CONFIG_EFI_PARTITION is not set 929# CONFIG_EFI_PARTITION is not set
930# CONFIG_SYSV68_PARTITION is not set
944 931
945# 932#
946# Native Language Support 933# Native Language Support
@@ -951,6 +938,7 @@ CONFIG_PARTITION_ADVANCED=y
951# Distributed Lock Manager 938# Distributed Lock Manager
952# 939#
953# CONFIG_DLM is not set 940# CONFIG_DLM is not set
941# CONFIG_UCC_SLOW is not set
954 942
955# 943#
956# Library routines 944# Library routines
@@ -958,10 +946,13 @@ CONFIG_PARTITION_ADVANCED=y
958CONFIG_BITREVERSE=y 946CONFIG_BITREVERSE=y
959# CONFIG_CRC_CCITT is not set 947# CONFIG_CRC_CCITT is not set
960# CONFIG_CRC16 is not set 948# CONFIG_CRC16 is not set
949# CONFIG_CRC_ITU_T is not set
961CONFIG_CRC32=y 950CONFIG_CRC32=y
962# CONFIG_LIBCRC32C is not set 951# CONFIG_LIBCRC32C is not set
963CONFIG_PLIST=y 952CONFIG_PLIST=y
964CONFIG_IOMAP_COPY=y 953CONFIG_HAS_IOMEM=y
954CONFIG_HAS_IOPORT=y
955CONFIG_HAS_DMA=y
965 956
966# 957#
967# Instrumentation Support 958# Instrumentation Support
@@ -978,10 +969,8 @@ CONFIG_ENABLE_MUST_CHECK=y
978# CONFIG_DEBUG_FS is not set 969# CONFIG_DEBUG_FS is not set
979# CONFIG_HEADERS_CHECK is not set 970# CONFIG_HEADERS_CHECK is not set
980# CONFIG_DEBUG_KERNEL is not set 971# CONFIG_DEBUG_KERNEL is not set
981CONFIG_LOG_BUF_SHIFT=14
982# CONFIG_DEBUG_BUGVERBOSE is not set 972# CONFIG_DEBUG_BUGVERBOSE is not set
983# CONFIG_BOOTX_TEXT is not set 973# CONFIG_BOOTX_TEXT is not set
984# CONFIG_SERIAL_TEXT_DEBUG is not set
985# CONFIG_PPC_EARLY_DEBUG is not set 974# CONFIG_PPC_EARLY_DEBUG is not set
986 975
987# 976#
@@ -1010,8 +999,11 @@ CONFIG_CRYPTO_MD5=y
1010# CONFIG_CRYPTO_GF128MUL is not set 999# CONFIG_CRYPTO_GF128MUL is not set
1011CONFIG_CRYPTO_ECB=m 1000CONFIG_CRYPTO_ECB=m
1012CONFIG_CRYPTO_CBC=y 1001CONFIG_CRYPTO_CBC=y
1002CONFIG_CRYPTO_PCBC=m
1013# CONFIG_CRYPTO_LRW is not set 1003# CONFIG_CRYPTO_LRW is not set
1004# CONFIG_CRYPTO_CRYPTD is not set
1014CONFIG_CRYPTO_DES=y 1005CONFIG_CRYPTO_DES=y
1006# CONFIG_CRYPTO_FCRYPT is not set
1015# CONFIG_CRYPTO_BLOWFISH is not set 1007# CONFIG_CRYPTO_BLOWFISH is not set
1016# CONFIG_CRYPTO_TWOFISH is not set 1008# CONFIG_CRYPTO_TWOFISH is not set
1017# CONFIG_CRYPTO_SERPENT is not set 1009# CONFIG_CRYPTO_SERPENT is not set
@@ -1025,6 +1017,7 @@ CONFIG_CRYPTO_DES=y
1025# CONFIG_CRYPTO_DEFLATE is not set 1017# CONFIG_CRYPTO_DEFLATE is not set
1026# CONFIG_CRYPTO_MICHAEL_MIC is not set 1018# CONFIG_CRYPTO_MICHAEL_MIC is not set
1027# CONFIG_CRYPTO_CRC32C is not set 1019# CONFIG_CRYPTO_CRC32C is not set
1020# CONFIG_CRYPTO_CAMELLIA is not set
1028# CONFIG_CRYPTO_TEST is not set 1021# CONFIG_CRYPTO_TEST is not set
1029 1022
1030# 1023#
diff --git a/arch/powerpc/configs/mpc836x_mds_defconfig b/arch/powerpc/configs/mpc836x_mds_defconfig
index 921a151dc778..bcbbc167f90d 100644
--- a/arch/powerpc/configs/mpc836x_mds_defconfig
+++ b/arch/powerpc/configs/mpc836x_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.21-rc5 3# Linux kernel version: 2.6.22-rc7
4# Mon Apr 9 16:14:05 2007 4# Sun Jul 1 23:56:57 2007
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7CONFIG_PPC32=y 7CONFIG_PPC32=y
@@ -45,6 +45,7 @@ CONFIG_PPC_FPU=y
45# CONFIG_PPC_DCR_MMIO is not set 45# CONFIG_PPC_DCR_MMIO is not set
46CONFIG_PPC_STD_MMU=y 46CONFIG_PPC_STD_MMU=y
47CONFIG_PPC_STD_MMU_32=y 47CONFIG_PPC_STD_MMU_32=y
48# CONFIG_PPC_MM_SLICES is not set
48# CONFIG_SMP is not set 49# CONFIG_SMP is not set
49CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 50CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
50 51
@@ -70,6 +71,7 @@ CONFIG_SYSVIPC_SYSCTL=y
70# CONFIG_UTS_NS is not set 71# CONFIG_UTS_NS is not set
71# CONFIG_AUDIT is not set 72# CONFIG_AUDIT is not set
72# CONFIG_IKCONFIG is not set 73# CONFIG_IKCONFIG is not set
74CONFIG_LOG_BUF_SHIFT=14
73CONFIG_SYSFS_DEPRECATED=y 75CONFIG_SYSFS_DEPRECATED=y
74# CONFIG_RELAY is not set 76# CONFIG_RELAY is not set
75CONFIG_BLK_DEV_INITRD=y 77CONFIG_BLK_DEV_INITRD=y
@@ -85,14 +87,19 @@ CONFIG_BUG=y
85CONFIG_ELF_CORE=y 87CONFIG_ELF_CORE=y
86CONFIG_BASE_FULL=y 88CONFIG_BASE_FULL=y
87CONFIG_FUTEX=y 89CONFIG_FUTEX=y
90CONFIG_ANON_INODES=y
88# CONFIG_EPOLL is not set 91# CONFIG_EPOLL is not set
92CONFIG_SIGNALFD=y
93CONFIG_TIMERFD=y
94CONFIG_EVENTFD=y
89CONFIG_SHMEM=y 95CONFIG_SHMEM=y
90CONFIG_SLAB=y
91CONFIG_VM_EVENT_COUNTERS=y 96CONFIG_VM_EVENT_COUNTERS=y
97CONFIG_SLAB=y
98# CONFIG_SLUB is not set
99# CONFIG_SLOB is not set
92CONFIG_RT_MUTEXES=y 100CONFIG_RT_MUTEXES=y
93# CONFIG_TINY_SHMEM is not set 101# CONFIG_TINY_SHMEM is not set
94CONFIG_BASE_SMALL=0 102CONFIG_BASE_SMALL=0
95# CONFIG_SLOB is not set
96 103
97# 104#
98# Loadable module support 105# Loadable module support
@@ -124,12 +131,15 @@ CONFIG_DEFAULT_AS=y
124# CONFIG_DEFAULT_CFQ is not set 131# CONFIG_DEFAULT_CFQ is not set
125# CONFIG_DEFAULT_NOOP is not set 132# CONFIG_DEFAULT_NOOP is not set
126CONFIG_DEFAULT_IOSCHED="anticipatory" 133CONFIG_DEFAULT_IOSCHED="anticipatory"
127CONFIG_QUICC_ENGINE=y
128# CONFIG_WANT_EARLY_SERIAL is not set
129 134
130# 135#
131# Platform support 136# Platform support
132# 137#
138# CONFIG_PPC_MPC52xx is not set
139# CONFIG_PPC_MPC5200 is not set
140# CONFIG_PPC_CELL is not set
141# CONFIG_PPC_CELL_NATIVE is not set
142# CONFIG_PQ2ADS is not set
133# CONFIG_MPC8313_RDB is not set 143# CONFIG_MPC8313_RDB is not set
134# CONFIG_MPC832x_MDS is not set 144# CONFIG_MPC832x_MDS is not set
135# CONFIG_MPC832x_RDB is not set 145# CONFIG_MPC832x_RDB is not set
@@ -138,6 +148,17 @@ CONFIG_QUICC_ENGINE=y
138CONFIG_MPC836x_MDS=y 148CONFIG_MPC836x_MDS=y
139CONFIG_PPC_MPC836x=y 149CONFIG_PPC_MPC836x=y
140# CONFIG_MPIC is not set 150# CONFIG_MPIC is not set
151# CONFIG_MPIC_WEIRD is not set
152# CONFIG_PPC_I8259 is not set
153# CONFIG_PPC_RTAS is not set
154# CONFIG_MMIO_NVRAM is not set
155# CONFIG_PPC_MPC106 is not set
156# CONFIG_PPC_970_NAP is not set
157# CONFIG_PPC_INDIRECT_IO is not set
158# CONFIG_GENERIC_IOMAP is not set
159# CONFIG_CPU_FREQ is not set
160CONFIG_QUICC_ENGINE=y
161# CONFIG_CPM2 is not set
141 162
142# 163#
143# Kernel options 164# Kernel options
@@ -170,6 +191,8 @@ CONFIG_PROC_DEVICETREE=y
170# CONFIG_CMDLINE_BOOL is not set 191# CONFIG_CMDLINE_BOOL is not set
171# CONFIG_PM is not set 192# CONFIG_PM is not set
172CONFIG_SECCOMP=y 193CONFIG_SECCOMP=y
194CONFIG_WANT_DEVICE_TREE=y
195CONFIG_DEVICE_TREE=""
173CONFIG_ISA_DMA_API=y 196CONFIG_ISA_DMA_API=y
174 197
175# 198#
@@ -177,22 +200,19 @@ CONFIG_ISA_DMA_API=y
177# 200#
178CONFIG_ZONE_DMA=y 201CONFIG_ZONE_DMA=y
179CONFIG_GENERIC_ISA_DMA=y 202CONFIG_GENERIC_ISA_DMA=y
180# CONFIG_MPIC_WEIRD is not set
181# CONFIG_PPC_I8259 is not set
182CONFIG_PPC_INDIRECT_PCI=y 203CONFIG_PPC_INDIRECT_PCI=y
204# CONFIG_PPC_INDIRECT_PCI_BE is not set
183CONFIG_FSL_SOC=y 205CONFIG_FSL_SOC=y
184CONFIG_PCI=y 206CONFIG_PCI=y
185CONFIG_PCI_DOMAINS=y 207CONFIG_PCI_DOMAINS=y
186# CONFIG_PCIEPORTBUS is not set 208# CONFIG_PCIEPORTBUS is not set
209CONFIG_ARCH_SUPPORTS_MSI=y
210# CONFIG_PCI_MSI is not set
187 211
188# 212#
189# PCCARD (PCMCIA/CardBus) support 213# PCCARD (PCMCIA/CardBus) support
190# 214#
191# CONFIG_PCCARD is not set 215# CONFIG_PCCARD is not set
192
193#
194# PCI Hotplug Support
195#
196# CONFIG_HOTPLUG_PCI is not set 216# CONFIG_HOTPLUG_PCI is not set
197 217
198# 218#
@@ -217,7 +237,6 @@ CONFIG_NET=y
217# 237#
218# Networking options 238# Networking options
219# 239#
220# CONFIG_NETDEBUG is not set
221CONFIG_PACKET=y 240CONFIG_PACKET=y
222# CONFIG_PACKET_MMAP is not set 241# CONFIG_PACKET_MMAP is not set
223CONFIG_UNIX=y 242CONFIG_UNIX=y
@@ -258,20 +277,8 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
258# CONFIG_INET6_TUNNEL is not set 277# CONFIG_INET6_TUNNEL is not set
259# CONFIG_NETWORK_SECMARK is not set 278# CONFIG_NETWORK_SECMARK is not set
260# CONFIG_NETFILTER is not set 279# CONFIG_NETFILTER is not set
261
262#
263# DCCP Configuration (EXPERIMENTAL)
264#
265# CONFIG_IP_DCCP is not set 280# CONFIG_IP_DCCP is not set
266
267#
268# SCTP Configuration (EXPERIMENTAL)
269#
270# CONFIG_IP_SCTP is not set 281# CONFIG_IP_SCTP is not set
271
272#
273# TIPC Configuration (EXPERIMENTAL)
274#
275# CONFIG_TIPC is not set 282# CONFIG_TIPC is not set
276# CONFIG_ATM is not set 283# CONFIG_ATM is not set
277# CONFIG_BRIDGE is not set 284# CONFIG_BRIDGE is not set
@@ -297,7 +304,16 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
297# CONFIG_HAMRADIO is not set 304# CONFIG_HAMRADIO is not set
298# CONFIG_IRDA is not set 305# CONFIG_IRDA is not set
299# CONFIG_BT is not set 306# CONFIG_BT is not set
307# CONFIG_AF_RXRPC is not set
308
309#
310# Wireless
311#
312# CONFIG_CFG80211 is not set
313# CONFIG_WIRELESS_EXT is not set
314# CONFIG_MAC80211 is not set
300# CONFIG_IEEE80211 is not set 315# CONFIG_IEEE80211 is not set
316# CONFIG_RFKILL is not set
301 317
302# 318#
303# Device Drivers 319# Device Drivers
@@ -315,10 +331,6 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y
315# Connector - unified userspace <-> kernelspace linker 331# Connector - unified userspace <-> kernelspace linker
316# 332#
317# CONFIG_CONNECTOR is not set 333# CONFIG_CONNECTOR is not set
318
319#
320# Memory Technology Devices (MTD)
321#
322# CONFIG_MTD is not set 334# CONFIG_MTD is not set
323 335
324# 336#
@@ -354,12 +366,10 @@ CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
354# 366#
355# Misc devices 367# Misc devices
356# 368#
369# CONFIG_PHANTOM is not set
357# CONFIG_SGI_IOC4 is not set 370# CONFIG_SGI_IOC4 is not set
358# CONFIG_TIFM_CORE is not set 371# CONFIG_TIFM_CORE is not set
359 372# CONFIG_BLINK is not set
360#
361# ATA/ATAPI/MFM/RLL support
362#
363# CONFIG_IDE is not set 373# CONFIG_IDE is not set
364 374
365# 375#
@@ -388,6 +398,7 @@ CONFIG_SCSI_PROC_FS=y
388# CONFIG_SCSI_CONSTANTS is not set 398# CONFIG_SCSI_CONSTANTS is not set
389# CONFIG_SCSI_LOGGING is not set 399# CONFIG_SCSI_LOGGING is not set
390# CONFIG_SCSI_SCAN_ASYNC is not set 400# CONFIG_SCSI_SCAN_ASYNC is not set
401CONFIG_SCSI_WAIT_SCAN=m
391 402
392# 403#
393# SCSI Transports 404# SCSI Transports
@@ -435,10 +446,6 @@ CONFIG_SCSI_PROC_FS=y
435# CONFIG_SCSI_NSP32 is not set 446# CONFIG_SCSI_NSP32 is not set
436# CONFIG_SCSI_DEBUG is not set 447# CONFIG_SCSI_DEBUG is not set
437# CONFIG_SCSI_SRP is not set 448# CONFIG_SCSI_SRP is not set
438
439#
440# Serial ATA (prod) and Parallel ATA (experimental) drivers
441#
442# CONFIG_ATA is not set 449# CONFIG_ATA is not set
443 450
444# 451#
@@ -457,18 +464,14 @@ CONFIG_SCSI_PROC_FS=y
457# 464#
458# IEEE 1394 (FireWire) support 465# IEEE 1394 (FireWire) support
459# 466#
467# CONFIG_FIREWIRE is not set
460# CONFIG_IEEE1394 is not set 468# CONFIG_IEEE1394 is not set
461 469
462# 470#
463# I2O device support 471# I2O device support
464# 472#
465# CONFIG_I2O is not set 473# CONFIG_I2O is not set
466 474# CONFIG_MACINTOSH_DRIVERS is not set
467#
468# Macintosh device drivers
469#
470# CONFIG_MAC_EMUMOUSEBTN is not set
471# CONFIG_WINDFARM is not set
472 475
473# 476#
474# Network device support 477# Network device support
@@ -478,15 +481,7 @@ CONFIG_NETDEVICES=y
478# CONFIG_BONDING is not set 481# CONFIG_BONDING is not set
479# CONFIG_EQUALIZER is not set 482# CONFIG_EQUALIZER is not set
480# CONFIG_TUN is not set 483# CONFIG_TUN is not set
481
482#
483# ARCnet devices
484#
485# CONFIG_ARCNET is not set 484# CONFIG_ARCNET is not set
486
487#
488# PHY device support
489#
490CONFIG_PHYLIB=y 485CONFIG_PHYLIB=y
491 486
492# 487#
@@ -500,7 +495,6 @@ CONFIG_MARVELL_PHY=y
500# CONFIG_VITESSE_PHY is not set 495# CONFIG_VITESSE_PHY is not set
501# CONFIG_SMSC_PHY is not set 496# CONFIG_SMSC_PHY is not set
502# CONFIG_BROADCOM_PHY is not set 497# CONFIG_BROADCOM_PHY is not set
503# CONFIG_ICPLUS_PHY is not set
504# CONFIG_FIXED_PHY is not set 498# CONFIG_FIXED_PHY is not set
505 499
506# 500#
@@ -519,10 +513,7 @@ CONFIG_MII=y
519# CONFIG_NET_TULIP is not set 513# CONFIG_NET_TULIP is not set
520# CONFIG_HP100 is not set 514# CONFIG_HP100 is not set
521# CONFIG_NET_PCI is not set 515# CONFIG_NET_PCI is not set
522 516CONFIG_NETDEV_1000=y
523#
524# Ethernet (1000 Mbit)
525#
526# CONFIG_ACENIC is not set 517# CONFIG_ACENIC is not set
527# CONFIG_DL2K is not set 518# CONFIG_DL2K is not set
528# CONFIG_E1000 is not set 519# CONFIG_E1000 is not set
@@ -534,6 +525,7 @@ CONFIG_MII=y
534# CONFIG_SKGE is not set 525# CONFIG_SKGE is not set
535# CONFIG_SKY2 is not set 526# CONFIG_SKY2 is not set
536# CONFIG_SK98LIN is not set 527# CONFIG_SK98LIN is not set
528# CONFIG_VIA_VELOCITY is not set
537# CONFIG_TIGON3 is not set 529# CONFIG_TIGON3 is not set
538# CONFIG_BNX2 is not set 530# CONFIG_BNX2 is not set
539# CONFIG_GIANFAR is not set 531# CONFIG_GIANFAR is not set
@@ -541,33 +533,24 @@ CONFIG_UCC_GETH=y
541# CONFIG_UGETH_NAPI is not set 533# CONFIG_UGETH_NAPI is not set
542# CONFIG_UGETH_MAGIC_PACKET is not set 534# CONFIG_UGETH_MAGIC_PACKET is not set
543# CONFIG_UGETH_FILTERING is not set 535# CONFIG_UGETH_FILTERING is not set
544# CONFIG_UGETH_TX_ON_DEMOND is not set 536# CONFIG_UGETH_TX_ON_DEMAND is not set
545# CONFIG_QLA3XXX is not set 537# CONFIG_QLA3XXX is not set
546# CONFIG_ATL1 is not set 538# CONFIG_ATL1 is not set
547 539CONFIG_NETDEV_10000=y
548#
549# Ethernet (10000 Mbit)
550#
551# CONFIG_CHELSIO_T1 is not set 540# CONFIG_CHELSIO_T1 is not set
552# CONFIG_CHELSIO_T3 is not set 541# CONFIG_CHELSIO_T3 is not set
553# CONFIG_IXGB is not set 542# CONFIG_IXGB is not set
554# CONFIG_S2IO is not set 543# CONFIG_S2IO is not set
555# CONFIG_MYRI10GE is not set 544# CONFIG_MYRI10GE is not set
556# CONFIG_NETXEN_NIC is not set 545# CONFIG_NETXEN_NIC is not set
557 546# CONFIG_MLX4_CORE is not set
558#
559# Token Ring devices
560#
561# CONFIG_TR is not set 547# CONFIG_TR is not set
562 548
563# 549#
564# Wireless LAN (non-hamradio) 550# Wireless LAN
565#
566# CONFIG_NET_RADIO is not set
567
568#
569# Wan interfaces
570# 551#
552# CONFIG_WLAN_PRE80211 is not set
553# CONFIG_WLAN_80211 is not set
571# CONFIG_WAN is not set 554# CONFIG_WAN is not set
572# CONFIG_FDDI is not set 555# CONFIG_FDDI is not set
573# CONFIG_HIPPI is not set 556# CONFIG_HIPPI is not set
@@ -594,6 +577,7 @@ CONFIG_UCC_GETH=y
594# 577#
595CONFIG_INPUT=y 578CONFIG_INPUT=y
596# CONFIG_INPUT_FF_MEMLESS is not set 579# CONFIG_INPUT_FF_MEMLESS is not set
580# CONFIG_INPUT_POLLDEV is not set
597 581
598# 582#
599# Userland interfaces 583# Userland interfaces
@@ -610,6 +594,7 @@ CONFIG_INPUT=y
610# CONFIG_INPUT_KEYBOARD is not set 594# CONFIG_INPUT_KEYBOARD is not set
611# CONFIG_INPUT_MOUSE is not set 595# CONFIG_INPUT_MOUSE is not set
612# CONFIG_INPUT_JOYSTICK is not set 596# CONFIG_INPUT_JOYSTICK is not set
597# CONFIG_INPUT_TABLET is not set
613# CONFIG_INPUT_TOUCHSCREEN is not set 598# CONFIG_INPUT_TOUCHSCREEN is not set
614# CONFIG_INPUT_MISC is not set 599# CONFIG_INPUT_MISC is not set
615 600
@@ -651,10 +636,6 @@ CONFIG_LEGACY_PTY_COUNT=256
651# IPMI 636# IPMI
652# 637#
653# CONFIG_IPMI_HANDLER is not set 638# CONFIG_IPMI_HANDLER is not set
654
655#
656# Watchdog Cards
657#
658CONFIG_WATCHDOG=y 639CONFIG_WATCHDOG=y
659# CONFIG_WATCHDOG_NOWAYOUT is not set 640# CONFIG_WATCHDOG_NOWAYOUT is not set
660 641
@@ -673,7 +654,6 @@ CONFIG_HW_RANDOM=y
673# CONFIG_NVRAM is not set 654# CONFIG_NVRAM is not set
674CONFIG_GEN_RTC=y 655CONFIG_GEN_RTC=y
675# CONFIG_GEN_RTC_X is not set 656# CONFIG_GEN_RTC_X is not set
676# CONFIG_DTLK is not set
677# CONFIG_R3964 is not set 657# CONFIG_R3964 is not set
678# CONFIG_APPLICOM is not set 658# CONFIG_APPLICOM is not set
679# CONFIG_AGP is not set 659# CONFIG_AGP is not set
@@ -684,11 +664,9 @@ CONFIG_GEN_RTC=y
684# TPM devices 664# TPM devices
685# 665#
686# CONFIG_TCG_TPM is not set 666# CONFIG_TCG_TPM is not set
687 667CONFIG_DEVPORT=y
688#
689# I2C support
690#
691CONFIG_I2C=y 668CONFIG_I2C=y
669CONFIG_I2C_BOARDINFO=y
692CONFIG_I2C_CHARDEV=y 670CONFIG_I2C_CHARDEV=y
693 671
694# 672#
@@ -713,9 +691,9 @@ CONFIG_I2C_MPC=y
713# CONFIG_I2C_NFORCE2 is not set 691# CONFIG_I2C_NFORCE2 is not set
714# CONFIG_I2C_OCORES is not set 692# CONFIG_I2C_OCORES is not set
715# CONFIG_I2C_PARPORT_LIGHT is not set 693# CONFIG_I2C_PARPORT_LIGHT is not set
716# CONFIG_I2C_PASEMI is not set
717# CONFIG_I2C_PROSAVAGE is not set 694# CONFIG_I2C_PROSAVAGE is not set
718# CONFIG_I2C_SAVAGE4 is not set 695# CONFIG_I2C_SAVAGE4 is not set
696# CONFIG_I2C_SIMTEC is not set
719# CONFIG_I2C_SIS5595 is not set 697# CONFIG_I2C_SIS5595 is not set
720# CONFIG_I2C_SIS630 is not set 698# CONFIG_I2C_SIS630 is not set
721# CONFIG_I2C_SIS96X is not set 699# CONFIG_I2C_SIS96X is not set
@@ -723,7 +701,6 @@ CONFIG_I2C_MPC=y
723# CONFIG_I2C_VIA is not set 701# CONFIG_I2C_VIA is not set
724# CONFIG_I2C_VIAPRO is not set 702# CONFIG_I2C_VIAPRO is not set
725# CONFIG_I2C_VOODOO3 is not set 703# CONFIG_I2C_VOODOO3 is not set
726# CONFIG_I2C_PCA_ISA is not set
727 704
728# 705#
729# Miscellaneous I2C Chip support 706# Miscellaneous I2C Chip support
@@ -751,13 +728,10 @@ CONFIG_I2C_MPC=y
751# Dallas's 1-wire bus 728# Dallas's 1-wire bus
752# 729#
753# CONFIG_W1 is not set 730# CONFIG_W1 is not set
754
755#
756# Hardware Monitoring support
757#
758CONFIG_HWMON=y 731CONFIG_HWMON=y
759# CONFIG_HWMON_VID is not set 732# CONFIG_HWMON_VID is not set
760# CONFIG_SENSORS_ABITUGURU is not set 733# CONFIG_SENSORS_ABITUGURU is not set
734# CONFIG_SENSORS_AD7418 is not set
761# CONFIG_SENSORS_ADM1021 is not set 735# CONFIG_SENSORS_ADM1021 is not set
762# CONFIG_SENSORS_ADM1025 is not set 736# CONFIG_SENSORS_ADM1025 is not set
763# CONFIG_SENSORS_ADM1026 is not set 737# CONFIG_SENSORS_ADM1026 is not set
@@ -784,6 +758,7 @@ CONFIG_HWMON=y
784# CONFIG_SENSORS_LM90 is not set 758# CONFIG_SENSORS_LM90 is not set
785# CONFIG_SENSORS_LM92 is not set 759# CONFIG_SENSORS_LM92 is not set
786# CONFIG_SENSORS_MAX1619 is not set 760# CONFIG_SENSORS_MAX1619 is not set
761# CONFIG_SENSORS_MAX6650 is not set
787# CONFIG_SENSORS_PC87360 is not set 762# CONFIG_SENSORS_PC87360 is not set
788# CONFIG_SENSORS_PC87427 is not set 763# CONFIG_SENSORS_PC87427 is not set
789# CONFIG_SENSORS_SIS5595 is not set 764# CONFIG_SENSORS_SIS5595 is not set
@@ -811,16 +786,19 @@ CONFIG_HWMON=y
811# Multimedia devices 786# Multimedia devices
812# 787#
813# CONFIG_VIDEO_DEV is not set 788# CONFIG_VIDEO_DEV is not set
789# CONFIG_DVB_CORE is not set
790CONFIG_DAB=y
814 791
815# 792#
816# Digital Video Broadcasting Devices 793# Graphics support
817# 794#
818# CONFIG_DVB is not set 795# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
819 796
820# 797#
821# Graphics support 798# Display device support
822# 799#
823# CONFIG_BACKLIGHT_LCD_SUPPORT is not set 800# CONFIG_DISPLAY_SUPPORT is not set
801# CONFIG_VGASTATE is not set
824# CONFIG_FB is not set 802# CONFIG_FB is not set
825# CONFIG_FB_IBM_GXT4500 is not set 803# CONFIG_FB_IBM_GXT4500 is not set
826 804
@@ -851,10 +829,6 @@ CONFIG_USB_ARCH_HAS_EHCI=y
851# USB Gadget Support 829# USB Gadget Support
852# 830#
853# CONFIG_USB_GADGET is not set 831# CONFIG_USB_GADGET is not set
854
855#
856# MMC/SD Card support
857#
858# CONFIG_MMC is not set 832# CONFIG_MMC is not set
859 833
860# 834#
@@ -898,14 +872,6 @@ CONFIG_USB_ARCH_HAS_EHCI=y
898# 872#
899 873
900# 874#
901# Auxiliary Display support
902#
903
904#
905# Virtualization
906#
907
908#
909# File systems 875# File systems
910# 876#
911CONFIG_EXT2_FS=y 877CONFIG_EXT2_FS=y
@@ -993,6 +959,7 @@ CONFIG_LOCKD_V4=y
993CONFIG_NFS_COMMON=y 959CONFIG_NFS_COMMON=y
994CONFIG_SUNRPC=y 960CONFIG_SUNRPC=y
995CONFIG_SUNRPC_GSS=y 961CONFIG_SUNRPC_GSS=y
962# CONFIG_SUNRPC_BIND34 is not set
996CONFIG_RPCSEC_GSS_KRB5=y 963CONFIG_RPCSEC_GSS_KRB5=y
997# CONFIG_RPCSEC_GSS_SPKM3 is not set 964# CONFIG_RPCSEC_GSS_SPKM3 is not set
998# CONFIG_SMB_FS is not set 965# CONFIG_SMB_FS is not set
@@ -1018,6 +985,7 @@ CONFIG_PARTITION_ADVANCED=y
1018# CONFIG_SUN_PARTITION is not set 985# CONFIG_SUN_PARTITION is not set
1019# CONFIG_KARMA_PARTITION is not set 986# CONFIG_KARMA_PARTITION is not set
1020# CONFIG_EFI_PARTITION is not set 987# CONFIG_EFI_PARTITION is not set
988# CONFIG_SYSV68_PARTITION is not set
1021 989
1022# 990#
1023# Native Language Support 991# Native Language Support
@@ -1038,11 +1006,13 @@ CONFIG_UCC=y
1038CONFIG_BITREVERSE=y 1006CONFIG_BITREVERSE=y
1039# CONFIG_CRC_CCITT is not set 1007# CONFIG_CRC_CCITT is not set
1040# CONFIG_CRC16 is not set 1008# CONFIG_CRC16 is not set
1009# CONFIG_CRC_ITU_T is not set
1041CONFIG_CRC32=y 1010CONFIG_CRC32=y
1042# CONFIG_LIBCRC32C is not set 1011# CONFIG_LIBCRC32C is not set
1043CONFIG_PLIST=y 1012CONFIG_PLIST=y
1044CONFIG_HAS_IOMEM=y 1013CONFIG_HAS_IOMEM=y
1045CONFIG_HAS_IOPORT=y 1014CONFIG_HAS_IOPORT=y
1015CONFIG_HAS_DMA=y
1046 1016
1047# 1017#
1048# Instrumentation Support 1018# Instrumentation Support
@@ -1059,7 +1029,6 @@ CONFIG_ENABLE_MUST_CHECK=y
1059# CONFIG_DEBUG_FS is not set 1029# CONFIG_DEBUG_FS is not set
1060# CONFIG_HEADERS_CHECK is not set 1030# CONFIG_HEADERS_CHECK is not set
1061# CONFIG_DEBUG_KERNEL is not set 1031# CONFIG_DEBUG_KERNEL is not set
1062CONFIG_LOG_BUF_SHIFT=14
1063# CONFIG_DEBUG_BUGVERBOSE is not set 1032# CONFIG_DEBUG_BUGVERBOSE is not set
1064# CONFIG_BOOTX_TEXT is not set 1033# CONFIG_BOOTX_TEXT is not set
1065# CONFIG_PPC_EARLY_DEBUG is not set 1034# CONFIG_PPC_EARLY_DEBUG is not set
@@ -1092,6 +1061,7 @@ CONFIG_CRYPTO_ECB=m
1092CONFIG_CRYPTO_CBC=y 1061CONFIG_CRYPTO_CBC=y
1093CONFIG_CRYPTO_PCBC=m 1062CONFIG_CRYPTO_PCBC=m
1094# CONFIG_CRYPTO_LRW is not set 1063# CONFIG_CRYPTO_LRW is not set
1064# CONFIG_CRYPTO_CRYPTD is not set
1095CONFIG_CRYPTO_DES=y 1065CONFIG_CRYPTO_DES=y
1096# CONFIG_CRYPTO_FCRYPT is not set 1066# CONFIG_CRYPTO_FCRYPT is not set
1097# CONFIG_CRYPTO_BLOWFISH is not set 1067# CONFIG_CRYPTO_BLOWFISH is not set
diff --git a/arch/powerpc/configs/mpc8540_ads_defconfig b/arch/powerpc/configs/mpc8540_ads_defconfig
index 17120c472304..faedcf8d64a7 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.20-rc5 3# Linux kernel version: 2.6.22-rc7
4# Mon Jan 22 22:25:24 2007 4# Sun Jul 1 23:56:58 2007
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7CONFIG_PPC32=y 7CONFIG_PPC32=y
@@ -34,9 +34,9 @@ CONFIG_DEFAULT_UIMAGE=y
34# CONFIG_PPC_83xx is not set 34# CONFIG_PPC_83xx is not set
35CONFIG_PPC_85xx=y 35CONFIG_PPC_85xx=y
36# CONFIG_PPC_86xx is not set 36# CONFIG_PPC_86xx is not set
37# CONFIG_PPC_8xx is not set
37# CONFIG_40x is not set 38# CONFIG_40x is not set
38# CONFIG_44x is not set 39# CONFIG_44x is not set
39# CONFIG_8xx is not set
40# CONFIG_E200 is not set 40# CONFIG_E200 is not set
41CONFIG_85xx=y 41CONFIG_85xx=y
42CONFIG_E500=y 42CONFIG_E500=y
@@ -46,6 +46,7 @@ CONFIG_BOOKE=y
46CONFIG_FSL_BOOKE=y 46CONFIG_FSL_BOOKE=y
47# CONFIG_PHYS_64BIT is not set 47# CONFIG_PHYS_64BIT is not set
48CONFIG_SPE=y 48CONFIG_SPE=y
49# CONFIG_PPC_MM_SLICES is not set
49CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 50CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
50 51
51# 52#
@@ -63,14 +64,17 @@ CONFIG_LOCALVERSION_AUTO=y
63CONFIG_SWAP=y 64CONFIG_SWAP=y
64CONFIG_SYSVIPC=y 65CONFIG_SYSVIPC=y
65# CONFIG_IPC_NS is not set 66# CONFIG_IPC_NS is not set
67CONFIG_SYSVIPC_SYSCTL=y
66# CONFIG_POSIX_MQUEUE is not set 68# CONFIG_POSIX_MQUEUE is not set
67# CONFIG_BSD_PROCESS_ACCT is not set 69# CONFIG_BSD_PROCESS_ACCT is not set
68# CONFIG_TASKSTATS is not set 70# CONFIG_TASKSTATS is not set
69# CONFIG_UTS_NS is not set 71# CONFIG_UTS_NS is not set
70# CONFIG_AUDIT is not set 72# CONFIG_AUDIT is not set
71# CONFIG_IKCONFIG is not set 73# CONFIG_IKCONFIG is not set
74CONFIG_LOG_BUF_SHIFT=14
72CONFIG_SYSFS_DEPRECATED=y 75CONFIG_SYSFS_DEPRECATED=y
73# CONFIG_RELAY is not set 76# CONFIG_RELAY is not set
77CONFIG_BLK_DEV_INITRD=y
74CONFIG_INITRAMFS_SOURCE="" 78CONFIG_INITRAMFS_SOURCE=""
75# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 79# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
76CONFIG_SYSCTL=y 80CONFIG_SYSCTL=y
@@ -85,14 +89,19 @@ CONFIG_BUG=y
85CONFIG_ELF_CORE=y 89CONFIG_ELF_CORE=y
86CONFIG_BASE_FULL=y 90CONFIG_BASE_FULL=y
87CONFIG_FUTEX=y 91CONFIG_FUTEX=y
92CONFIG_ANON_INODES=y
88CONFIG_EPOLL=y 93CONFIG_EPOLL=y
94CONFIG_SIGNALFD=y
95CONFIG_TIMERFD=y
96CONFIG_EVENTFD=y
89CONFIG_SHMEM=y 97CONFIG_SHMEM=y
90CONFIG_SLAB=y
91CONFIG_VM_EVENT_COUNTERS=y 98CONFIG_VM_EVENT_COUNTERS=y
99CONFIG_SLAB=y
100# CONFIG_SLUB is not set
101# CONFIG_SLOB is not set
92CONFIG_RT_MUTEXES=y 102CONFIG_RT_MUTEXES=y
93# CONFIG_TINY_SHMEM is not set 103# CONFIG_TINY_SHMEM is not set
94CONFIG_BASE_SMALL=0 104CONFIG_BASE_SMALL=0
95# CONFIG_SLOB is not set
96 105
97# 106#
98# Loadable module support 107# Loadable module support
@@ -119,17 +128,33 @@ CONFIG_DEFAULT_AS=y
119# CONFIG_DEFAULT_CFQ is not set 128# CONFIG_DEFAULT_CFQ is not set
120# CONFIG_DEFAULT_NOOP is not set 129# CONFIG_DEFAULT_NOOP is not set
121CONFIG_DEFAULT_IOSCHED="anticipatory" 130CONFIG_DEFAULT_IOSCHED="anticipatory"
122# CONFIG_WANT_EARLY_SERIAL is not set
123 131
124# 132#
125# Platform support 133# Platform support
126# 134#
135# CONFIG_PPC_MPC52xx is not set
136# CONFIG_PPC_MPC5200 is not set
137# CONFIG_PPC_CELL is not set
138# CONFIG_PPC_CELL_NATIVE is not set
139# CONFIG_PQ2ADS is not set
127CONFIG_MPC8540_ADS=y 140CONFIG_MPC8540_ADS=y
128# CONFIG_MPC8560_ADS is not set 141# CONFIG_MPC8560_ADS is not set
129# CONFIG_MPC85xx_CDS is not set 142# CONFIG_MPC85xx_CDS is not set
143# CONFIG_MPC85xx_MDS is not set
144# CONFIG_MPC8544_DS is not set
130CONFIG_MPC8540=y 145CONFIG_MPC8540=y
131CONFIG_PPC_INDIRECT_PCI_BE=y 146CONFIG_MPC85xx=y
132CONFIG_MPIC=y 147CONFIG_MPIC=y
148# CONFIG_MPIC_WEIRD is not set
149# CONFIG_PPC_I8259 is not set
150# CONFIG_PPC_RTAS is not set
151# CONFIG_MMIO_NVRAM is not set
152# CONFIG_PPC_MPC106 is not set
153# CONFIG_PPC_970_NAP is not set
154# CONFIG_PPC_INDIRECT_IO is not set
155# CONFIG_GENERIC_IOMAP is not set
156# CONFIG_CPU_FREQ is not set
157# CONFIG_CPM2 is not set
133 158
134# 159#
135# Kernel options 160# Kernel options
@@ -158,21 +183,25 @@ CONFIG_FLAT_NODE_MEM_MAP=y
158# CONFIG_SPARSEMEM_STATIC is not set 183# CONFIG_SPARSEMEM_STATIC is not set
159CONFIG_SPLIT_PTLOCK_CPUS=4 184CONFIG_SPLIT_PTLOCK_CPUS=4
160# CONFIG_RESOURCES_64BIT is not set 185# CONFIG_RESOURCES_64BIT is not set
186CONFIG_ZONE_DMA_FLAG=1
161CONFIG_PROC_DEVICETREE=y 187CONFIG_PROC_DEVICETREE=y
162# CONFIG_CMDLINE_BOOL is not set 188# CONFIG_CMDLINE_BOOL is not set
163# CONFIG_PM is not set 189# CONFIG_PM is not set
164# CONFIG_SECCOMP is not set 190# CONFIG_SECCOMP is not set
191CONFIG_WANT_DEVICE_TREE=y
192CONFIG_DEVICE_TREE=""
165CONFIG_ISA_DMA_API=y 193CONFIG_ISA_DMA_API=y
166 194
167# 195#
168# Bus options 196# Bus options
169# 197#
170# CONFIG_MPIC_WEIRD is not set 198CONFIG_ZONE_DMA=y
171# CONFIG_PPC_I8259 is not set
172CONFIG_PPC_INDIRECT_PCI=y 199CONFIG_PPC_INDIRECT_PCI=y
200CONFIG_PPC_INDIRECT_PCI_BE=y
173CONFIG_FSL_SOC=y 201CONFIG_FSL_SOC=y
174# CONFIG_PCI is not set 202# CONFIG_PCI is not set
175# CONFIG_PCI_DOMAINS is not set 203# CONFIG_PCI_DOMAINS is not set
204# CONFIG_ARCH_SUPPORTS_MSI is not set
176 205
177# 206#
178# PCCARD (PCMCIA/CardBus) support 207# PCCARD (PCMCIA/CardBus) support
@@ -180,10 +209,6 @@ CONFIG_FSL_SOC=y
180# CONFIG_PCCARD is not set 209# CONFIG_PCCARD is not set
181 210
182# 211#
183# PCI Hotplug Support
184#
185
186#
187# Advanced setup 212# Advanced setup
188# 213#
189# CONFIG_ADVANCED_OPTIONS is not set 214# CONFIG_ADVANCED_OPTIONS is not set
@@ -205,13 +230,13 @@ CONFIG_NET=y
205# 230#
206# Networking options 231# Networking options
207# 232#
208# CONFIG_NETDEBUG is not set
209CONFIG_PACKET=y 233CONFIG_PACKET=y
210# CONFIG_PACKET_MMAP is not set 234# CONFIG_PACKET_MMAP is not set
211CONFIG_UNIX=y 235CONFIG_UNIX=y
212CONFIG_XFRM=y 236CONFIG_XFRM=y
213CONFIG_XFRM_USER=y 237CONFIG_XFRM_USER=y
214# CONFIG_XFRM_SUB_POLICY is not set 238# CONFIG_XFRM_SUB_POLICY is not set
239# CONFIG_XFRM_MIGRATE is not set
215# CONFIG_NET_KEY is not set 240# CONFIG_NET_KEY is not set
216CONFIG_INET=y 241CONFIG_INET=y
217CONFIG_IP_MULTICAST=y 242CONFIG_IP_MULTICAST=y
@@ -245,20 +270,8 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
245# CONFIG_INET6_TUNNEL is not set 270# CONFIG_INET6_TUNNEL is not set
246# CONFIG_NETWORK_SECMARK is not set 271# CONFIG_NETWORK_SECMARK is not set
247# CONFIG_NETFILTER is not set 272# CONFIG_NETFILTER is not set
248
249#
250# DCCP Configuration (EXPERIMENTAL)
251#
252# CONFIG_IP_DCCP is not set 273# CONFIG_IP_DCCP is not set
253
254#
255# SCTP Configuration (EXPERIMENTAL)
256#
257# CONFIG_IP_SCTP is not set 274# CONFIG_IP_SCTP is not set
258
259#
260# TIPC Configuration (EXPERIMENTAL)
261#
262# CONFIG_TIPC is not set 275# CONFIG_TIPC is not set
263# CONFIG_ATM is not set 276# CONFIG_ATM is not set
264# CONFIG_BRIDGE is not set 277# CONFIG_BRIDGE is not set
@@ -284,7 +297,16 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
284# CONFIG_HAMRADIO is not set 297# CONFIG_HAMRADIO is not set
285# CONFIG_IRDA is not set 298# CONFIG_IRDA is not set
286# CONFIG_BT is not set 299# CONFIG_BT is not set
300# CONFIG_AF_RXRPC is not set
301
302#
303# Wireless
304#
305# CONFIG_CFG80211 is not set
306# CONFIG_WIRELESS_EXT is not set
307# CONFIG_MAC80211 is not set
287# CONFIG_IEEE80211 is not set 308# CONFIG_IEEE80211 is not set
309# CONFIG_RFKILL is not set
288 310
289# 311#
290# Device Drivers 312# Device Drivers
@@ -297,16 +319,13 @@ CONFIG_STANDALONE=y
297CONFIG_PREVENT_FIRMWARE_BUILD=y 319CONFIG_PREVENT_FIRMWARE_BUILD=y
298# CONFIG_FW_LOADER is not set 320# CONFIG_FW_LOADER is not set
299# CONFIG_DEBUG_DRIVER is not set 321# CONFIG_DEBUG_DRIVER is not set
322# CONFIG_DEBUG_DEVRES is not set
300# CONFIG_SYS_HYPERVISOR is not set 323# CONFIG_SYS_HYPERVISOR is not set
301 324
302# 325#
303# Connector - unified userspace <-> kernelspace linker 326# Connector - unified userspace <-> kernelspace linker
304# 327#
305# CONFIG_CONNECTOR is not set 328# CONFIG_CONNECTOR is not set
306
307#
308# Memory Technology Devices (MTD)
309#
310# CONFIG_MTD is not set 329# CONFIG_MTD is not set
311 330
312# 331#
@@ -317,6 +336,7 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y
317# 336#
318# Plug and Play support 337# Plug and Play support
319# 338#
339# CONFIG_PNPACPI is not set
320 340
321# 341#
322# Block devices 342# Block devices
@@ -330,18 +350,13 @@ CONFIG_BLK_DEV_RAM=y
330CONFIG_BLK_DEV_RAM_COUNT=16 350CONFIG_BLK_DEV_RAM_COUNT=16
331CONFIG_BLK_DEV_RAM_SIZE=32768 351CONFIG_BLK_DEV_RAM_SIZE=32768
332CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 352CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
333CONFIG_BLK_DEV_INITRD=y
334# CONFIG_CDROM_PKTCDVD is not set 353# CONFIG_CDROM_PKTCDVD is not set
335# CONFIG_ATA_OVER_ETH is not set 354# CONFIG_ATA_OVER_ETH is not set
336 355
337# 356#
338# Misc devices 357# Misc devices
339# 358#
340# CONFIG_TIFM_CORE is not set 359# CONFIG_BLINK is not set
341
342#
343# ATA/ATAPI/MFM/RLL support
344#
345# CONFIG_IDE is not set 360# CONFIG_IDE is not set
346 361
347# 362#
@@ -350,35 +365,13 @@ CONFIG_BLK_DEV_INITRD=y
350# CONFIG_RAID_ATTRS is not set 365# CONFIG_RAID_ATTRS is not set
351# CONFIG_SCSI is not set 366# CONFIG_SCSI is not set
352# CONFIG_SCSI_NETLINK is not set 367# CONFIG_SCSI_NETLINK is not set
353
354#
355# Serial ATA (prod) and Parallel ATA (experimental) drivers
356#
357# CONFIG_ATA is not set 368# CONFIG_ATA is not set
358 369
359# 370#
360# Multi-device support (RAID and LVM) 371# Multi-device support (RAID and LVM)
361# 372#
362# CONFIG_MD is not set 373# CONFIG_MD is not set
363 374# CONFIG_MACINTOSH_DRIVERS is not set
364#
365# Fusion MPT device support
366#
367# CONFIG_FUSION is not set
368
369#
370# IEEE 1394 (FireWire) support
371#
372
373#
374# I2O device support
375#
376
377#
378# Macintosh device drivers
379#
380# CONFIG_MAC_EMUMOUSEBTN is not set
381# CONFIG_WINDFARM is not set
382 375
383# 376#
384# Network device support 377# Network device support
@@ -388,10 +381,6 @@ CONFIG_NETDEVICES=y
388# CONFIG_BONDING is not set 381# CONFIG_BONDING is not set
389# CONFIG_EQUALIZER is not set 382# CONFIG_EQUALIZER is not set
390# CONFIG_TUN is not set 383# CONFIG_TUN is not set
391
392#
393# PHY device support
394#
395CONFIG_PHYLIB=y 384CONFIG_PHYLIB=y
396 385
397# 386#
@@ -412,29 +401,16 @@ CONFIG_PHYLIB=y
412# 401#
413CONFIG_NET_ETHERNET=y 402CONFIG_NET_ETHERNET=y
414CONFIG_MII=y 403CONFIG_MII=y
415 404CONFIG_NETDEV_1000=y
416#
417# Ethernet (1000 Mbit)
418#
419CONFIG_GIANFAR=y 405CONFIG_GIANFAR=y
420CONFIG_GFAR_NAPI=y 406CONFIG_GFAR_NAPI=y
407CONFIG_NETDEV_10000=y
421 408
422# 409#
423# Ethernet (10000 Mbit) 410# Wireless LAN
424#
425
426#
427# Token Ring devices
428#
429
430#
431# Wireless LAN (non-hamradio)
432#
433# CONFIG_NET_RADIO is not set
434
435#
436# Wan interfaces
437# 411#
412# CONFIG_WLAN_PRE80211 is not set
413# CONFIG_WLAN_80211 is not set
438# CONFIG_WAN is not set 414# CONFIG_WAN is not set
439# CONFIG_PPP is not set 415# CONFIG_PPP is not set
440# CONFIG_SLIP is not set 416# CONFIG_SLIP is not set
@@ -458,6 +434,7 @@ CONFIG_GFAR_NAPI=y
458# 434#
459CONFIG_INPUT=y 435CONFIG_INPUT=y
460# CONFIG_INPUT_FF_MEMLESS is not set 436# CONFIG_INPUT_FF_MEMLESS is not set
437# CONFIG_INPUT_POLLDEV is not set
461 438
462# 439#
463# Userland interfaces 440# Userland interfaces
@@ -474,6 +451,7 @@ CONFIG_INPUT=y
474# CONFIG_INPUT_KEYBOARD is not set 451# CONFIG_INPUT_KEYBOARD is not set
475# CONFIG_INPUT_MOUSE is not set 452# CONFIG_INPUT_MOUSE is not set
476# CONFIG_INPUT_JOYSTICK is not set 453# CONFIG_INPUT_JOYSTICK is not set
454# CONFIG_INPUT_TABLET is not set
477# CONFIG_INPUT_TOUCHSCREEN is not set 455# CONFIG_INPUT_TOUCHSCREEN is not set
478# CONFIG_INPUT_MISC is not set 456# CONFIG_INPUT_MISC is not set
479 457
@@ -497,6 +475,7 @@ CONFIG_SERIAL_8250_CONSOLE=y
497CONFIG_SERIAL_8250_NR_UARTS=4 475CONFIG_SERIAL_8250_NR_UARTS=4
498CONFIG_SERIAL_8250_RUNTIME_UARTS=4 476CONFIG_SERIAL_8250_RUNTIME_UARTS=4
499# CONFIG_SERIAL_8250_EXTENDED is not set 477# CONFIG_SERIAL_8250_EXTENDED is not set
478CONFIG_SERIAL_8250_SHARE_IRQ=y
500 479
501# 480#
502# Non-8250 serial port support 481# Non-8250 serial port support
@@ -504,6 +483,7 @@ CONFIG_SERIAL_8250_RUNTIME_UARTS=4
504# CONFIG_SERIAL_UARTLITE is not set 483# CONFIG_SERIAL_UARTLITE is not set
505CONFIG_SERIAL_CORE=y 484CONFIG_SERIAL_CORE=y
506CONFIG_SERIAL_CORE_CONSOLE=y 485CONFIG_SERIAL_CORE_CONSOLE=y
486# CONFIG_SERIAL_OF_PLATFORM is not set
507CONFIG_UNIX98_PTYS=y 487CONFIG_UNIX98_PTYS=y
508CONFIG_LEGACY_PTYS=y 488CONFIG_LEGACY_PTYS=y
509CONFIG_LEGACY_PTY_COUNT=256 489CONFIG_LEGACY_PTY_COUNT=256
@@ -512,16 +492,11 @@ CONFIG_LEGACY_PTY_COUNT=256
512# IPMI 492# IPMI
513# 493#
514# CONFIG_IPMI_HANDLER is not set 494# CONFIG_IPMI_HANDLER is not set
515
516#
517# Watchdog Cards
518#
519# CONFIG_WATCHDOG is not set 495# CONFIG_WATCHDOG is not set
520# CONFIG_HW_RANDOM is not set 496# CONFIG_HW_RANDOM is not set
521# CONFIG_NVRAM is not set 497# CONFIG_NVRAM is not set
522CONFIG_GEN_RTC=y 498CONFIG_GEN_RTC=y
523# CONFIG_GEN_RTC_X is not set 499# CONFIG_GEN_RTC_X is not set
524# CONFIG_DTLK is not set
525# CONFIG_R3964 is not set 500# CONFIG_R3964 is not set
526# CONFIG_RAW_DRIVER is not set 501# CONFIG_RAW_DRIVER is not set
527 502
@@ -529,10 +504,6 @@ CONFIG_GEN_RTC=y
529# TPM devices 504# TPM devices
530# 505#
531# CONFIG_TCG_TPM is not set 506# CONFIG_TCG_TPM is not set
532
533#
534# I2C support
535#
536# CONFIG_I2C is not set 507# CONFIG_I2C is not set
537 508
538# 509#
@@ -545,35 +516,41 @@ CONFIG_GEN_RTC=y
545# Dallas's 1-wire bus 516# Dallas's 1-wire bus
546# 517#
547# CONFIG_W1 is not set 518# CONFIG_W1 is not set
548
549#
550# Hardware Monitoring support
551#
552CONFIG_HWMON=y 519CONFIG_HWMON=y
553# CONFIG_HWMON_VID is not set 520# CONFIG_HWMON_VID is not set
554# CONFIG_SENSORS_ABITUGURU is not set 521# CONFIG_SENSORS_ABITUGURU is not set
555# CONFIG_SENSORS_F71805F is not set 522# CONFIG_SENSORS_F71805F is not set
556# CONFIG_SENSORS_PC87427 is not set 523# CONFIG_SENSORS_PC87427 is not set
524# CONFIG_SENSORS_SMSC47M1 is not set
525# CONFIG_SENSORS_SMSC47B397 is not set
557# CONFIG_SENSORS_VT1211 is not set 526# CONFIG_SENSORS_VT1211 is not set
527# CONFIG_SENSORS_W83627HF is not set
558# CONFIG_HWMON_DEBUG_CHIP is not set 528# CONFIG_HWMON_DEBUG_CHIP is not set
559 529
560# 530#
531# Multifunction device drivers
532#
533# CONFIG_MFD_SM501 is not set
534
535#
561# Multimedia devices 536# Multimedia devices
562# 537#
563# CONFIG_VIDEO_DEV is not set 538# CONFIG_VIDEO_DEV is not set
539# CONFIG_DVB_CORE is not set
540CONFIG_DAB=y
564 541
565# 542#
566# Digital Video Broadcasting Devices 543# Graphics support
567# 544#
568# CONFIG_DVB is not set 545# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
569 546
570# 547#
571# Graphics support 548# Display device support
572# 549#
573CONFIG_FIRMWARE_EDID=y 550# CONFIG_DISPLAY_SUPPORT is not set
551# CONFIG_VGASTATE is not set
574# CONFIG_FB is not set 552# CONFIG_FB is not set
575# CONFIG_FB_IBM_GXT4500 is not set 553# CONFIG_FB_IBM_GXT4500 is not set
576# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
577 554
578# 555#
579# Sound 556# Sound
@@ -584,6 +561,7 @@ CONFIG_FIRMWARE_EDID=y
584# HID Devices 561# HID Devices
585# 562#
586CONFIG_HID=y 563CONFIG_HID=y
564# CONFIG_HID_DEBUG is not set
587 565
588# 566#
589# USB support 567# USB support
@@ -600,10 +578,6 @@ CONFIG_HID=y
600# USB Gadget Support 578# USB Gadget Support
601# 579#
602# CONFIG_USB_GADGET is not set 580# CONFIG_USB_GADGET is not set
603
604#
605# MMC/SD Card support
606#
607# CONFIG_MMC is not set 581# CONFIG_MMC is not set
608 582
609# 583#
@@ -646,10 +620,6 @@ CONFIG_HID=y
646# 620#
647 621
648# 622#
649# Virtualization
650#
651
652#
653# File systems 623# File systems
654# 624#
655CONFIG_EXT2_FS=y 625CONFIG_EXT2_FS=y
@@ -734,6 +704,7 @@ CONFIG_ROOT_NFS=y
734CONFIG_LOCKD=y 704CONFIG_LOCKD=y
735CONFIG_NFS_COMMON=y 705CONFIG_NFS_COMMON=y
736CONFIG_SUNRPC=y 706CONFIG_SUNRPC=y
707# CONFIG_SUNRPC_BIND34 is not set
737# CONFIG_RPCSEC_GSS_KRB5 is not set 708# CONFIG_RPCSEC_GSS_KRB5 is not set
738# CONFIG_RPCSEC_GSS_SPKM3 is not set 709# CONFIG_RPCSEC_GSS_SPKM3 is not set
739# CONFIG_SMB_FS is not set 710# CONFIG_SMB_FS is not set
@@ -759,6 +730,7 @@ CONFIG_PARTITION_ADVANCED=y
759# CONFIG_SUN_PARTITION is not set 730# CONFIG_SUN_PARTITION is not set
760# CONFIG_KARMA_PARTITION is not set 731# CONFIG_KARMA_PARTITION is not set
761# CONFIG_EFI_PARTITION is not set 732# CONFIG_EFI_PARTITION is not set
733# CONFIG_SYSV68_PARTITION is not set
762 734
763# 735#
764# Native Language Support 736# Native Language Support
@@ -769,6 +741,7 @@ CONFIG_PARTITION_ADVANCED=y
769# Distributed Lock Manager 741# Distributed Lock Manager
770# 742#
771# CONFIG_DLM is not set 743# CONFIG_DLM is not set
744# CONFIG_UCC_SLOW is not set
772 745
773# 746#
774# Library routines 747# Library routines
@@ -776,10 +749,13 @@ CONFIG_PARTITION_ADVANCED=y
776CONFIG_BITREVERSE=y 749CONFIG_BITREVERSE=y
777# CONFIG_CRC_CCITT is not set 750# CONFIG_CRC_CCITT is not set
778# CONFIG_CRC16 is not set 751# CONFIG_CRC16 is not set
752# CONFIG_CRC_ITU_T is not set
779CONFIG_CRC32=y 753CONFIG_CRC32=y
780# CONFIG_LIBCRC32C is not set 754# CONFIG_LIBCRC32C is not set
781CONFIG_PLIST=y 755CONFIG_PLIST=y
782CONFIG_IOMAP_COPY=y 756CONFIG_HAS_IOMEM=y
757CONFIG_HAS_IOPORT=y
758CONFIG_HAS_DMA=y
783 759
784# 760#
785# Instrumentation Support 761# Instrumentation Support
@@ -796,15 +772,15 @@ CONFIG_ENABLE_MUST_CHECK=y
796# CONFIG_DEBUG_FS is not set 772# CONFIG_DEBUG_FS is not set
797# CONFIG_HEADERS_CHECK is not set 773# CONFIG_HEADERS_CHECK is not set
798CONFIG_DEBUG_KERNEL=y 774CONFIG_DEBUG_KERNEL=y
799CONFIG_LOG_BUF_SHIFT=14 775# CONFIG_DEBUG_SHIRQ is not set
800CONFIG_DETECT_SOFTLOCKUP=y 776CONFIG_DETECT_SOFTLOCKUP=y
801# CONFIG_SCHEDSTATS is not set 777# CONFIG_SCHEDSTATS is not set
778# CONFIG_TIMER_STATS is not set
802# CONFIG_DEBUG_SLAB is not set 779# CONFIG_DEBUG_SLAB is not set
803# CONFIG_DEBUG_RT_MUTEXES is not set 780# CONFIG_DEBUG_RT_MUTEXES is not set
804# CONFIG_RT_MUTEX_TESTER is not set 781# CONFIG_RT_MUTEX_TESTER is not set
805# CONFIG_DEBUG_SPINLOCK is not set 782# CONFIG_DEBUG_SPINLOCK is not set
806CONFIG_DEBUG_MUTEXES=y 783CONFIG_DEBUG_MUTEXES=y
807# CONFIG_DEBUG_RWSEMS is not set
808# CONFIG_DEBUG_SPINLOCK_SLEEP is not set 784# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
809# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set 785# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
810# CONFIG_DEBUG_KOBJECT is not set 786# CONFIG_DEBUG_KOBJECT is not set
@@ -813,7 +789,10 @@ CONFIG_DEBUG_MUTEXES=y
813# CONFIG_DEBUG_VM is not set 789# CONFIG_DEBUG_VM is not set
814# CONFIG_DEBUG_LIST is not set 790# CONFIG_DEBUG_LIST is not set
815CONFIG_FORCED_INLINING=y 791CONFIG_FORCED_INLINING=y
816# CONFIG_RCU_TORTURE_TEST is not set 792# CONFIG_FAULT_INJECTION is not set
793# CONFIG_DEBUG_STACKOVERFLOW is not set
794# CONFIG_DEBUG_STACK_USAGE is not set
795# CONFIG_DEBUG_PAGEALLOC is not set
817# CONFIG_DEBUGGER is not set 796# CONFIG_DEBUGGER is not set
818# CONFIG_BDI_SWITCH is not set 797# CONFIG_BDI_SWITCH is not set
819# CONFIG_BOOTX_TEXT is not set 798# CONFIG_BOOTX_TEXT is not set
diff --git a/arch/powerpc/configs/mpc8544_ds_defconfig b/arch/powerpc/configs/mpc8544_ds_defconfig
index b563513cc96c..c40a25a79cbb 100644
--- a/arch/powerpc/configs/mpc8544_ds_defconfig
+++ b/arch/powerpc/configs/mpc8544_ds_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.21-rc3 3# Linux kernel version: 2.6.22-rc7
4# Mon Mar 19 17:18:49 2007 4# Sun Jul 1 23:56:58 2007
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7CONFIG_PPC32=y 7CONFIG_PPC32=y
@@ -46,6 +46,7 @@ CONFIG_BOOKE=y
46CONFIG_FSL_BOOKE=y 46CONFIG_FSL_BOOKE=y
47# CONFIG_PHYS_64BIT is not set 47# CONFIG_PHYS_64BIT is not set
48# CONFIG_SPE is not set 48# CONFIG_SPE is not set
49# CONFIG_PPC_MM_SLICES is not set
49CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 50CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
50 51
51# 52#
@@ -73,6 +74,7 @@ CONFIG_AUDIT=y
73# CONFIG_AUDITSYSCALL is not set 74# CONFIG_AUDITSYSCALL is not set
74CONFIG_IKCONFIG=y 75CONFIG_IKCONFIG=y
75CONFIG_IKCONFIG_PROC=y 76CONFIG_IKCONFIG_PROC=y
77CONFIG_LOG_BUF_SHIFT=14
76CONFIG_SYSFS_DEPRECATED=y 78CONFIG_SYSFS_DEPRECATED=y
77# CONFIG_RELAY is not set 79# CONFIG_RELAY is not set
78CONFIG_BLK_DEV_INITRD=y 80CONFIG_BLK_DEV_INITRD=y
@@ -90,14 +92,19 @@ CONFIG_BUG=y
90CONFIG_ELF_CORE=y 92CONFIG_ELF_CORE=y
91CONFIG_BASE_FULL=y 93CONFIG_BASE_FULL=y
92CONFIG_FUTEX=y 94CONFIG_FUTEX=y
95CONFIG_ANON_INODES=y
93CONFIG_EPOLL=y 96CONFIG_EPOLL=y
97CONFIG_SIGNALFD=y
98CONFIG_TIMERFD=y
99CONFIG_EVENTFD=y
94CONFIG_SHMEM=y 100CONFIG_SHMEM=y
95CONFIG_SLAB=y
96CONFIG_VM_EVENT_COUNTERS=y 101CONFIG_VM_EVENT_COUNTERS=y
102CONFIG_SLAB=y
103# CONFIG_SLUB is not set
104# CONFIG_SLOB is not set
97CONFIG_RT_MUTEXES=y 105CONFIG_RT_MUTEXES=y
98# CONFIG_TINY_SHMEM is not set 106# CONFIG_TINY_SHMEM is not set
99CONFIG_BASE_SMALL=0 107CONFIG_BASE_SMALL=0
100# CONFIG_SLOB is not set
101 108
102# 109#
103# Loadable module support 110# Loadable module support
@@ -129,19 +136,32 @@ CONFIG_IOSCHED_CFQ=y
129CONFIG_DEFAULT_CFQ=y 136CONFIG_DEFAULT_CFQ=y
130# CONFIG_DEFAULT_NOOP is not set 137# CONFIG_DEFAULT_NOOP is not set
131CONFIG_DEFAULT_IOSCHED="cfq" 138CONFIG_DEFAULT_IOSCHED="cfq"
132# CONFIG_WANT_EARLY_SERIAL is not set
133 139
134# 140#
135# Platform support 141# Platform support
136# 142#
143# CONFIG_PPC_MPC52xx is not set
144# CONFIG_PPC_MPC5200 is not set
145# CONFIG_PPC_CELL is not set
146# CONFIG_PPC_CELL_NATIVE is not set
147# CONFIG_PQ2ADS is not set
137# CONFIG_MPC8540_ADS is not set 148# CONFIG_MPC8540_ADS is not set
138# CONFIG_MPC8560_ADS is not set 149# CONFIG_MPC8560_ADS is not set
139# CONFIG_MPC85xx_CDS is not set 150# CONFIG_MPC85xx_CDS is not set
140# CONFIG_MPC85xx_MDS is not set 151# CONFIG_MPC85xx_MDS is not set
141CONFIG_MPC8544_DS=y 152CONFIG_MPC8544_DS=y
142CONFIG_MPC85xx=y 153CONFIG_MPC85xx=y
143CONFIG_PPC_INDIRECT_PCI_BE=y
144CONFIG_MPIC=y 154CONFIG_MPIC=y
155# CONFIG_MPIC_WEIRD is not set
156# CONFIG_PPC_I8259 is not set
157# CONFIG_PPC_RTAS is not set
158# CONFIG_MMIO_NVRAM is not set
159# CONFIG_PPC_MPC106 is not set
160# CONFIG_PPC_970_NAP is not set
161# CONFIG_PPC_INDIRECT_IO is not set
162# CONFIG_GENERIC_IOMAP is not set
163# CONFIG_CPU_FREQ is not set
164# CONFIG_CPM2 is not set
145 165
146# 166#
147# Kernel options 167# Kernel options
@@ -176,28 +196,26 @@ CONFIG_CMDLINE_BOOL=y
176CONFIG_CMDLINE="root=/dev/sda3 rw console=ttyS0,115200" 196CONFIG_CMDLINE="root=/dev/sda3 rw console=ttyS0,115200"
177# CONFIG_PM is not set 197# CONFIG_PM is not set
178CONFIG_SECCOMP=y 198CONFIG_SECCOMP=y
199CONFIG_WANT_DEVICE_TREE=y
200CONFIG_DEVICE_TREE=""
179CONFIG_ISA_DMA_API=y 201CONFIG_ISA_DMA_API=y
180 202
181# 203#
182# Bus options 204# Bus options
183# 205#
184CONFIG_ZONE_DMA=y 206CONFIG_ZONE_DMA=y
185# CONFIG_MPIC_WEIRD is not set
186# CONFIG_PPC_I8259 is not set
187CONFIG_PPC_INDIRECT_PCI=y 207CONFIG_PPC_INDIRECT_PCI=y
208CONFIG_PPC_INDIRECT_PCI_BE=y
188CONFIG_FSL_SOC=y 209CONFIG_FSL_SOC=y
189# CONFIG_PCI is not set 210# CONFIG_PCI is not set
190# CONFIG_PCI_DOMAINS is not set 211# CONFIG_PCI_DOMAINS is not set
212# CONFIG_ARCH_SUPPORTS_MSI is not set
191 213
192# 214#
193# PCCARD (PCMCIA/CardBus) support 215# PCCARD (PCMCIA/CardBus) support
194# 216#
195 217
196# 218#
197# PCI Hotplug Support
198#
199
200#
201# Advanced setup 219# Advanced setup
202# 220#
203# CONFIG_ADVANCED_OPTIONS is not set 221# CONFIG_ADVANCED_OPTIONS is not set
@@ -219,7 +237,6 @@ CONFIG_NET=y
219# 237#
220# Networking options 238# Networking options
221# 239#
222# CONFIG_NETDEBUG is not set
223CONFIG_PACKET=y 240CONFIG_PACKET=y
224# CONFIG_PACKET_MMAP is not set 241# CONFIG_PACKET_MMAP is not set
225CONFIG_UNIX=y 242CONFIG_UNIX=y
@@ -270,25 +287,13 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
270# CONFIG_INET6_TUNNEL is not set 287# CONFIG_INET6_TUNNEL is not set
271# CONFIG_NETWORK_SECMARK is not set 288# CONFIG_NETWORK_SECMARK is not set
272# CONFIG_NETFILTER is not set 289# CONFIG_NETFILTER is not set
273
274#
275# DCCP Configuration (EXPERIMENTAL)
276#
277# CONFIG_IP_DCCP is not set 290# CONFIG_IP_DCCP is not set
278
279#
280# SCTP Configuration (EXPERIMENTAL)
281#
282CONFIG_IP_SCTP=m 291CONFIG_IP_SCTP=m
283# CONFIG_SCTP_DBG_MSG is not set 292# CONFIG_SCTP_DBG_MSG is not set
284# CONFIG_SCTP_DBG_OBJCNT is not set 293# CONFIG_SCTP_DBG_OBJCNT is not set
285# CONFIG_SCTP_HMAC_NONE is not set 294# CONFIG_SCTP_HMAC_NONE is not set
286# CONFIG_SCTP_HMAC_SHA1 is not set 295# CONFIG_SCTP_HMAC_SHA1 is not set
287CONFIG_SCTP_HMAC_MD5=y 296CONFIG_SCTP_HMAC_MD5=y
288
289#
290# TIPC Configuration (EXPERIMENTAL)
291#
292# CONFIG_TIPC is not set 297# CONFIG_TIPC is not set
293# CONFIG_ATM is not set 298# CONFIG_ATM is not set
294# CONFIG_BRIDGE is not set 299# CONFIG_BRIDGE is not set
@@ -314,10 +319,19 @@ CONFIG_SCTP_HMAC_MD5=y
314# CONFIG_HAMRADIO is not set 319# CONFIG_HAMRADIO is not set
315# CONFIG_IRDA is not set 320# CONFIG_IRDA is not set
316# CONFIG_BT is not set 321# CONFIG_BT is not set
317# CONFIG_IEEE80211 is not set 322# CONFIG_AF_RXRPC is not set
318CONFIG_FIB_RULES=y 323CONFIG_FIB_RULES=y
319 324
320# 325#
326# Wireless
327#
328# CONFIG_CFG80211 is not set
329# CONFIG_WIRELESS_EXT is not set
330# CONFIG_MAC80211 is not set
331# CONFIG_IEEE80211 is not set
332# CONFIG_RFKILL is not set
333
334#
321# Device Drivers 335# Device Drivers
322# 336#
323 337
@@ -334,10 +348,6 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y
334# Connector - unified userspace <-> kernelspace linker 348# Connector - unified userspace <-> kernelspace linker
335# 349#
336# CONFIG_CONNECTOR is not set 350# CONFIG_CONNECTOR is not set
337
338#
339# Memory Technology Devices (MTD)
340#
341# CONFIG_MTD is not set 351# CONFIG_MTD is not set
342 352
343# 353#
@@ -368,10 +378,7 @@ CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
368# 378#
369# Misc devices 379# Misc devices
370# 380#
371 381# CONFIG_BLINK is not set
372#
373# ATA/ATAPI/MFM/RLL support
374#
375# CONFIG_IDE is not set 382# CONFIG_IDE is not set
376 383
377# 384#
@@ -400,6 +407,7 @@ CONFIG_SCSI_MULTI_LUN=y
400# CONFIG_SCSI_CONSTANTS is not set 407# CONFIG_SCSI_CONSTANTS is not set
401CONFIG_SCSI_LOGGING=y 408CONFIG_SCSI_LOGGING=y
402# CONFIG_SCSI_SCAN_ASYNC is not set 409# CONFIG_SCSI_SCAN_ASYNC is not set
410CONFIG_SCSI_WAIT_SCAN=m
403 411
404# 412#
405# SCSI Transports 413# SCSI Transports
@@ -415,10 +423,6 @@ CONFIG_SCSI_LOGGING=y
415# 423#
416# CONFIG_ISCSI_TCP is not set 424# CONFIG_ISCSI_TCP is not set
417# CONFIG_SCSI_DEBUG is not set 425# CONFIG_SCSI_DEBUG is not set
418
419#
420# Serial ATA (prod) and Parallel ATA (experimental) drivers
421#
422CONFIG_ATA=y 426CONFIG_ATA=y
423# CONFIG_ATA_NONSTANDARD is not set 427# CONFIG_ATA_NONSTANDARD is not set
424# CONFIG_PATA_PLATFORM is not set 428# CONFIG_PATA_PLATFORM is not set
@@ -427,25 +431,7 @@ CONFIG_ATA=y
427# Multi-device support (RAID and LVM) 431# Multi-device support (RAID and LVM)
428# 432#
429# CONFIG_MD is not set 433# CONFIG_MD is not set
430 434# CONFIG_MACINTOSH_DRIVERS is not set
431#
432# Fusion MPT device support
433#
434# CONFIG_FUSION is not set
435
436#
437# IEEE 1394 (FireWire) support
438#
439
440#
441# I2O device support
442#
443
444#
445# Macintosh device drivers
446#
447# CONFIG_MAC_EMUMOUSEBTN is not set
448# CONFIG_WINDFARM is not set
449 435
450# 436#
451# Network device support 437# Network device support
@@ -455,10 +441,6 @@ CONFIG_NETDEVICES=y
455# CONFIG_BONDING is not set 441# CONFIG_BONDING is not set
456# CONFIG_EQUALIZER is not set 442# CONFIG_EQUALIZER is not set
457# CONFIG_TUN is not set 443# CONFIG_TUN is not set
458
459#
460# PHY device support
461#
462CONFIG_PHYLIB=y 444CONFIG_PHYLIB=y
463 445
464# 446#
@@ -479,29 +461,16 @@ CONFIG_VITESSE_PHY=y
479# 461#
480CONFIG_NET_ETHERNET=y 462CONFIG_NET_ETHERNET=y
481CONFIG_MII=y 463CONFIG_MII=y
482 464CONFIG_NETDEV_1000=y
483#
484# Ethernet (1000 Mbit)
485#
486CONFIG_GIANFAR=y 465CONFIG_GIANFAR=y
487CONFIG_GFAR_NAPI=y 466CONFIG_GFAR_NAPI=y
467CONFIG_NETDEV_10000=y
488 468
489# 469#
490# Ethernet (10000 Mbit) 470# Wireless LAN
491#
492
493#
494# Token Ring devices
495#
496
497#
498# Wireless LAN (non-hamradio)
499#
500# CONFIG_NET_RADIO is not set
501
502#
503# Wan interfaces
504# 471#
472# CONFIG_WLAN_PRE80211 is not set
473# CONFIG_WLAN_80211 is not set
505# CONFIG_WAN is not set 474# CONFIG_WAN is not set
506# CONFIG_PPP is not set 475# CONFIG_PPP is not set
507# CONFIG_SLIP is not set 476# CONFIG_SLIP is not set
@@ -525,6 +494,7 @@ CONFIG_GFAR_NAPI=y
525# 494#
526CONFIG_INPUT=y 495CONFIG_INPUT=y
527# CONFIG_INPUT_FF_MEMLESS is not set 496# CONFIG_INPUT_FF_MEMLESS is not set
497# CONFIG_INPUT_POLLDEV is not set
528 498
529# 499#
530# Userland interfaces 500# Userland interfaces
@@ -541,6 +511,7 @@ CONFIG_INPUT=y
541# CONFIG_INPUT_KEYBOARD is not set 511# CONFIG_INPUT_KEYBOARD is not set
542# CONFIG_INPUT_MOUSE is not set 512# CONFIG_INPUT_MOUSE is not set
543# CONFIG_INPUT_JOYSTICK is not set 513# CONFIG_INPUT_JOYSTICK is not set
514# CONFIG_INPUT_TABLET is not set
544# CONFIG_INPUT_TOUCHSCREEN is not set 515# CONFIG_INPUT_TOUCHSCREEN is not set
545# CONFIG_INPUT_MISC is not set 516# CONFIG_INPUT_MISC is not set
546 517
@@ -571,6 +542,7 @@ CONFIG_SERIAL_8250_CONSOLE=y
571CONFIG_SERIAL_8250_NR_UARTS=4 542CONFIG_SERIAL_8250_NR_UARTS=4
572CONFIG_SERIAL_8250_RUNTIME_UARTS=4 543CONFIG_SERIAL_8250_RUNTIME_UARTS=4
573# CONFIG_SERIAL_8250_EXTENDED is not set 544# CONFIG_SERIAL_8250_EXTENDED is not set
545CONFIG_SERIAL_8250_SHARE_IRQ=y
574 546
575# 547#
576# Non-8250 serial port support 548# Non-8250 serial port support
@@ -587,16 +559,11 @@ CONFIG_LEGACY_PTY_COUNT=256
587# IPMI 559# IPMI
588# 560#
589# CONFIG_IPMI_HANDLER is not set 561# CONFIG_IPMI_HANDLER is not set
590
591#
592# Watchdog Cards
593#
594# CONFIG_WATCHDOG is not set 562# CONFIG_WATCHDOG is not set
595# CONFIG_HW_RANDOM is not set 563# CONFIG_HW_RANDOM is not set
596CONFIG_NVRAM=y 564CONFIG_NVRAM=y
597CONFIG_GEN_RTC=y 565CONFIG_GEN_RTC=y
598CONFIG_GEN_RTC_X=y 566CONFIG_GEN_RTC_X=y
599# CONFIG_DTLK is not set
600# CONFIG_R3964 is not set 567# CONFIG_R3964 is not set
601# CONFIG_RAW_DRIVER is not set 568# CONFIG_RAW_DRIVER is not set
602 569
@@ -604,10 +571,6 @@ CONFIG_GEN_RTC_X=y
604# TPM devices 571# TPM devices
605# 572#
606# CONFIG_TCG_TPM is not set 573# CONFIG_TCG_TPM is not set
607
608#
609# I2C support
610#
611# CONFIG_I2C is not set 574# CONFIG_I2C is not set
612 575
613# 576#
@@ -620,12 +583,7 @@ CONFIG_GEN_RTC_X=y
620# Dallas's 1-wire bus 583# Dallas's 1-wire bus
621# 584#
622# CONFIG_W1 is not set 585# CONFIG_W1 is not set
623
624#
625# Hardware Monitoring support
626#
627# CONFIG_HWMON is not set 586# CONFIG_HWMON is not set
628# CONFIG_HWMON_VID is not set
629 587
630# 588#
631# Multifunction device drivers 589# Multifunction device drivers
@@ -636,13 +594,9 @@ CONFIG_GEN_RTC_X=y
636# Multimedia devices 594# Multimedia devices
637# 595#
638# CONFIG_VIDEO_DEV is not set 596# CONFIG_VIDEO_DEV is not set
639
640#
641# Digital Video Broadcasting Devices
642#
643CONFIG_DVB=y
644CONFIG_DVB_CORE=m 597CONFIG_DVB_CORE=m
645# CONFIG_DVB_CORE_ATTACH is not set 598# CONFIG_DVB_CORE_ATTACH is not set
599CONFIG_DVB_CAPTURE_DRIVERS=y
646 600
647# 601#
648# Supported DVB Frontends 602# Supported DVB Frontends
@@ -676,11 +630,18 @@ CONFIG_DVB_CORE=m
676# 630#
677# Miscellaneous devices 631# Miscellaneous devices
678# 632#
633CONFIG_DAB=y
679 634
680# 635#
681# Graphics support 636# Graphics support
682# 637#
683# CONFIG_BACKLIGHT_LCD_SUPPORT is not set 638# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
639
640#
641# Display device support
642#
643# CONFIG_DISPLAY_SUPPORT is not set
644# CONFIG_VGASTATE is not set
684# CONFIG_FB is not set 645# CONFIG_FB is not set
685# CONFIG_FB_IBM_GXT4500 is not set 646# CONFIG_FB_IBM_GXT4500 is not set
686 647
@@ -716,10 +677,6 @@ CONFIG_HID=y
716# USB Gadget Support 677# USB Gadget Support
717# 678#
718# CONFIG_USB_GADGET is not set 679# CONFIG_USB_GADGET is not set
719
720#
721# MMC/SD Card support
722#
723# CONFIG_MMC is not set 680# CONFIG_MMC is not set
724 681
725# 682#
@@ -759,17 +716,29 @@ CONFIG_RTC_INTF_SYSFS=y
759CONFIG_RTC_INTF_PROC=y 716CONFIG_RTC_INTF_PROC=y
760CONFIG_RTC_INTF_DEV=y 717CONFIG_RTC_INTF_DEV=y
761# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set 718# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
719# CONFIG_RTC_DRV_TEST is not set
720
721#
722# I2C RTC drivers
723#
762 724
763# 725#
764# RTC drivers 726# SPI RTC drivers
727#
728
729#
730# Platform RTC drivers
765# 731#
766# CONFIG_RTC_DRV_DS1553 is not set 732# CONFIG_RTC_DRV_DS1553 is not set
767# CONFIG_RTC_DRV_DS1742 is not set 733# CONFIG_RTC_DRV_DS1742 is not set
768# CONFIG_RTC_DRV_M48T86 is not set 734# CONFIG_RTC_DRV_M48T86 is not set
769# CONFIG_RTC_DRV_TEST is not set
770# CONFIG_RTC_DRV_V3020 is not set 735# CONFIG_RTC_DRV_V3020 is not set
771 736
772# 737#
738# on-CPU RTC drivers
739#
740
741#
773# DMA Engine support 742# DMA Engine support
774# 743#
775# CONFIG_DMA_ENGINE is not set 744# CONFIG_DMA_ENGINE is not set
@@ -783,14 +752,6 @@ CONFIG_RTC_INTF_DEV=y
783# 752#
784 753
785# 754#
786# Auxiliary Display support
787#
788
789#
790# Virtualization
791#
792
793#
794# File systems 755# File systems
795# 756#
796CONFIG_EXT2_FS=y 757CONFIG_EXT2_FS=y
@@ -890,6 +851,7 @@ CONFIG_LOCKD_V4=y
890CONFIG_NFS_COMMON=y 851CONFIG_NFS_COMMON=y
891CONFIG_SUNRPC=y 852CONFIG_SUNRPC=y
892CONFIG_SUNRPC_GSS=y 853CONFIG_SUNRPC_GSS=y
854# CONFIG_SUNRPC_BIND34 is not set
893CONFIG_RPCSEC_GSS_KRB5=y 855CONFIG_RPCSEC_GSS_KRB5=y
894# CONFIG_RPCSEC_GSS_SPKM3 is not set 856# CONFIG_RPCSEC_GSS_SPKM3 is not set
895# CONFIG_SMB_FS is not set 857# CONFIG_SMB_FS is not set
@@ -919,6 +881,7 @@ CONFIG_MSDOS_PARTITION=y
919# CONFIG_SUN_PARTITION is not set 881# CONFIG_SUN_PARTITION is not set
920# CONFIG_KARMA_PARTITION is not set 882# CONFIG_KARMA_PARTITION is not set
921# CONFIG_EFI_PARTITION is not set 883# CONFIG_EFI_PARTITION is not set
884# CONFIG_SYSV68_PARTITION is not set
922 885
923# 886#
924# Native Language Support 887# Native Language Support
@@ -968,6 +931,7 @@ CONFIG_NLS_UTF8=m
968# Distributed Lock Manager 931# Distributed Lock Manager
969# 932#
970# CONFIG_DLM is not set 933# CONFIG_DLM is not set
934# CONFIG_UCC_SLOW is not set
971 935
972# 936#
973# Library routines 937# Library routines
@@ -975,12 +939,14 @@ CONFIG_NLS_UTF8=m
975CONFIG_BITREVERSE=y 939CONFIG_BITREVERSE=y
976# CONFIG_CRC_CCITT is not set 940# CONFIG_CRC_CCITT is not set
977# CONFIG_CRC16 is not set 941# CONFIG_CRC16 is not set
942# CONFIG_CRC_ITU_T is not set
978CONFIG_CRC32=y 943CONFIG_CRC32=y
979CONFIG_LIBCRC32C=m 944CONFIG_LIBCRC32C=m
980CONFIG_ZLIB_INFLATE=y 945CONFIG_ZLIB_INFLATE=y
981CONFIG_PLIST=y 946CONFIG_PLIST=y
982CONFIG_HAS_IOMEM=y 947CONFIG_HAS_IOMEM=y
983CONFIG_HAS_IOPORT=y 948CONFIG_HAS_IOPORT=y
949CONFIG_HAS_DMA=y
984 950
985# 951#
986# Instrumentation Support 952# Instrumentation Support
@@ -998,7 +964,6 @@ CONFIG_ENABLE_MUST_CHECK=y
998# CONFIG_HEADERS_CHECK is not set 964# CONFIG_HEADERS_CHECK is not set
999CONFIG_DEBUG_KERNEL=y 965CONFIG_DEBUG_KERNEL=y
1000# CONFIG_DEBUG_SHIRQ is not set 966# CONFIG_DEBUG_SHIRQ is not set
1001CONFIG_LOG_BUF_SHIFT=14
1002CONFIG_DETECT_SOFTLOCKUP=y 967CONFIG_DETECT_SOFTLOCKUP=y
1003# CONFIG_SCHEDSTATS is not set 968# CONFIG_SCHEDSTATS is not set
1004# CONFIG_TIMER_STATS is not set 969# CONFIG_TIMER_STATS is not set
@@ -1020,6 +985,7 @@ CONFIG_FORCED_INLINING=y
1020# CONFIG_FAULT_INJECTION is not set 985# CONFIG_FAULT_INJECTION is not set
1021# CONFIG_DEBUG_STACKOVERFLOW is not set 986# CONFIG_DEBUG_STACKOVERFLOW is not set
1022# CONFIG_DEBUG_STACK_USAGE is not set 987# CONFIG_DEBUG_STACK_USAGE is not set
988# CONFIG_DEBUG_PAGEALLOC is not set
1023# CONFIG_DEBUGGER is not set 989# CONFIG_DEBUGGER is not set
1024# CONFIG_BDI_SWITCH is not set 990# CONFIG_BDI_SWITCH is not set
1025# CONFIG_BOOTX_TEXT is not set 991# CONFIG_BOOTX_TEXT is not set
@@ -1054,6 +1020,7 @@ CONFIG_CRYPTO_MD5=y
1054CONFIG_CRYPTO_CBC=y 1020CONFIG_CRYPTO_CBC=y
1055CONFIG_CRYPTO_PCBC=m 1021CONFIG_CRYPTO_PCBC=m
1056# CONFIG_CRYPTO_LRW is not set 1022# CONFIG_CRYPTO_LRW is not set
1023# CONFIG_CRYPTO_CRYPTD is not set
1057CONFIG_CRYPTO_DES=y 1024CONFIG_CRYPTO_DES=y
1058# CONFIG_CRYPTO_FCRYPT is not set 1025# CONFIG_CRYPTO_FCRYPT is not set
1059# CONFIG_CRYPTO_BLOWFISH is not set 1026# CONFIG_CRYPTO_BLOWFISH is not set
diff --git a/arch/powerpc/configs/mpc8560_ads_defconfig b/arch/powerpc/configs/mpc8560_ads_defconfig
index ecaa267a853c..a30bc6f6211c 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.20-rc5 3# Linux kernel version: 2.6.22-rc7
4# Mon Jan 22 22:25:53 2007 4# Sun Jul 1 23:56:58 2007
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7CONFIG_PPC32=y 7CONFIG_PPC32=y
@@ -20,7 +20,7 @@ CONFIG_GENERIC_NVRAM=y
20CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y 20CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
21CONFIG_ARCH_MAY_HAVE_PC_FDC=y 21CONFIG_ARCH_MAY_HAVE_PC_FDC=y
22CONFIG_PPC_OF=y 22CONFIG_PPC_OF=y
23# CONFIG_PPC_UDBG_16550 is not set 23CONFIG_PPC_UDBG_16550=y
24# CONFIG_GENERIC_TBSYNC is not set 24# CONFIG_GENERIC_TBSYNC is not set
25CONFIG_AUDIT_ARCH=y 25CONFIG_AUDIT_ARCH=y
26CONFIG_GENERIC_BUG=y 26CONFIG_GENERIC_BUG=y
@@ -34,9 +34,9 @@ CONFIG_DEFAULT_UIMAGE=y
34# CONFIG_PPC_83xx is not set 34# CONFIG_PPC_83xx is not set
35CONFIG_PPC_85xx=y 35CONFIG_PPC_85xx=y
36# CONFIG_PPC_86xx is not set 36# CONFIG_PPC_86xx is not set
37# CONFIG_PPC_8xx is not set
37# CONFIG_40x is not set 38# CONFIG_40x is not set
38# CONFIG_44x is not set 39# CONFIG_44x is not set
39# CONFIG_8xx is not set
40# CONFIG_E200 is not set 40# CONFIG_E200 is not set
41CONFIG_85xx=y 41CONFIG_85xx=y
42CONFIG_E500=y 42CONFIG_E500=y
@@ -46,6 +46,7 @@ CONFIG_BOOKE=y
46CONFIG_FSL_BOOKE=y 46CONFIG_FSL_BOOKE=y
47# CONFIG_PHYS_64BIT is not set 47# CONFIG_PHYS_64BIT is not set
48CONFIG_SPE=y 48CONFIG_SPE=y
49# CONFIG_PPC_MM_SLICES is not set
49CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 50CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
50 51
51# 52#
@@ -63,14 +64,17 @@ CONFIG_LOCALVERSION_AUTO=y
63CONFIG_SWAP=y 64CONFIG_SWAP=y
64CONFIG_SYSVIPC=y 65CONFIG_SYSVIPC=y
65# CONFIG_IPC_NS is not set 66# CONFIG_IPC_NS is not set
67CONFIG_SYSVIPC_SYSCTL=y
66# CONFIG_POSIX_MQUEUE is not set 68# CONFIG_POSIX_MQUEUE is not set
67# CONFIG_BSD_PROCESS_ACCT is not set 69# CONFIG_BSD_PROCESS_ACCT is not set
68# CONFIG_TASKSTATS is not set 70# CONFIG_TASKSTATS is not set
69# CONFIG_UTS_NS is not set 71# CONFIG_UTS_NS is not set
70# CONFIG_AUDIT is not set 72# CONFIG_AUDIT is not set
71# CONFIG_IKCONFIG is not set 73# CONFIG_IKCONFIG is not set
74CONFIG_LOG_BUF_SHIFT=14
72CONFIG_SYSFS_DEPRECATED=y 75CONFIG_SYSFS_DEPRECATED=y
73# CONFIG_RELAY is not set 76# CONFIG_RELAY is not set
77CONFIG_BLK_DEV_INITRD=y
74CONFIG_INITRAMFS_SOURCE="" 78CONFIG_INITRAMFS_SOURCE=""
75# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 79# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
76CONFIG_SYSCTL=y 80CONFIG_SYSCTL=y
@@ -85,14 +89,19 @@ CONFIG_BUG=y
85CONFIG_ELF_CORE=y 89CONFIG_ELF_CORE=y
86CONFIG_BASE_FULL=y 90CONFIG_BASE_FULL=y
87CONFIG_FUTEX=y 91CONFIG_FUTEX=y
92CONFIG_ANON_INODES=y
88CONFIG_EPOLL=y 93CONFIG_EPOLL=y
94CONFIG_SIGNALFD=y
95CONFIG_TIMERFD=y
96CONFIG_EVENTFD=y
89CONFIG_SHMEM=y 97CONFIG_SHMEM=y
90CONFIG_SLAB=y
91CONFIG_VM_EVENT_COUNTERS=y 98CONFIG_VM_EVENT_COUNTERS=y
99CONFIG_SLAB=y
100# CONFIG_SLUB is not set
101# CONFIG_SLOB is not set
92CONFIG_RT_MUTEXES=y 102CONFIG_RT_MUTEXES=y
93# CONFIG_TINY_SHMEM is not set 103# CONFIG_TINY_SHMEM is not set
94CONFIG_BASE_SMALL=0 104CONFIG_BASE_SMALL=0
95# CONFIG_SLOB is not set
96 105
97# 106#
98# Loadable module support 107# Loadable module support
@@ -119,18 +128,33 @@ CONFIG_DEFAULT_AS=y
119# CONFIG_DEFAULT_CFQ is not set 128# CONFIG_DEFAULT_CFQ is not set
120# CONFIG_DEFAULT_NOOP is not set 129# CONFIG_DEFAULT_NOOP is not set
121CONFIG_DEFAULT_IOSCHED="anticipatory" 130CONFIG_DEFAULT_IOSCHED="anticipatory"
122CONFIG_CPM2=y
123# CONFIG_WANT_EARLY_SERIAL is not set
124 131
125# 132#
126# Platform support 133# Platform support
127# 134#
135# CONFIG_PPC_MPC52xx is not set
136# CONFIG_PPC_MPC5200 is not set
137# CONFIG_PPC_CELL is not set
138# CONFIG_PPC_CELL_NATIVE is not set
139# CONFIG_PQ2ADS is not set
128# CONFIG_MPC8540_ADS is not set 140# CONFIG_MPC8540_ADS is not set
129CONFIG_MPC8560_ADS=y 141CONFIG_MPC8560_ADS=y
130# CONFIG_MPC85xx_CDS is not set 142# CONFIG_MPC85xx_CDS is not set
143# CONFIG_MPC85xx_MDS is not set
144# CONFIG_MPC8544_DS is not set
131CONFIG_MPC8560=y 145CONFIG_MPC8560=y
132CONFIG_PPC_INDIRECT_PCI_BE=y 146CONFIG_MPC85xx=y
133CONFIG_MPIC=y 147CONFIG_MPIC=y
148# CONFIG_MPIC_WEIRD is not set
149# CONFIG_PPC_I8259 is not set
150# CONFIG_PPC_RTAS is not set
151# CONFIG_MMIO_NVRAM is not set
152# CONFIG_PPC_MPC106 is not set
153# CONFIG_PPC_970_NAP is not set
154# CONFIG_PPC_INDIRECT_IO is not set
155# CONFIG_GENERIC_IOMAP is not set
156# CONFIG_CPU_FREQ is not set
157CONFIG_CPM2=y
134 158
135# 159#
136# Kernel options 160# Kernel options
@@ -148,7 +172,6 @@ CONFIG_BINFMT_ELF=y
148CONFIG_BINFMT_MISC=y 172CONFIG_BINFMT_MISC=y
149# CONFIG_MATH_EMULATION is not set 173# CONFIG_MATH_EMULATION is not set
150CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y 174CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
151# CONFIG_PC_KEYBOARD is not set
152CONFIG_ARCH_FLATMEM_ENABLE=y 175CONFIG_ARCH_FLATMEM_ENABLE=y
153CONFIG_ARCH_POPULATES_NODE_MAP=y 176CONFIG_ARCH_POPULATES_NODE_MAP=y
154CONFIG_SELECT_MEMORY_MODEL=y 177CONFIG_SELECT_MEMORY_MODEL=y
@@ -160,32 +183,33 @@ CONFIG_FLAT_NODE_MEM_MAP=y
160# CONFIG_SPARSEMEM_STATIC is not set 183# CONFIG_SPARSEMEM_STATIC is not set
161CONFIG_SPLIT_PTLOCK_CPUS=4 184CONFIG_SPLIT_PTLOCK_CPUS=4
162# CONFIG_RESOURCES_64BIT is not set 185# CONFIG_RESOURCES_64BIT is not set
186CONFIG_ZONE_DMA_FLAG=1
163# CONFIG_PROC_DEVICETREE is not set 187# CONFIG_PROC_DEVICETREE is not set
164# CONFIG_CMDLINE_BOOL is not set 188# CONFIG_CMDLINE_BOOL is not set
165# CONFIG_PM is not set 189# CONFIG_PM is not set
166# CONFIG_SECCOMP is not set 190# CONFIG_SECCOMP is not set
191CONFIG_WANT_DEVICE_TREE=y
192CONFIG_DEVICE_TREE=""
167CONFIG_ISA_DMA_API=y 193CONFIG_ISA_DMA_API=y
168 194
169# 195#
170# Bus options 196# Bus options
171# 197#
172# CONFIG_MPIC_WEIRD is not set 198CONFIG_ZONE_DMA=y
173# CONFIG_PPC_I8259 is not set
174CONFIG_PPC_INDIRECT_PCI=y 199CONFIG_PPC_INDIRECT_PCI=y
200CONFIG_PPC_INDIRECT_PCI_BE=y
175CONFIG_FSL_SOC=y 201CONFIG_FSL_SOC=y
176CONFIG_PCI=y 202CONFIG_PCI=y
177CONFIG_PCI_DOMAINS=y 203CONFIG_PCI_DOMAINS=y
178# CONFIG_PCIEPORTBUS is not set 204# CONFIG_PCIEPORTBUS is not set
205CONFIG_ARCH_SUPPORTS_MSI=y
206# CONFIG_PCI_MSI is not set
179CONFIG_PCI_DEBUG=y 207CONFIG_PCI_DEBUG=y
180 208
181# 209#
182# PCCARD (PCMCIA/CardBus) support 210# PCCARD (PCMCIA/CardBus) support
183# 211#
184# CONFIG_PCCARD is not set 212# CONFIG_PCCARD is not set
185
186#
187# PCI Hotplug Support
188#
189# CONFIG_HOTPLUG_PCI is not set 213# CONFIG_HOTPLUG_PCI is not set
190 214
191# 215#
@@ -210,13 +234,13 @@ CONFIG_NET=y
210# 234#
211# Networking options 235# Networking options
212# 236#
213# CONFIG_NETDEBUG is not set
214CONFIG_PACKET=y 237CONFIG_PACKET=y
215# CONFIG_PACKET_MMAP is not set 238# CONFIG_PACKET_MMAP is not set
216CONFIG_UNIX=y 239CONFIG_UNIX=y
217CONFIG_XFRM=y 240CONFIG_XFRM=y
218# CONFIG_XFRM_USER is not set 241# CONFIG_XFRM_USER is not set
219# CONFIG_XFRM_SUB_POLICY is not set 242# CONFIG_XFRM_SUB_POLICY is not set
243# CONFIG_XFRM_MIGRATE is not set
220# CONFIG_NET_KEY is not set 244# CONFIG_NET_KEY is not set
221CONFIG_INET=y 245CONFIG_INET=y
222CONFIG_IP_MULTICAST=y 246CONFIG_IP_MULTICAST=y
@@ -250,20 +274,8 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
250# CONFIG_INET6_TUNNEL is not set 274# CONFIG_INET6_TUNNEL is not set
251# CONFIG_NETWORK_SECMARK is not set 275# CONFIG_NETWORK_SECMARK is not set
252# CONFIG_NETFILTER is not set 276# CONFIG_NETFILTER is not set
253
254#
255# DCCP Configuration (EXPERIMENTAL)
256#
257# CONFIG_IP_DCCP is not set 277# CONFIG_IP_DCCP is not set
258
259#
260# SCTP Configuration (EXPERIMENTAL)
261#
262# CONFIG_IP_SCTP is not set 278# CONFIG_IP_SCTP is not set
263
264#
265# TIPC Configuration (EXPERIMENTAL)
266#
267# CONFIG_TIPC is not set 279# CONFIG_TIPC is not set
268# CONFIG_ATM is not set 280# CONFIG_ATM is not set
269# CONFIG_BRIDGE is not set 281# CONFIG_BRIDGE is not set
@@ -289,7 +301,16 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
289# CONFIG_HAMRADIO is not set 301# CONFIG_HAMRADIO is not set
290# CONFIG_IRDA is not set 302# CONFIG_IRDA is not set
291# CONFIG_BT is not set 303# CONFIG_BT is not set
304# CONFIG_AF_RXRPC is not set
305
306#
307# Wireless
308#
309# CONFIG_CFG80211 is not set
310# CONFIG_WIRELESS_EXT is not set
311# CONFIG_MAC80211 is not set
292# CONFIG_IEEE80211 is not set 312# CONFIG_IEEE80211 is not set
313# CONFIG_RFKILL is not set
293 314
294# 315#
295# Device Drivers 316# Device Drivers
@@ -302,16 +323,13 @@ CONFIG_STANDALONE=y
302CONFIG_PREVENT_FIRMWARE_BUILD=y 323CONFIG_PREVENT_FIRMWARE_BUILD=y
303# CONFIG_FW_LOADER is not set 324# CONFIG_FW_LOADER is not set
304# CONFIG_DEBUG_DRIVER is not set 325# CONFIG_DEBUG_DRIVER is not set
326# CONFIG_DEBUG_DEVRES is not set
305# CONFIG_SYS_HYPERVISOR is not set 327# CONFIG_SYS_HYPERVISOR is not set
306 328
307# 329#
308# Connector - unified userspace <-> kernelspace linker 330# Connector - unified userspace <-> kernelspace linker
309# 331#
310# CONFIG_CONNECTOR is not set 332# CONFIG_CONNECTOR is not set
311
312#
313# Memory Technology Devices (MTD)
314#
315# CONFIG_MTD is not set 333# CONFIG_MTD is not set
316 334
317# 335#
@@ -322,6 +340,7 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y
322# 340#
323# Plug and Play support 341# Plug and Play support
324# 342#
343# CONFIG_PNPACPI is not set
325 344
326# 345#
327# Block devices 346# Block devices
@@ -340,19 +359,16 @@ CONFIG_BLK_DEV_RAM=y
340CONFIG_BLK_DEV_RAM_COUNT=16 359CONFIG_BLK_DEV_RAM_COUNT=16
341CONFIG_BLK_DEV_RAM_SIZE=32768 360CONFIG_BLK_DEV_RAM_SIZE=32768
342CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 361CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
343CONFIG_BLK_DEV_INITRD=y
344# CONFIG_CDROM_PKTCDVD is not set 362# CONFIG_CDROM_PKTCDVD is not set
345# CONFIG_ATA_OVER_ETH is not set 363# CONFIG_ATA_OVER_ETH is not set
346 364
347# 365#
348# Misc devices 366# Misc devices
349# 367#
368# CONFIG_PHANTOM is not set
350# CONFIG_SGI_IOC4 is not set 369# CONFIG_SGI_IOC4 is not set
351# CONFIG_TIFM_CORE is not set 370# CONFIG_TIFM_CORE is not set
352 371# CONFIG_BLINK is not set
353#
354# ATA/ATAPI/MFM/RLL support
355#
356# CONFIG_IDE is not set 372# CONFIG_IDE is not set
357 373
358# 374#
@@ -361,10 +377,6 @@ CONFIG_BLK_DEV_INITRD=y
361# CONFIG_RAID_ATTRS is not set 377# CONFIG_RAID_ATTRS is not set
362# CONFIG_SCSI is not set 378# CONFIG_SCSI is not set
363# CONFIG_SCSI_NETLINK is not set 379# CONFIG_SCSI_NETLINK is not set
364
365#
366# Serial ATA (prod) and Parallel ATA (experimental) drivers
367#
368# CONFIG_ATA is not set 380# CONFIG_ATA is not set
369 381
370# 382#
@@ -380,18 +392,14 @@ CONFIG_BLK_DEV_INITRD=y
380# 392#
381# IEEE 1394 (FireWire) support 393# IEEE 1394 (FireWire) support
382# 394#
395# CONFIG_FIREWIRE is not set
383# CONFIG_IEEE1394 is not set 396# CONFIG_IEEE1394 is not set
384 397
385# 398#
386# I2O device support 399# I2O device support
387# 400#
388# CONFIG_I2O is not set 401# CONFIG_I2O is not set
389 402# CONFIG_MACINTOSH_DRIVERS is not set
390#
391# Macintosh device drivers
392#
393# CONFIG_MAC_EMUMOUSEBTN is not set
394# CONFIG_WINDFARM is not set
395 403
396# 404#
397# Network device support 405# Network device support
@@ -401,15 +409,7 @@ CONFIG_NETDEVICES=y
401# CONFIG_BONDING is not set 409# CONFIG_BONDING is not set
402# CONFIG_EQUALIZER is not set 410# CONFIG_EQUALIZER is not set
403# CONFIG_TUN is not set 411# CONFIG_TUN is not set
404
405#
406# ARCnet devices
407#
408# CONFIG_ARCNET is not set 412# CONFIG_ARCNET is not set
409
410#
411# PHY device support
412#
413CONFIG_PHYLIB=y 413CONFIG_PHYLIB=y
414 414
415# 415#
@@ -444,10 +444,7 @@ CONFIG_MII=y
444CONFIG_FS_ENET=y 444CONFIG_FS_ENET=y
445# CONFIG_FS_ENET_HAS_SCC is not set 445# CONFIG_FS_ENET_HAS_SCC is not set
446CONFIG_FS_ENET_HAS_FCC=y 446CONFIG_FS_ENET_HAS_FCC=y
447 447CONFIG_NETDEV_1000=y
448#
449# Ethernet (1000 Mbit)
450#
451# CONFIG_ACENIC is not set 448# CONFIG_ACENIC is not set
452# CONFIG_DL2K is not set 449# CONFIG_DL2K is not set
453CONFIG_E1000=y 450CONFIG_E1000=y
@@ -461,34 +458,28 @@ CONFIG_E1000_NAPI=y
461# CONFIG_SKGE is not set 458# CONFIG_SKGE is not set
462# CONFIG_SKY2 is not set 459# CONFIG_SKY2 is not set
463# CONFIG_SK98LIN is not set 460# CONFIG_SK98LIN is not set
461# CONFIG_VIA_VELOCITY is not set
464# CONFIG_TIGON3 is not set 462# CONFIG_TIGON3 is not set
465# CONFIG_BNX2 is not set 463# CONFIG_BNX2 is not set
466CONFIG_GIANFAR=y 464CONFIG_GIANFAR=y
467CONFIG_GFAR_NAPI=y 465CONFIG_GFAR_NAPI=y
468# CONFIG_QLA3XXX is not set 466# CONFIG_QLA3XXX is not set
469 467# CONFIG_ATL1 is not set
470# 468CONFIG_NETDEV_10000=y
471# Ethernet (10000 Mbit)
472#
473# CONFIG_CHELSIO_T1 is not set 469# CONFIG_CHELSIO_T1 is not set
470# CONFIG_CHELSIO_T3 is not set
474# CONFIG_IXGB is not set 471# CONFIG_IXGB is not set
475# CONFIG_S2IO is not set 472# CONFIG_S2IO is not set
476# CONFIG_MYRI10GE is not set 473# CONFIG_MYRI10GE is not set
477# CONFIG_NETXEN_NIC is not set 474# CONFIG_NETXEN_NIC is not set
478 475# CONFIG_MLX4_CORE is not set
479#
480# Token Ring devices
481#
482# CONFIG_TR is not set 476# CONFIG_TR is not set
483 477
484# 478#
485# Wireless LAN (non-hamradio) 479# Wireless LAN
486#
487# CONFIG_NET_RADIO is not set
488
489#
490# Wan interfaces
491# 480#
481# CONFIG_WLAN_PRE80211 is not set
482# CONFIG_WLAN_80211 is not set
492# CONFIG_WAN is not set 483# CONFIG_WAN is not set
493# CONFIG_FDDI is not set 484# CONFIG_FDDI is not set
494# CONFIG_HIPPI is not set 485# CONFIG_HIPPI is not set
@@ -514,6 +505,7 @@ CONFIG_GFAR_NAPI=y
514# 505#
515CONFIG_INPUT=y 506CONFIG_INPUT=y
516# CONFIG_INPUT_FF_MEMLESS is not set 507# CONFIG_INPUT_FF_MEMLESS is not set
508# CONFIG_INPUT_POLLDEV is not set
517 509
518# 510#
519# Userland interfaces 511# Userland interfaces
@@ -530,6 +522,7 @@ CONFIG_INPUT=y
530# CONFIG_INPUT_KEYBOARD is not set 522# CONFIG_INPUT_KEYBOARD is not set
531# CONFIG_INPUT_MOUSE is not set 523# CONFIG_INPUT_MOUSE is not set
532# CONFIG_INPUT_JOYSTICK is not set 524# CONFIG_INPUT_JOYSTICK is not set
525# CONFIG_INPUT_TABLET is not set
533# CONFIG_INPUT_TOUCHSCREEN is not set 526# CONFIG_INPUT_TOUCHSCREEN is not set
534# CONFIG_INPUT_MISC is not set 527# CONFIG_INPUT_MISC is not set
535 528
@@ -573,16 +566,11 @@ CONFIG_LEGACY_PTY_COUNT=256
573# IPMI 566# IPMI
574# 567#
575# CONFIG_IPMI_HANDLER is not set 568# CONFIG_IPMI_HANDLER is not set
576
577#
578# Watchdog Cards
579#
580# CONFIG_WATCHDOG is not set 569# CONFIG_WATCHDOG is not set
581CONFIG_HW_RANDOM=y 570CONFIG_HW_RANDOM=y
582# CONFIG_NVRAM is not set 571# CONFIG_NVRAM is not set
583CONFIG_GEN_RTC=y 572CONFIG_GEN_RTC=y
584# CONFIG_GEN_RTC_X is not set 573# CONFIG_GEN_RTC_X is not set
585# CONFIG_DTLK is not set
586# CONFIG_R3964 is not set 574# CONFIG_R3964 is not set
587# CONFIG_APPLICOM is not set 575# CONFIG_APPLICOM is not set
588# CONFIG_AGP is not set 576# CONFIG_AGP is not set
@@ -593,10 +581,7 @@ CONFIG_GEN_RTC=y
593# TPM devices 581# TPM devices
594# 582#
595# CONFIG_TCG_TPM is not set 583# CONFIG_TCG_TPM is not set
596 584CONFIG_DEVPORT=y
597#
598# I2C support
599#
600# CONFIG_I2C is not set 585# CONFIG_I2C is not set
601 586
602# 587#
@@ -609,35 +594,41 @@ CONFIG_GEN_RTC=y
609# Dallas's 1-wire bus 594# Dallas's 1-wire bus
610# 595#
611# CONFIG_W1 is not set 596# CONFIG_W1 is not set
612
613#
614# Hardware Monitoring support
615#
616CONFIG_HWMON=y 597CONFIG_HWMON=y
617# CONFIG_HWMON_VID is not set 598# CONFIG_HWMON_VID is not set
618# CONFIG_SENSORS_ABITUGURU is not set 599# CONFIG_SENSORS_ABITUGURU is not set
619# CONFIG_SENSORS_F71805F is not set 600# CONFIG_SENSORS_F71805F is not set
620# CONFIG_SENSORS_PC87427 is not set 601# CONFIG_SENSORS_PC87427 is not set
602# CONFIG_SENSORS_SMSC47M1 is not set
603# CONFIG_SENSORS_SMSC47B397 is not set
621# CONFIG_SENSORS_VT1211 is not set 604# CONFIG_SENSORS_VT1211 is not set
605# CONFIG_SENSORS_W83627HF is not set
622# CONFIG_HWMON_DEBUG_CHIP is not set 606# CONFIG_HWMON_DEBUG_CHIP is not set
623 607
624# 608#
609# Multifunction device drivers
610#
611# CONFIG_MFD_SM501 is not set
612
613#
625# Multimedia devices 614# Multimedia devices
626# 615#
627# CONFIG_VIDEO_DEV is not set 616# CONFIG_VIDEO_DEV is not set
617# CONFIG_DVB_CORE is not set
618CONFIG_DAB=y
628 619
629# 620#
630# Digital Video Broadcasting Devices 621# Graphics support
631# 622#
632# CONFIG_DVB is not set 623# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
633 624
634# 625#
635# Graphics support 626# Display device support
636# 627#
637CONFIG_FIRMWARE_EDID=y 628# CONFIG_DISPLAY_SUPPORT is not set
629# CONFIG_VGASTATE is not set
638# CONFIG_FB is not set 630# CONFIG_FB is not set
639# CONFIG_FB_IBM_GXT4500 is not set 631# CONFIG_FB_IBM_GXT4500 is not set
640# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
641 632
642# 633#
643# Sound 634# Sound
@@ -648,6 +639,7 @@ CONFIG_FIRMWARE_EDID=y
648# HID Devices 639# HID Devices
649# 640#
650CONFIG_HID=y 641CONFIG_HID=y
642# CONFIG_HID_DEBUG is not set
651 643
652# 644#
653# USB support 645# USB support
@@ -665,10 +657,6 @@ CONFIG_USB_ARCH_HAS_EHCI=y
665# USB Gadget Support 657# USB Gadget Support
666# 658#
667# CONFIG_USB_GADGET is not set 659# CONFIG_USB_GADGET is not set
668
669#
670# MMC/SD Card support
671#
672# CONFIG_MMC is not set 660# CONFIG_MMC is not set
673 661
674# 662#
@@ -712,10 +700,6 @@ CONFIG_USB_ARCH_HAS_EHCI=y
712# 700#
713 701
714# 702#
715# Virtualization
716#
717
718#
719# File systems 703# File systems
720# 704#
721CONFIG_EXT2_FS=y 705CONFIG_EXT2_FS=y
@@ -800,6 +784,7 @@ CONFIG_ROOT_NFS=y
800CONFIG_LOCKD=y 784CONFIG_LOCKD=y
801CONFIG_NFS_COMMON=y 785CONFIG_NFS_COMMON=y
802CONFIG_SUNRPC=y 786CONFIG_SUNRPC=y
787# CONFIG_SUNRPC_BIND34 is not set
803# CONFIG_RPCSEC_GSS_KRB5 is not set 788# CONFIG_RPCSEC_GSS_KRB5 is not set
804# CONFIG_RPCSEC_GSS_SPKM3 is not set 789# CONFIG_RPCSEC_GSS_SPKM3 is not set
805# CONFIG_SMB_FS is not set 790# CONFIG_SMB_FS is not set
@@ -825,6 +810,7 @@ CONFIG_PARTITION_ADVANCED=y
825# CONFIG_SUN_PARTITION is not set 810# CONFIG_SUN_PARTITION is not set
826# CONFIG_KARMA_PARTITION is not set 811# CONFIG_KARMA_PARTITION is not set
827# CONFIG_EFI_PARTITION is not set 812# CONFIG_EFI_PARTITION is not set
813# CONFIG_SYSV68_PARTITION is not set
828 814
829# 815#
830# Native Language Support 816# Native Language Support
@@ -835,6 +821,7 @@ CONFIG_PARTITION_ADVANCED=y
835# Distributed Lock Manager 821# Distributed Lock Manager
836# 822#
837# CONFIG_DLM is not set 823# CONFIG_DLM is not set
824# CONFIG_UCC_SLOW is not set
838 825
839# 826#
840# Library routines 827# Library routines
@@ -842,10 +829,13 @@ CONFIG_PARTITION_ADVANCED=y
842CONFIG_BITREVERSE=y 829CONFIG_BITREVERSE=y
843# CONFIG_CRC_CCITT is not set 830# CONFIG_CRC_CCITT is not set
844# CONFIG_CRC16 is not set 831# CONFIG_CRC16 is not set
832# CONFIG_CRC_ITU_T is not set
845CONFIG_CRC32=y 833CONFIG_CRC32=y
846# CONFIG_LIBCRC32C is not set 834# CONFIG_LIBCRC32C is not set
847CONFIG_PLIST=y 835CONFIG_PLIST=y
848CONFIG_IOMAP_COPY=y 836CONFIG_HAS_IOMEM=y
837CONFIG_HAS_IOPORT=y
838CONFIG_HAS_DMA=y
849 839
850# 840#
851# Instrumentation Support 841# Instrumentation Support
@@ -862,15 +852,15 @@ CONFIG_ENABLE_MUST_CHECK=y
862# CONFIG_DEBUG_FS is not set 852# CONFIG_DEBUG_FS is not set
863# CONFIG_HEADERS_CHECK is not set 853# CONFIG_HEADERS_CHECK is not set
864CONFIG_DEBUG_KERNEL=y 854CONFIG_DEBUG_KERNEL=y
865CONFIG_LOG_BUF_SHIFT=14 855# CONFIG_DEBUG_SHIRQ is not set
866CONFIG_DETECT_SOFTLOCKUP=y 856CONFIG_DETECT_SOFTLOCKUP=y
867# CONFIG_SCHEDSTATS is not set 857# CONFIG_SCHEDSTATS is not set
858# CONFIG_TIMER_STATS is not set
868# CONFIG_DEBUG_SLAB is not set 859# CONFIG_DEBUG_SLAB is not set
869# CONFIG_DEBUG_RT_MUTEXES is not set 860# CONFIG_DEBUG_RT_MUTEXES is not set
870# CONFIG_RT_MUTEX_TESTER is not set 861# CONFIG_RT_MUTEX_TESTER is not set
871# CONFIG_DEBUG_SPINLOCK is not set 862# CONFIG_DEBUG_SPINLOCK is not set
872CONFIG_DEBUG_MUTEXES=y 863CONFIG_DEBUG_MUTEXES=y
873# CONFIG_DEBUG_RWSEMS is not set
874# CONFIG_DEBUG_SPINLOCK_SLEEP is not set 864# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
875# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set 865# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
876# CONFIG_DEBUG_KOBJECT is not set 866# CONFIG_DEBUG_KOBJECT is not set
@@ -879,7 +869,10 @@ CONFIG_DEBUG_MUTEXES=y
879# CONFIG_DEBUG_VM is not set 869# CONFIG_DEBUG_VM is not set
880# CONFIG_DEBUG_LIST is not set 870# CONFIG_DEBUG_LIST is not set
881CONFIG_FORCED_INLINING=y 871CONFIG_FORCED_INLINING=y
882# CONFIG_RCU_TORTURE_TEST is not set 872# CONFIG_FAULT_INJECTION is not set
873# CONFIG_DEBUG_STACKOVERFLOW is not set
874# CONFIG_DEBUG_STACK_USAGE is not set
875# CONFIG_DEBUG_PAGEALLOC is not set
883# CONFIG_DEBUGGER is not set 876# CONFIG_DEBUGGER is not set
884# CONFIG_KGDB_CONSOLE is not set 877# CONFIG_KGDB_CONSOLE is not set
885# CONFIG_BDI_SWITCH is not set 878# CONFIG_BDI_SWITCH is not set
diff --git a/arch/powerpc/configs/mpc8568mds_defconfig b/arch/powerpc/configs/mpc8568mds_defconfig
index 7b3800674cbf..6451d4dd28a0 100644
--- a/arch/powerpc/configs/mpc8568mds_defconfig
+++ b/arch/powerpc/configs/mpc8568mds_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 3# Linux kernel version: 2.6.22-rc7
4# Sat Feb 17 16:26:53 2007 4# Sun Jul 1 23:56:59 2007
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7CONFIG_PPC32=y 7CONFIG_PPC32=y
@@ -46,6 +46,7 @@ CONFIG_BOOKE=y
46CONFIG_FSL_BOOKE=y 46CONFIG_FSL_BOOKE=y
47# CONFIG_PHYS_64BIT is not set 47# CONFIG_PHYS_64BIT is not set
48CONFIG_SPE=y 48CONFIG_SPE=y
49# CONFIG_PPC_MM_SLICES is not set
49CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 50CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
50 51
51# 52#
@@ -70,8 +71,10 @@ CONFIG_SYSVIPC_SYSCTL=y
70# CONFIG_UTS_NS is not set 71# CONFIG_UTS_NS is not set
71# CONFIG_AUDIT is not set 72# CONFIG_AUDIT is not set
72# CONFIG_IKCONFIG is not set 73# CONFIG_IKCONFIG is not set
74CONFIG_LOG_BUF_SHIFT=14
73CONFIG_SYSFS_DEPRECATED=y 75CONFIG_SYSFS_DEPRECATED=y
74# CONFIG_RELAY is not set 76# CONFIG_RELAY is not set
77CONFIG_BLK_DEV_INITRD=y
75CONFIG_INITRAMFS_SOURCE="" 78CONFIG_INITRAMFS_SOURCE=""
76# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 79# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
77CONFIG_SYSCTL=y 80CONFIG_SYSCTL=y
@@ -84,14 +87,19 @@ CONFIG_BUG=y
84CONFIG_ELF_CORE=y 87CONFIG_ELF_CORE=y
85CONFIG_BASE_FULL=y 88CONFIG_BASE_FULL=y
86CONFIG_FUTEX=y 89CONFIG_FUTEX=y
90CONFIG_ANON_INODES=y
87# CONFIG_EPOLL is not set 91# CONFIG_EPOLL is not set
92CONFIG_SIGNALFD=y
93CONFIG_TIMERFD=y
94CONFIG_EVENTFD=y
88CONFIG_SHMEM=y 95CONFIG_SHMEM=y
89CONFIG_SLAB=y
90CONFIG_VM_EVENT_COUNTERS=y 96CONFIG_VM_EVENT_COUNTERS=y
97CONFIG_SLAB=y
98# CONFIG_SLUB is not set
99# CONFIG_SLOB is not set
91CONFIG_RT_MUTEXES=y 100CONFIG_RT_MUTEXES=y
92# CONFIG_TINY_SHMEM is not set 101# CONFIG_TINY_SHMEM is not set
93CONFIG_BASE_SMALL=0 102CONFIG_BASE_SMALL=0
94# CONFIG_SLOB is not set
95 103
96# 104#
97# Loadable module support 105# Loadable module support
@@ -123,18 +131,32 @@ CONFIG_DEFAULT_AS=y
123# CONFIG_DEFAULT_CFQ is not set 131# CONFIG_DEFAULT_CFQ is not set
124# CONFIG_DEFAULT_NOOP is not set 132# CONFIG_DEFAULT_NOOP is not set
125CONFIG_DEFAULT_IOSCHED="anticipatory" 133CONFIG_DEFAULT_IOSCHED="anticipatory"
126# CONFIG_WANT_EARLY_SERIAL is not set
127 134
128# 135#
129# Platform support 136# Platform support
130# 137#
138# CONFIG_PPC_MPC52xx is not set
139# CONFIG_PPC_MPC5200 is not set
140# CONFIG_PPC_CELL is not set
141# CONFIG_PPC_CELL_NATIVE is not set
142# CONFIG_PQ2ADS is not set
131# CONFIG_MPC8540_ADS is not set 143# CONFIG_MPC8540_ADS is not set
132# CONFIG_MPC8560_ADS is not set 144# CONFIG_MPC8560_ADS is not set
133# CONFIG_MPC85xx_CDS is not set 145# CONFIG_MPC85xx_CDS is not set
134CONFIG_MPC85xx_MDS=y 146CONFIG_MPC85xx_MDS=y
147# CONFIG_MPC8544_DS is not set
135CONFIG_MPC85xx=y 148CONFIG_MPC85xx=y
136CONFIG_PPC_INDIRECT_PCI_BE=y
137CONFIG_MPIC=y 149CONFIG_MPIC=y
150# CONFIG_MPIC_WEIRD is not set
151# CONFIG_PPC_I8259 is not set
152# CONFIG_PPC_RTAS is not set
153# CONFIG_MMIO_NVRAM is not set
154# CONFIG_PPC_MPC106 is not set
155# CONFIG_PPC_970_NAP is not set
156# CONFIG_PPC_INDIRECT_IO is not set
157# CONFIG_GENERIC_IOMAP is not set
158# CONFIG_CPU_FREQ is not set
159# CONFIG_CPM2 is not set
138 160
139# 161#
140# Kernel options 162# Kernel options
@@ -168,18 +190,20 @@ CONFIG_PROC_DEVICETREE=y
168# CONFIG_CMDLINE_BOOL is not set 190# CONFIG_CMDLINE_BOOL is not set
169# CONFIG_PM is not set 191# CONFIG_PM is not set
170CONFIG_SECCOMP=y 192CONFIG_SECCOMP=y
193CONFIG_WANT_DEVICE_TREE=y
194CONFIG_DEVICE_TREE=""
171CONFIG_ISA_DMA_API=y 195CONFIG_ISA_DMA_API=y
172 196
173# 197#
174# Bus options 198# Bus options
175# 199#
176CONFIG_ZONE_DMA=y 200CONFIG_ZONE_DMA=y
177# CONFIG_MPIC_WEIRD is not set
178# CONFIG_PPC_I8259 is not set
179CONFIG_PPC_INDIRECT_PCI=y 201CONFIG_PPC_INDIRECT_PCI=y
202CONFIG_PPC_INDIRECT_PCI_BE=y
180CONFIG_FSL_SOC=y 203CONFIG_FSL_SOC=y
181# CONFIG_PCI is not set 204# CONFIG_PCI is not set
182# CONFIG_PCI_DOMAINS is not set 205# CONFIG_PCI_DOMAINS is not set
206# CONFIG_ARCH_SUPPORTS_MSI is not set
183 207
184# 208#
185# PCCARD (PCMCIA/CardBus) support 209# PCCARD (PCMCIA/CardBus) support
@@ -187,10 +211,6 @@ CONFIG_FSL_SOC=y
187# CONFIG_PCCARD is not set 211# CONFIG_PCCARD is not set
188 212
189# 213#
190# PCI Hotplug Support
191#
192
193#
194# Advanced setup 214# Advanced setup
195# 215#
196# CONFIG_ADVANCED_OPTIONS is not set 216# CONFIG_ADVANCED_OPTIONS is not set
@@ -212,7 +232,6 @@ CONFIG_NET=y
212# 232#
213# Networking options 233# Networking options
214# 234#
215# CONFIG_NETDEBUG is not set
216CONFIG_PACKET=y 235CONFIG_PACKET=y
217# CONFIG_PACKET_MMAP is not set 236# CONFIG_PACKET_MMAP is not set
218CONFIG_UNIX=y 237CONFIG_UNIX=y
@@ -253,20 +272,8 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
253# CONFIG_INET6_TUNNEL is not set 272# CONFIG_INET6_TUNNEL is not set
254# CONFIG_NETWORK_SECMARK is not set 273# CONFIG_NETWORK_SECMARK is not set
255# CONFIG_NETFILTER is not set 274# CONFIG_NETFILTER is not set
256
257#
258# DCCP Configuration (EXPERIMENTAL)
259#
260# CONFIG_IP_DCCP is not set 275# CONFIG_IP_DCCP is not set
261
262#
263# SCTP Configuration (EXPERIMENTAL)
264#
265# CONFIG_IP_SCTP is not set 276# CONFIG_IP_SCTP is not set
266
267#
268# TIPC Configuration (EXPERIMENTAL)
269#
270# CONFIG_TIPC is not set 277# CONFIG_TIPC is not set
271# CONFIG_ATM is not set 278# CONFIG_ATM is not set
272# CONFIG_BRIDGE is not set 279# CONFIG_BRIDGE is not set
@@ -292,7 +299,16 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
292# CONFIG_HAMRADIO is not set 299# CONFIG_HAMRADIO is not set
293# CONFIG_IRDA is not set 300# CONFIG_IRDA is not set
294# CONFIG_BT is not set 301# CONFIG_BT is not set
302# CONFIG_AF_RXRPC is not set
303
304#
305# Wireless
306#
307# CONFIG_CFG80211 is not set
308# CONFIG_WIRELESS_EXT is not set
309# CONFIG_MAC80211 is not set
295# CONFIG_IEEE80211 is not set 310# CONFIG_IEEE80211 is not set
311# CONFIG_RFKILL is not set
296 312
297# 313#
298# Device Drivers 314# Device Drivers
@@ -312,10 +328,6 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y
312# Connector - unified userspace <-> kernelspace linker 328# Connector - unified userspace <-> kernelspace linker
313# 329#
314# CONFIG_CONNECTOR is not set 330# CONFIG_CONNECTOR is not set
315
316#
317# Memory Technology Devices (MTD)
318#
319# CONFIG_MTD is not set 331# CONFIG_MTD is not set
320 332
321# 333#
@@ -326,6 +338,7 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y
326# 338#
327# Plug and Play support 339# Plug and Play support
328# 340#
341# CONFIG_PNPACPI is not set
329 342
330# 343#
331# Block devices 344# Block devices
@@ -339,17 +352,13 @@ CONFIG_BLK_DEV_RAM=y
339CONFIG_BLK_DEV_RAM_COUNT=16 352CONFIG_BLK_DEV_RAM_COUNT=16
340CONFIG_BLK_DEV_RAM_SIZE=32768 353CONFIG_BLK_DEV_RAM_SIZE=32768
341CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 354CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
342CONFIG_BLK_DEV_INITRD=y
343# CONFIG_CDROM_PKTCDVD is not set 355# CONFIG_CDROM_PKTCDVD is not set
344# CONFIG_ATA_OVER_ETH is not set 356# CONFIG_ATA_OVER_ETH is not set
345 357
346# 358#
347# Misc devices 359# Misc devices
348# 360#
349 361# CONFIG_BLINK is not set
350#
351# ATA/ATAPI/MFM/RLL support
352#
353# CONFIG_IDE is not set 362# CONFIG_IDE is not set
354 363
355# 364#
@@ -378,6 +387,7 @@ CONFIG_SCSI_PROC_FS=y
378# CONFIG_SCSI_CONSTANTS is not set 387# CONFIG_SCSI_CONSTANTS is not set
379# CONFIG_SCSI_LOGGING is not set 388# CONFIG_SCSI_LOGGING is not set
380# CONFIG_SCSI_SCAN_ASYNC is not set 389# CONFIG_SCSI_SCAN_ASYNC is not set
390CONFIG_SCSI_WAIT_SCAN=m
381 391
382# 392#
383# SCSI Transports 393# SCSI Transports
@@ -393,35 +403,13 @@ CONFIG_SCSI_PROC_FS=y
393# 403#
394# CONFIG_ISCSI_TCP is not set 404# CONFIG_ISCSI_TCP is not set
395# CONFIG_SCSI_DEBUG is not set 405# CONFIG_SCSI_DEBUG is not set
396
397#
398# Serial ATA (prod) and Parallel ATA (experimental) drivers
399#
400# CONFIG_ATA is not set 406# CONFIG_ATA is not set
401 407
402# 408#
403# Multi-device support (RAID and LVM) 409# Multi-device support (RAID and LVM)
404# 410#
405# CONFIG_MD is not set 411# CONFIG_MD is not set
406 412# CONFIG_MACINTOSH_DRIVERS is not set
407#
408# Fusion MPT device support
409#
410# CONFIG_FUSION is not set
411
412#
413# IEEE 1394 (FireWire) support
414#
415
416#
417# I2O device support
418#
419
420#
421# Macintosh device drivers
422#
423# CONFIG_MAC_EMUMOUSEBTN is not set
424# CONFIG_WINDFARM is not set
425 413
426# 414#
427# Network device support 415# Network device support
@@ -431,10 +419,6 @@ CONFIG_NETDEVICES=y
431# CONFIG_BONDING is not set 419# CONFIG_BONDING is not set
432# CONFIG_EQUALIZER is not set 420# CONFIG_EQUALIZER is not set
433# CONFIG_TUN is not set 421# CONFIG_TUN is not set
434
435#
436# PHY device support
437#
438CONFIG_PHYLIB=y 422CONFIG_PHYLIB=y
439 423
440# 424#
@@ -455,29 +439,16 @@ CONFIG_MARVELL_PHY=y
455# 439#
456CONFIG_NET_ETHERNET=y 440CONFIG_NET_ETHERNET=y
457CONFIG_MII=y 441CONFIG_MII=y
458 442CONFIG_NETDEV_1000=y
459#
460# Ethernet (1000 Mbit)
461#
462CONFIG_GIANFAR=y 443CONFIG_GIANFAR=y
463CONFIG_GFAR_NAPI=y 444CONFIG_GFAR_NAPI=y
445CONFIG_NETDEV_10000=y
464 446
465# 447#
466# Ethernet (10000 Mbit) 448# Wireless LAN
467#
468
469#
470# Token Ring devices
471#
472
473#
474# Wireless LAN (non-hamradio)
475#
476# CONFIG_NET_RADIO is not set
477
478#
479# Wan interfaces
480# 449#
450# CONFIG_WLAN_PRE80211 is not set
451# CONFIG_WLAN_80211 is not set
481# CONFIG_WAN is not set 452# CONFIG_WAN is not set
482# CONFIG_PPP is not set 453# CONFIG_PPP is not set
483# CONFIG_SLIP is not set 454# CONFIG_SLIP is not set
@@ -501,6 +472,7 @@ CONFIG_GFAR_NAPI=y
501# 472#
502CONFIG_INPUT=y 473CONFIG_INPUT=y
503# CONFIG_INPUT_FF_MEMLESS is not set 474# CONFIG_INPUT_FF_MEMLESS is not set
475# CONFIG_INPUT_POLLDEV is not set
504 476
505# 477#
506# Userland interfaces 478# Userland interfaces
@@ -517,6 +489,7 @@ CONFIG_INPUT=y
517# CONFIG_INPUT_KEYBOARD is not set 489# CONFIG_INPUT_KEYBOARD is not set
518# CONFIG_INPUT_MOUSE is not set 490# CONFIG_INPUT_MOUSE is not set
519# CONFIG_INPUT_JOYSTICK is not set 491# CONFIG_INPUT_JOYSTICK is not set
492# CONFIG_INPUT_TABLET is not set
520# CONFIG_INPUT_TOUCHSCREEN is not set 493# CONFIG_INPUT_TOUCHSCREEN is not set
521# CONFIG_INPUT_MISC is not set 494# CONFIG_INPUT_MISC is not set
522 495
@@ -540,6 +513,7 @@ CONFIG_SERIAL_8250_CONSOLE=y
540CONFIG_SERIAL_8250_NR_UARTS=4 513CONFIG_SERIAL_8250_NR_UARTS=4
541CONFIG_SERIAL_8250_RUNTIME_UARTS=4 514CONFIG_SERIAL_8250_RUNTIME_UARTS=4
542# CONFIG_SERIAL_8250_EXTENDED is not set 515# CONFIG_SERIAL_8250_EXTENDED is not set
516CONFIG_SERIAL_8250_SHARE_IRQ=y
543 517
544# 518#
545# Non-8250 serial port support 519# Non-8250 serial port support
@@ -556,10 +530,6 @@ CONFIG_LEGACY_PTY_COUNT=256
556# IPMI 530# IPMI
557# 531#
558# CONFIG_IPMI_HANDLER is not set 532# CONFIG_IPMI_HANDLER is not set
559
560#
561# Watchdog Cards
562#
563CONFIG_WATCHDOG=y 533CONFIG_WATCHDOG=y
564# CONFIG_WATCHDOG_NOWAYOUT is not set 534# CONFIG_WATCHDOG_NOWAYOUT is not set
565 535
@@ -572,7 +542,6 @@ CONFIG_HW_RANDOM=y
572# CONFIG_NVRAM is not set 542# CONFIG_NVRAM is not set
573CONFIG_GEN_RTC=y 543CONFIG_GEN_RTC=y
574# CONFIG_GEN_RTC_X is not set 544# CONFIG_GEN_RTC_X is not set
575# CONFIG_DTLK is not set
576# CONFIG_R3964 is not set 545# CONFIG_R3964 is not set
577# CONFIG_RAW_DRIVER is not set 546# CONFIG_RAW_DRIVER is not set
578 547
@@ -580,11 +549,8 @@ CONFIG_GEN_RTC=y
580# TPM devices 549# TPM devices
581# 550#
582# CONFIG_TCG_TPM is not set 551# CONFIG_TCG_TPM is not set
583
584#
585# I2C support
586#
587CONFIG_I2C=y 552CONFIG_I2C=y
553CONFIG_I2C_BOARDINFO=y
588CONFIG_I2C_CHARDEV=y 554CONFIG_I2C_CHARDEV=y
589 555
590# 556#
@@ -600,8 +566,8 @@ CONFIG_I2C_CHARDEV=y
600CONFIG_I2C_MPC=y 566CONFIG_I2C_MPC=y
601# CONFIG_I2C_OCORES is not set 567# CONFIG_I2C_OCORES is not set
602# CONFIG_I2C_PARPORT_LIGHT is not set 568# CONFIG_I2C_PARPORT_LIGHT is not set
569# CONFIG_I2C_SIMTEC is not set
603# CONFIG_I2C_STUB is not set 570# CONFIG_I2C_STUB is not set
604# CONFIG_I2C_PCA_ISA is not set
605 571
606# 572#
607# Miscellaneous I2C Chip support 573# Miscellaneous I2C Chip support
@@ -629,16 +595,14 @@ CONFIG_I2C_MPC=y
629# Dallas's 1-wire bus 595# Dallas's 1-wire bus
630# 596#
631# CONFIG_W1 is not set 597# CONFIG_W1 is not set
632
633#
634# Hardware Monitoring support
635#
636CONFIG_HWMON=y 598CONFIG_HWMON=y
637# CONFIG_HWMON_VID is not set 599# CONFIG_HWMON_VID is not set
638# CONFIG_SENSORS_ABITUGURU is not set 600# CONFIG_SENSORS_ABITUGURU is not set
601# CONFIG_SENSORS_AD7418 is not set
639# CONFIG_SENSORS_ADM1021 is not set 602# CONFIG_SENSORS_ADM1021 is not set
640# CONFIG_SENSORS_ADM1025 is not set 603# CONFIG_SENSORS_ADM1025 is not set
641# CONFIG_SENSORS_ADM1026 is not set 604# CONFIG_SENSORS_ADM1026 is not set
605# CONFIG_SENSORS_ADM1029 is not set
642# CONFIG_SENSORS_ADM1031 is not set 606# CONFIG_SENSORS_ADM1031 is not set
643# CONFIG_SENSORS_ADM9240 is not set 607# CONFIG_SENSORS_ADM9240 is not set
644# CONFIG_SENSORS_ASB100 is not set 608# CONFIG_SENSORS_ASB100 is not set
@@ -661,6 +625,7 @@ CONFIG_HWMON=y
661# CONFIG_SENSORS_LM90 is not set 625# CONFIG_SENSORS_LM90 is not set
662# CONFIG_SENSORS_LM92 is not set 626# CONFIG_SENSORS_LM92 is not set
663# CONFIG_SENSORS_MAX1619 is not set 627# CONFIG_SENSORS_MAX1619 is not set
628# CONFIG_SENSORS_MAX6650 is not set
664# CONFIG_SENSORS_PC87360 is not set 629# CONFIG_SENSORS_PC87360 is not set
665# CONFIG_SENSORS_PC87427 is not set 630# CONFIG_SENSORS_PC87427 is not set
666# CONFIG_SENSORS_SMSC47M1 is not set 631# CONFIG_SENSORS_SMSC47M1 is not set
@@ -677,22 +642,29 @@ CONFIG_HWMON=y
677# CONFIG_HWMON_DEBUG_CHIP is not set 642# CONFIG_HWMON_DEBUG_CHIP is not set
678 643
679# 644#
645# Multifunction device drivers
646#
647# CONFIG_MFD_SM501 is not set
648
649#
680# Multimedia devices 650# Multimedia devices
681# 651#
682# CONFIG_VIDEO_DEV is not set 652# CONFIG_VIDEO_DEV is not set
653# CONFIG_DVB_CORE is not set
654CONFIG_DAB=y
683 655
684# 656#
685# Digital Video Broadcasting Devices 657# Graphics support
686# 658#
687# CONFIG_DVB is not set 659# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
688 660
689# 661#
690# Graphics support 662# Display device support
691# 663#
692CONFIG_FIRMWARE_EDID=y 664# CONFIG_DISPLAY_SUPPORT is not set
665# CONFIG_VGASTATE is not set
693# CONFIG_FB is not set 666# CONFIG_FB is not set
694# CONFIG_FB_IBM_GXT4500 is not set 667# CONFIG_FB_IBM_GXT4500 is not set
695# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
696 668
697# 669#
698# Sound 670# Sound
@@ -720,10 +692,6 @@ CONFIG_HID=y
720# USB Gadget Support 692# USB Gadget Support
721# 693#
722# CONFIG_USB_GADGET is not set 694# CONFIG_USB_GADGET is not set
723
724#
725# MMC/SD Card support
726#
727# CONFIG_MMC is not set 695# CONFIG_MMC is not set
728 696
729# 697#
@@ -766,14 +734,6 @@ CONFIG_HID=y
766# 734#
767 735
768# 736#
769# Auxiliary Display support
770#
771
772#
773# Virtualization
774#
775
776#
777# File systems 737# File systems
778# 738#
779CONFIG_EXT2_FS=y 739CONFIG_EXT2_FS=y
@@ -861,6 +821,7 @@ CONFIG_LOCKD_V4=y
861CONFIG_NFS_COMMON=y 821CONFIG_NFS_COMMON=y
862CONFIG_SUNRPC=y 822CONFIG_SUNRPC=y
863CONFIG_SUNRPC_GSS=y 823CONFIG_SUNRPC_GSS=y
824# CONFIG_SUNRPC_BIND34 is not set
864CONFIG_RPCSEC_GSS_KRB5=y 825CONFIG_RPCSEC_GSS_KRB5=y
865# CONFIG_RPCSEC_GSS_SPKM3 is not set 826# CONFIG_RPCSEC_GSS_SPKM3 is not set
866# CONFIG_SMB_FS is not set 827# CONFIG_SMB_FS is not set
@@ -886,6 +847,7 @@ CONFIG_PARTITION_ADVANCED=y
886# CONFIG_SUN_PARTITION is not set 847# CONFIG_SUN_PARTITION is not set
887# CONFIG_KARMA_PARTITION is not set 848# CONFIG_KARMA_PARTITION is not set
888# CONFIG_EFI_PARTITION is not set 849# CONFIG_EFI_PARTITION is not set
850# CONFIG_SYSV68_PARTITION is not set
889 851
890# 852#
891# Native Language Support 853# Native Language Support
@@ -896,6 +858,7 @@ CONFIG_PARTITION_ADVANCED=y
896# Distributed Lock Manager 858# Distributed Lock Manager
897# 859#
898# CONFIG_DLM is not set 860# CONFIG_DLM is not set
861# CONFIG_UCC_SLOW is not set
899 862
900# 863#
901# Library routines 864# Library routines
@@ -903,11 +866,13 @@ CONFIG_PARTITION_ADVANCED=y
903CONFIG_BITREVERSE=y 866CONFIG_BITREVERSE=y
904# CONFIG_CRC_CCITT is not set 867# CONFIG_CRC_CCITT is not set
905# CONFIG_CRC16 is not set 868# CONFIG_CRC16 is not set
869# CONFIG_CRC_ITU_T is not set
906CONFIG_CRC32=y 870CONFIG_CRC32=y
907# CONFIG_LIBCRC32C is not set 871# CONFIG_LIBCRC32C is not set
908CONFIG_PLIST=y 872CONFIG_PLIST=y
909CONFIG_HAS_IOMEM=y 873CONFIG_HAS_IOMEM=y
910CONFIG_HAS_IOPORT=y 874CONFIG_HAS_IOPORT=y
875CONFIG_HAS_DMA=y
911 876
912# 877#
913# Instrumentation Support 878# Instrumentation Support
@@ -926,9 +891,9 @@ CONFIG_ENABLE_MUST_CHECK=y
926# CONFIG_HEADERS_CHECK is not set 891# CONFIG_HEADERS_CHECK is not set
927CONFIG_DEBUG_KERNEL=y 892CONFIG_DEBUG_KERNEL=y
928# CONFIG_DEBUG_SHIRQ is not set 893# CONFIG_DEBUG_SHIRQ is not set
929CONFIG_LOG_BUF_SHIFT=14
930CONFIG_DETECT_SOFTLOCKUP=y 894CONFIG_DETECT_SOFTLOCKUP=y
931# CONFIG_SCHEDSTATS is not set 895# CONFIG_SCHEDSTATS is not set
896# CONFIG_TIMER_STATS is not set
932# CONFIG_DEBUG_SLAB is not set 897# CONFIG_DEBUG_SLAB is not set
933# CONFIG_DEBUG_RT_MUTEXES is not set 898# CONFIG_DEBUG_RT_MUTEXES is not set
934# CONFIG_RT_MUTEX_TESTER is not set 899# CONFIG_RT_MUTEX_TESTER is not set
@@ -943,8 +908,10 @@ CONFIG_DETECT_SOFTLOCKUP=y
943# CONFIG_DEBUG_LIST is not set 908# CONFIG_DEBUG_LIST is not set
944CONFIG_FORCED_INLINING=y 909CONFIG_FORCED_INLINING=y
945# CONFIG_RCU_TORTURE_TEST is not set 910# CONFIG_RCU_TORTURE_TEST is not set
911# CONFIG_FAULT_INJECTION is not set
946# CONFIG_DEBUG_STACKOVERFLOW is not set 912# CONFIG_DEBUG_STACKOVERFLOW is not set
947# CONFIG_DEBUG_STACK_USAGE is not set 913# CONFIG_DEBUG_STACK_USAGE is not set
914# CONFIG_DEBUG_PAGEALLOC is not set
948CONFIG_DEBUGGER=y 915CONFIG_DEBUGGER=y
949# CONFIG_XMON is not set 916# CONFIG_XMON is not set
950# CONFIG_BDI_SWITCH is not set 917# CONFIG_BDI_SWITCH is not set
@@ -958,6 +925,7 @@ CONFIG_PPC_EARLY_DEBUG=y
958# CONFIG_PPC_EARLY_DEBUG_ISERIES is not set 925# CONFIG_PPC_EARLY_DEBUG_ISERIES is not set
959# CONFIG_PPC_EARLY_DEBUG_PAS_REALMODE is not set 926# CONFIG_PPC_EARLY_DEBUG_PAS_REALMODE is not set
960# CONFIG_PPC_EARLY_DEBUG_BEAT is not set 927# CONFIG_PPC_EARLY_DEBUG_BEAT is not set
928# CONFIG_PPC_EARLY_DEBUG_44x is not set
961 929
962# 930#
963# Security options 931# Security options
@@ -987,6 +955,7 @@ CONFIG_CRYPTO_ECB=m
987CONFIG_CRYPTO_CBC=y 955CONFIG_CRYPTO_CBC=y
988CONFIG_CRYPTO_PCBC=m 956CONFIG_CRYPTO_PCBC=m
989# CONFIG_CRYPTO_LRW is not set 957# CONFIG_CRYPTO_LRW is not set
958# CONFIG_CRYPTO_CRYPTD is not set
990CONFIG_CRYPTO_DES=y 959CONFIG_CRYPTO_DES=y
991# CONFIG_CRYPTO_FCRYPT is not set 960# CONFIG_CRYPTO_FCRYPT is not set
992# CONFIG_CRYPTO_BLOWFISH is not set 961# CONFIG_CRYPTO_BLOWFISH is not set
diff --git a/arch/powerpc/configs/mpc85xx_cds_defconfig b/arch/powerpc/configs/mpc85xx_cds_defconfig
index 1f61bce33e32..d9afe7009d99 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.20-rc5 3# Linux kernel version: 2.6.22-rc7
4# Mon Jan 22 22:26:46 2007 4# Sun Jul 1 23:56:59 2007
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7CONFIG_PPC32=y 7CONFIG_PPC32=y
@@ -34,9 +34,9 @@ CONFIG_DEFAULT_UIMAGE=y
34# CONFIG_PPC_83xx is not set 34# CONFIG_PPC_83xx is not set
35CONFIG_PPC_85xx=y 35CONFIG_PPC_85xx=y
36# CONFIG_PPC_86xx is not set 36# CONFIG_PPC_86xx is not set
37# CONFIG_PPC_8xx is not set
37# CONFIG_40x is not set 38# CONFIG_40x is not set
38# CONFIG_44x is not set 39# CONFIG_44x is not set
39# CONFIG_8xx is not set
40# CONFIG_E200 is not set 40# CONFIG_E200 is not set
41CONFIG_85xx=y 41CONFIG_85xx=y
42CONFIG_E500=y 42CONFIG_E500=y
@@ -46,6 +46,7 @@ CONFIG_BOOKE=y
46CONFIG_FSL_BOOKE=y 46CONFIG_FSL_BOOKE=y
47# CONFIG_PHYS_64BIT is not set 47# CONFIG_PHYS_64BIT is not set
48CONFIG_SPE=y 48CONFIG_SPE=y
49# CONFIG_PPC_MM_SLICES is not set
49CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 50CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
50 51
51# 52#
@@ -63,14 +64,17 @@ CONFIG_LOCALVERSION_AUTO=y
63CONFIG_SWAP=y 64CONFIG_SWAP=y
64CONFIG_SYSVIPC=y 65CONFIG_SYSVIPC=y
65# CONFIG_IPC_NS is not set 66# CONFIG_IPC_NS is not set
67CONFIG_SYSVIPC_SYSCTL=y
66# CONFIG_POSIX_MQUEUE is not set 68# CONFIG_POSIX_MQUEUE is not set
67# CONFIG_BSD_PROCESS_ACCT is not set 69# CONFIG_BSD_PROCESS_ACCT is not set
68# CONFIG_TASKSTATS is not set 70# CONFIG_TASKSTATS is not set
69# CONFIG_UTS_NS is not set 71# CONFIG_UTS_NS is not set
70# CONFIG_AUDIT is not set 72# CONFIG_AUDIT is not set
71# CONFIG_IKCONFIG is not set 73# CONFIG_IKCONFIG is not set
74CONFIG_LOG_BUF_SHIFT=14
72CONFIG_SYSFS_DEPRECATED=y 75CONFIG_SYSFS_DEPRECATED=y
73# CONFIG_RELAY is not set 76# CONFIG_RELAY is not set
77CONFIG_BLK_DEV_INITRD=y
74CONFIG_INITRAMFS_SOURCE="" 78CONFIG_INITRAMFS_SOURCE=""
75# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 79# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
76CONFIG_SYSCTL=y 80CONFIG_SYSCTL=y
@@ -85,14 +89,19 @@ CONFIG_BUG=y
85CONFIG_ELF_CORE=y 89CONFIG_ELF_CORE=y
86CONFIG_BASE_FULL=y 90CONFIG_BASE_FULL=y
87CONFIG_FUTEX=y 91CONFIG_FUTEX=y
92CONFIG_ANON_INODES=y
88CONFIG_EPOLL=y 93CONFIG_EPOLL=y
94CONFIG_SIGNALFD=y
95CONFIG_TIMERFD=y
96CONFIG_EVENTFD=y
89CONFIG_SHMEM=y 97CONFIG_SHMEM=y
90CONFIG_SLAB=y
91CONFIG_VM_EVENT_COUNTERS=y 98CONFIG_VM_EVENT_COUNTERS=y
99CONFIG_SLAB=y
100# CONFIG_SLUB is not set
101# CONFIG_SLOB is not set
92CONFIG_RT_MUTEXES=y 102CONFIG_RT_MUTEXES=y
93# CONFIG_TINY_SHMEM is not set 103# CONFIG_TINY_SHMEM is not set
94CONFIG_BASE_SMALL=0 104CONFIG_BASE_SMALL=0
95# CONFIG_SLOB is not set
96 105
97# 106#
98# Loadable module support 107# Loadable module support
@@ -119,17 +128,33 @@ CONFIG_DEFAULT_AS=y
119# CONFIG_DEFAULT_CFQ is not set 128# CONFIG_DEFAULT_CFQ is not set
120# CONFIG_DEFAULT_NOOP is not set 129# CONFIG_DEFAULT_NOOP is not set
121CONFIG_DEFAULT_IOSCHED="anticipatory" 130CONFIG_DEFAULT_IOSCHED="anticipatory"
122# CONFIG_WANT_EARLY_SERIAL is not set
123 131
124# 132#
125# Platform support 133# Platform support
126# 134#
135# CONFIG_PPC_MPC52xx is not set
136# CONFIG_PPC_MPC5200 is not set
137# CONFIG_PPC_CELL is not set
138# CONFIG_PPC_CELL_NATIVE is not set
139# CONFIG_PQ2ADS is not set
127# CONFIG_MPC8540_ADS is not set 140# CONFIG_MPC8540_ADS is not set
128# CONFIG_MPC8560_ADS is not set 141# CONFIG_MPC8560_ADS is not set
129CONFIG_MPC85xx_CDS=y 142CONFIG_MPC85xx_CDS=y
143# CONFIG_MPC85xx_MDS is not set
144# CONFIG_MPC8544_DS is not set
130CONFIG_MPC8540=y 145CONFIG_MPC8540=y
131CONFIG_PPC_INDIRECT_PCI_BE=y 146CONFIG_MPC85xx=y
132CONFIG_MPIC=y 147CONFIG_MPIC=y
148# CONFIG_MPIC_WEIRD is not set
149# CONFIG_PPC_I8259 is not set
150# CONFIG_PPC_RTAS is not set
151# CONFIG_MMIO_NVRAM is not set
152# CONFIG_PPC_MPC106 is not set
153# CONFIG_PPC_970_NAP is not set
154# CONFIG_PPC_INDIRECT_IO is not set
155# CONFIG_GENERIC_IOMAP is not set
156# CONFIG_CPU_FREQ is not set
157# CONFIG_CPM2 is not set
133 158
134# 159#
135# Kernel options 160# Kernel options
@@ -158,32 +183,33 @@ CONFIG_FLAT_NODE_MEM_MAP=y
158# CONFIG_SPARSEMEM_STATIC is not set 183# CONFIG_SPARSEMEM_STATIC is not set
159CONFIG_SPLIT_PTLOCK_CPUS=4 184CONFIG_SPLIT_PTLOCK_CPUS=4
160# CONFIG_RESOURCES_64BIT is not set 185# CONFIG_RESOURCES_64BIT is not set
186CONFIG_ZONE_DMA_FLAG=1
161CONFIG_PROC_DEVICETREE=y 187CONFIG_PROC_DEVICETREE=y
162# CONFIG_CMDLINE_BOOL is not set 188# CONFIG_CMDLINE_BOOL is not set
163# CONFIG_PM is not set 189# CONFIG_PM is not set
164# CONFIG_SECCOMP is not set 190# CONFIG_SECCOMP is not set
191CONFIG_WANT_DEVICE_TREE=y
192CONFIG_DEVICE_TREE=""
165CONFIG_ISA_DMA_API=y 193CONFIG_ISA_DMA_API=y
166 194
167# 195#
168# Bus options 196# Bus options
169# 197#
170# CONFIG_MPIC_WEIRD is not set 198CONFIG_ZONE_DMA=y
171# CONFIG_PPC_I8259 is not set
172CONFIG_PPC_INDIRECT_PCI=y 199CONFIG_PPC_INDIRECT_PCI=y
200CONFIG_PPC_INDIRECT_PCI_BE=y
173CONFIG_FSL_SOC=y 201CONFIG_FSL_SOC=y
174CONFIG_PCI=y 202CONFIG_PCI=y
175CONFIG_PCI_DOMAINS=y 203CONFIG_PCI_DOMAINS=y
176# CONFIG_PCIEPORTBUS is not set 204# CONFIG_PCIEPORTBUS is not set
205CONFIG_ARCH_SUPPORTS_MSI=y
206# CONFIG_PCI_MSI is not set
177# CONFIG_PCI_DEBUG is not set 207# CONFIG_PCI_DEBUG is not set
178 208
179# 209#
180# PCCARD (PCMCIA/CardBus) support 210# PCCARD (PCMCIA/CardBus) support
181# 211#
182# CONFIG_PCCARD is not set 212# CONFIG_PCCARD is not set
183
184#
185# PCI Hotplug Support
186#
187# CONFIG_HOTPLUG_PCI is not set 213# CONFIG_HOTPLUG_PCI is not set
188 214
189# 215#
@@ -208,13 +234,13 @@ CONFIG_NET=y
208# 234#
209# Networking options 235# Networking options
210# 236#
211# CONFIG_NETDEBUG is not set
212CONFIG_PACKET=y 237CONFIG_PACKET=y
213# CONFIG_PACKET_MMAP is not set 238# CONFIG_PACKET_MMAP is not set
214CONFIG_UNIX=y 239CONFIG_UNIX=y
215CONFIG_XFRM=y 240CONFIG_XFRM=y
216CONFIG_XFRM_USER=y 241CONFIG_XFRM_USER=y
217# CONFIG_XFRM_SUB_POLICY is not set 242# CONFIG_XFRM_SUB_POLICY is not set
243# CONFIG_XFRM_MIGRATE is not set
218# CONFIG_NET_KEY is not set 244# CONFIG_NET_KEY is not set
219CONFIG_INET=y 245CONFIG_INET=y
220CONFIG_IP_MULTICAST=y 246CONFIG_IP_MULTICAST=y
@@ -248,20 +274,8 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
248# CONFIG_INET6_TUNNEL is not set 274# CONFIG_INET6_TUNNEL is not set
249# CONFIG_NETWORK_SECMARK is not set 275# CONFIG_NETWORK_SECMARK is not set
250# CONFIG_NETFILTER is not set 276# CONFIG_NETFILTER is not set
251
252#
253# DCCP Configuration (EXPERIMENTAL)
254#
255# CONFIG_IP_DCCP is not set 277# CONFIG_IP_DCCP is not set
256
257#
258# SCTP Configuration (EXPERIMENTAL)
259#
260# CONFIG_IP_SCTP is not set 278# CONFIG_IP_SCTP is not set
261
262#
263# TIPC Configuration (EXPERIMENTAL)
264#
265# CONFIG_TIPC is not set 279# CONFIG_TIPC is not set
266# CONFIG_ATM is not set 280# CONFIG_ATM is not set
267# CONFIG_BRIDGE is not set 281# CONFIG_BRIDGE is not set
@@ -287,7 +301,16 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
287# CONFIG_HAMRADIO is not set 301# CONFIG_HAMRADIO is not set
288# CONFIG_IRDA is not set 302# CONFIG_IRDA is not set
289# CONFIG_BT is not set 303# CONFIG_BT is not set
304# CONFIG_AF_RXRPC is not set
305
306#
307# Wireless
308#
309# CONFIG_CFG80211 is not set
310# CONFIG_WIRELESS_EXT is not set
311# CONFIG_MAC80211 is not set
290# CONFIG_IEEE80211 is not set 312# CONFIG_IEEE80211 is not set
313# CONFIG_RFKILL is not set
291 314
292# 315#
293# Device Drivers 316# Device Drivers
@@ -300,16 +323,13 @@ CONFIG_STANDALONE=y
300CONFIG_PREVENT_FIRMWARE_BUILD=y 323CONFIG_PREVENT_FIRMWARE_BUILD=y
301# CONFIG_FW_LOADER is not set 324# CONFIG_FW_LOADER is not set
302# CONFIG_DEBUG_DRIVER is not set 325# CONFIG_DEBUG_DRIVER is not set
326# CONFIG_DEBUG_DEVRES is not set
303# CONFIG_SYS_HYPERVISOR is not set 327# CONFIG_SYS_HYPERVISOR is not set
304 328
305# 329#
306# Connector - unified userspace <-> kernelspace linker 330# Connector - unified userspace <-> kernelspace linker
307# 331#
308# CONFIG_CONNECTOR is not set 332# CONFIG_CONNECTOR is not set
309
310#
311# Memory Technology Devices (MTD)
312#
313# CONFIG_MTD is not set 333# CONFIG_MTD is not set
314 334
315# 335#
@@ -320,6 +340,7 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y
320# 340#
321# Plug and Play support 341# Plug and Play support
322# 342#
343# CONFIG_PNPACPI is not set
323 344
324# 345#
325# Block devices 346# Block devices
@@ -338,19 +359,16 @@ CONFIG_BLK_DEV_RAM=y
338CONFIG_BLK_DEV_RAM_COUNT=16 359CONFIG_BLK_DEV_RAM_COUNT=16
339CONFIG_BLK_DEV_RAM_SIZE=32768 360CONFIG_BLK_DEV_RAM_SIZE=32768
340CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 361CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
341CONFIG_BLK_DEV_INITRD=y
342# CONFIG_CDROM_PKTCDVD is not set 362# CONFIG_CDROM_PKTCDVD is not set
343# CONFIG_ATA_OVER_ETH is not set 363# CONFIG_ATA_OVER_ETH is not set
344 364
345# 365#
346# Misc devices 366# Misc devices
347# 367#
368# CONFIG_PHANTOM is not set
348# CONFIG_SGI_IOC4 is not set 369# CONFIG_SGI_IOC4 is not set
349# CONFIG_TIFM_CORE is not set 370# CONFIG_TIFM_CORE is not set
350 371# CONFIG_BLINK is not set
351#
352# ATA/ATAPI/MFM/RLL support
353#
354CONFIG_IDE=y 372CONFIG_IDE=y
355CONFIG_IDE_MAX_HWIFS=4 373CONFIG_IDE_MAX_HWIFS=4
356CONFIG_BLK_DEV_IDE=y 374CONFIG_BLK_DEV_IDE=y
@@ -365,6 +383,7 @@ CONFIG_BLK_DEV_IDE=y
365# CONFIG_BLK_DEV_IDETAPE is not set 383# CONFIG_BLK_DEV_IDETAPE is not set
366# CONFIG_BLK_DEV_IDEFLOPPY is not set 384# CONFIG_BLK_DEV_IDEFLOPPY is not set
367# CONFIG_IDE_TASK_IOCTL is not set 385# CONFIG_IDE_TASK_IOCTL is not set
386CONFIG_IDE_PROC_FS=y
368 387
369# 388#
370# IDE chipset support/bugfixes 389# IDE chipset support/bugfixes
@@ -372,12 +391,13 @@ CONFIG_BLK_DEV_IDE=y
372CONFIG_IDE_GENERIC=y 391CONFIG_IDE_GENERIC=y
373CONFIG_BLK_DEV_IDEPCI=y 392CONFIG_BLK_DEV_IDEPCI=y
374CONFIG_IDEPCI_SHARE_IRQ=y 393CONFIG_IDEPCI_SHARE_IRQ=y
394CONFIG_IDEPCI_PCIBUS_ORDER=y
375# CONFIG_BLK_DEV_OFFBOARD is not set 395# CONFIG_BLK_DEV_OFFBOARD is not set
376CONFIG_BLK_DEV_GENERIC=y 396CONFIG_BLK_DEV_GENERIC=y
377# CONFIG_BLK_DEV_OPTI621 is not set 397# CONFIG_BLK_DEV_OPTI621 is not set
378CONFIG_BLK_DEV_IDEDMA_PCI=y 398CONFIG_BLK_DEV_IDEDMA_PCI=y
379# CONFIG_BLK_DEV_IDEDMA_FORCED is not set 399# CONFIG_BLK_DEV_IDEDMA_FORCED is not set
380# CONFIG_IDEDMA_PCI_AUTO is not set 400# CONFIG_IDEDMA_ONLYDISK is not set
381# CONFIG_BLK_DEV_AEC62XX is not set 401# CONFIG_BLK_DEV_AEC62XX is not set
382# CONFIG_BLK_DEV_ALI15X3 is not set 402# CONFIG_BLK_DEV_ALI15X3 is not set
383# CONFIG_BLK_DEV_AMD74XX is not set 403# CONFIG_BLK_DEV_AMD74XX is not set
@@ -391,6 +411,7 @@ CONFIG_BLK_DEV_IDEDMA_PCI=y
391# CONFIG_BLK_DEV_JMICRON is not set 411# CONFIG_BLK_DEV_JMICRON is not set
392# CONFIG_BLK_DEV_SC1200 is not set 412# CONFIG_BLK_DEV_SC1200 is not set
393# CONFIG_BLK_DEV_PIIX is not set 413# CONFIG_BLK_DEV_PIIX is not set
414# CONFIG_BLK_DEV_IT8213 is not set
394# CONFIG_BLK_DEV_IT821X is not set 415# CONFIG_BLK_DEV_IT821X is not set
395# CONFIG_BLK_DEV_NS87415 is not set 416# CONFIG_BLK_DEV_NS87415 is not set
396# CONFIG_BLK_DEV_PDC202XX_OLD is not set 417# CONFIG_BLK_DEV_PDC202XX_OLD is not set
@@ -401,10 +422,10 @@ CONFIG_BLK_DEV_IDEDMA_PCI=y
401# CONFIG_BLK_DEV_SLC90E66 is not set 422# CONFIG_BLK_DEV_SLC90E66 is not set
402# CONFIG_BLK_DEV_TRM290 is not set 423# CONFIG_BLK_DEV_TRM290 is not set
403CONFIG_BLK_DEV_VIA82CXXX=y 424CONFIG_BLK_DEV_VIA82CXXX=y
425# CONFIG_BLK_DEV_TC86C001 is not set
404# CONFIG_IDE_ARM is not set 426# CONFIG_IDE_ARM is not set
405CONFIG_BLK_DEV_IDEDMA=y 427CONFIG_BLK_DEV_IDEDMA=y
406# CONFIG_IDEDMA_IVB is not set 428# CONFIG_IDEDMA_IVB is not set
407# CONFIG_IDEDMA_AUTO is not set
408# CONFIG_BLK_DEV_HD is not set 429# CONFIG_BLK_DEV_HD is not set
409 430
410# 431#
@@ -413,10 +434,6 @@ CONFIG_BLK_DEV_IDEDMA=y
413# CONFIG_RAID_ATTRS is not set 434# CONFIG_RAID_ATTRS is not set
414# CONFIG_SCSI is not set 435# CONFIG_SCSI is not set
415# CONFIG_SCSI_NETLINK is not set 436# CONFIG_SCSI_NETLINK is not set
416
417#
418# Serial ATA (prod) and Parallel ATA (experimental) drivers
419#
420# CONFIG_ATA is not set 437# CONFIG_ATA is not set
421 438
422# 439#
@@ -432,18 +449,14 @@ CONFIG_BLK_DEV_IDEDMA=y
432# 449#
433# IEEE 1394 (FireWire) support 450# IEEE 1394 (FireWire) support
434# 451#
452# CONFIG_FIREWIRE is not set
435# CONFIG_IEEE1394 is not set 453# CONFIG_IEEE1394 is not set
436 454
437# 455#
438# I2O device support 456# I2O device support
439# 457#
440# CONFIG_I2O is not set 458# CONFIG_I2O is not set
441 459# CONFIG_MACINTOSH_DRIVERS is not set
442#
443# Macintosh device drivers
444#
445# CONFIG_MAC_EMUMOUSEBTN is not set
446# CONFIG_WINDFARM is not set
447 460
448# 461#
449# Network device support 462# Network device support
@@ -453,15 +466,7 @@ CONFIG_NETDEVICES=y
453# CONFIG_BONDING is not set 466# CONFIG_BONDING is not set
454# CONFIG_EQUALIZER is not set 467# CONFIG_EQUALIZER is not set
455# CONFIG_TUN is not set 468# CONFIG_TUN is not set
456
457#
458# ARCnet devices
459#
460# CONFIG_ARCNET is not set 469# CONFIG_ARCNET is not set
461
462#
463# PHY device support
464#
465CONFIG_PHYLIB=y 470CONFIG_PHYLIB=y
466 471
467# 472#
@@ -493,10 +498,7 @@ CONFIG_MII=y
493# CONFIG_NET_TULIP is not set 498# CONFIG_NET_TULIP is not set
494# CONFIG_HP100 is not set 499# CONFIG_HP100 is not set
495# CONFIG_NET_PCI is not set 500# CONFIG_NET_PCI is not set
496 501CONFIG_NETDEV_1000=y
497#
498# Ethernet (1000 Mbit)
499#
500# CONFIG_ACENIC is not set 502# CONFIG_ACENIC is not set
501# CONFIG_DL2K is not set 503# CONFIG_DL2K is not set
502CONFIG_E1000=y 504CONFIG_E1000=y
@@ -510,34 +512,28 @@ CONFIG_E1000_NAPI=y
510# CONFIG_SKGE is not set 512# CONFIG_SKGE is not set
511# CONFIG_SKY2 is not set 513# CONFIG_SKY2 is not set
512# CONFIG_SK98LIN is not set 514# CONFIG_SK98LIN is not set
515# CONFIG_VIA_VELOCITY is not set
513# CONFIG_TIGON3 is not set 516# CONFIG_TIGON3 is not set
514# CONFIG_BNX2 is not set 517# CONFIG_BNX2 is not set
515CONFIG_GIANFAR=y 518CONFIG_GIANFAR=y
516CONFIG_GFAR_NAPI=y 519CONFIG_GFAR_NAPI=y
517# CONFIG_QLA3XXX is not set 520# CONFIG_QLA3XXX is not set
518 521# CONFIG_ATL1 is not set
519# 522CONFIG_NETDEV_10000=y
520# Ethernet (10000 Mbit)
521#
522# CONFIG_CHELSIO_T1 is not set 523# CONFIG_CHELSIO_T1 is not set
524# CONFIG_CHELSIO_T3 is not set
523# CONFIG_IXGB is not set 525# CONFIG_IXGB is not set
524# CONFIG_S2IO is not set 526# CONFIG_S2IO is not set
525# CONFIG_MYRI10GE is not set 527# CONFIG_MYRI10GE is not set
526# CONFIG_NETXEN_NIC is not set 528# CONFIG_NETXEN_NIC is not set
527 529# CONFIG_MLX4_CORE is not set
528#
529# Token Ring devices
530#
531# CONFIG_TR is not set 530# CONFIG_TR is not set
532 531
533# 532#
534# Wireless LAN (non-hamradio) 533# Wireless LAN
535#
536# CONFIG_NET_RADIO is not set
537
538#
539# Wan interfaces
540# 534#
535# CONFIG_WLAN_PRE80211 is not set
536# CONFIG_WLAN_80211 is not set
541# CONFIG_WAN is not set 537# CONFIG_WAN is not set
542# CONFIG_FDDI is not set 538# CONFIG_FDDI is not set
543# CONFIG_HIPPI is not set 539# CONFIG_HIPPI is not set
@@ -563,6 +559,7 @@ CONFIG_GFAR_NAPI=y
563# 559#
564CONFIG_INPUT=y 560CONFIG_INPUT=y
565# CONFIG_INPUT_FF_MEMLESS is not set 561# CONFIG_INPUT_FF_MEMLESS is not set
562# CONFIG_INPUT_POLLDEV is not set
566 563
567# 564#
568# Userland interfaces 565# Userland interfaces
@@ -579,6 +576,7 @@ CONFIG_INPUT=y
579# CONFIG_INPUT_KEYBOARD is not set 576# CONFIG_INPUT_KEYBOARD is not set
580# CONFIG_INPUT_MOUSE is not set 577# CONFIG_INPUT_MOUSE is not set
581# CONFIG_INPUT_JOYSTICK is not set 578# CONFIG_INPUT_JOYSTICK is not set
579# CONFIG_INPUT_TABLET is not set
582# CONFIG_INPUT_TOUCHSCREEN is not set 580# CONFIG_INPUT_TOUCHSCREEN is not set
583# CONFIG_INPUT_MISC is not set 581# CONFIG_INPUT_MISC is not set
584 582
@@ -603,6 +601,7 @@ CONFIG_SERIAL_8250_PCI=y
603CONFIG_SERIAL_8250_NR_UARTS=4 601CONFIG_SERIAL_8250_NR_UARTS=4
604CONFIG_SERIAL_8250_RUNTIME_UARTS=4 602CONFIG_SERIAL_8250_RUNTIME_UARTS=4
605# CONFIG_SERIAL_8250_EXTENDED is not set 603# CONFIG_SERIAL_8250_EXTENDED is not set
604CONFIG_SERIAL_8250_SHARE_IRQ=y
606 605
607# 606#
608# Non-8250 serial port support 607# Non-8250 serial port support
@@ -611,6 +610,7 @@ CONFIG_SERIAL_8250_RUNTIME_UARTS=4
611CONFIG_SERIAL_CORE=y 610CONFIG_SERIAL_CORE=y
612CONFIG_SERIAL_CORE_CONSOLE=y 611CONFIG_SERIAL_CORE_CONSOLE=y
613# CONFIG_SERIAL_JSM is not set 612# CONFIG_SERIAL_JSM is not set
613# CONFIG_SERIAL_OF_PLATFORM is not set
614CONFIG_UNIX98_PTYS=y 614CONFIG_UNIX98_PTYS=y
615CONFIG_LEGACY_PTYS=y 615CONFIG_LEGACY_PTYS=y
616CONFIG_LEGACY_PTY_COUNT=256 616CONFIG_LEGACY_PTY_COUNT=256
@@ -619,16 +619,11 @@ CONFIG_LEGACY_PTY_COUNT=256
619# IPMI 619# IPMI
620# 620#
621# CONFIG_IPMI_HANDLER is not set 621# CONFIG_IPMI_HANDLER is not set
622
623#
624# Watchdog Cards
625#
626# CONFIG_WATCHDOG is not set 622# CONFIG_WATCHDOG is not set
627# CONFIG_HW_RANDOM is not set 623# CONFIG_HW_RANDOM is not set
628# CONFIG_NVRAM is not set 624# CONFIG_NVRAM is not set
629CONFIG_GEN_RTC=y 625CONFIG_GEN_RTC=y
630# CONFIG_GEN_RTC_X is not set 626# CONFIG_GEN_RTC_X is not set
631# CONFIG_DTLK is not set
632# CONFIG_R3964 is not set 627# CONFIG_R3964 is not set
633# CONFIG_APPLICOM is not set 628# CONFIG_APPLICOM is not set
634# CONFIG_AGP is not set 629# CONFIG_AGP is not set
@@ -639,10 +634,7 @@ CONFIG_GEN_RTC=y
639# TPM devices 634# TPM devices
640# 635#
641# CONFIG_TCG_TPM is not set 636# CONFIG_TCG_TPM is not set
642 637CONFIG_DEVPORT=y
643#
644# I2C support
645#
646# CONFIG_I2C is not set 638# CONFIG_I2C is not set
647 639
648# 640#
@@ -655,35 +647,41 @@ CONFIG_GEN_RTC=y
655# Dallas's 1-wire bus 647# Dallas's 1-wire bus
656# 648#
657# CONFIG_W1 is not set 649# CONFIG_W1 is not set
658
659#
660# Hardware Monitoring support
661#
662CONFIG_HWMON=y 650CONFIG_HWMON=y
663# CONFIG_HWMON_VID is not set 651# CONFIG_HWMON_VID is not set
664# CONFIG_SENSORS_ABITUGURU is not set 652# CONFIG_SENSORS_ABITUGURU is not set
665# CONFIG_SENSORS_F71805F is not set 653# CONFIG_SENSORS_F71805F is not set
666# CONFIG_SENSORS_PC87427 is not set 654# CONFIG_SENSORS_PC87427 is not set
655# CONFIG_SENSORS_SMSC47M1 is not set
656# CONFIG_SENSORS_SMSC47B397 is not set
667# CONFIG_SENSORS_VT1211 is not set 657# CONFIG_SENSORS_VT1211 is not set
658# CONFIG_SENSORS_W83627HF is not set
668# CONFIG_HWMON_DEBUG_CHIP is not set 659# CONFIG_HWMON_DEBUG_CHIP is not set
669 660
670# 661#
662# Multifunction device drivers
663#
664# CONFIG_MFD_SM501 is not set
665
666#
671# Multimedia devices 667# Multimedia devices
672# 668#
673# CONFIG_VIDEO_DEV is not set 669# CONFIG_VIDEO_DEV is not set
670# CONFIG_DVB_CORE is not set
671CONFIG_DAB=y
674 672
675# 673#
676# Digital Video Broadcasting Devices 674# Graphics support
677# 675#
678# CONFIG_DVB is not set 676# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
679 677
680# 678#
681# Graphics support 679# Display device support
682# 680#
683CONFIG_FIRMWARE_EDID=y 681# CONFIG_DISPLAY_SUPPORT is not set
682# CONFIG_VGASTATE is not set
684# CONFIG_FB is not set 683# CONFIG_FB is not set
685# CONFIG_FB_IBM_GXT4500 is not set 684# CONFIG_FB_IBM_GXT4500 is not set
686# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
687 685
688# 686#
689# Sound 687# Sound
@@ -694,6 +692,7 @@ CONFIG_FIRMWARE_EDID=y
694# HID Devices 692# HID Devices
695# 693#
696CONFIG_HID=y 694CONFIG_HID=y
695# CONFIG_HID_DEBUG is not set
697 696
698# 697#
699# USB support 698# USB support
@@ -711,10 +710,6 @@ CONFIG_USB_ARCH_HAS_EHCI=y
711# USB Gadget Support 710# USB Gadget Support
712# 711#
713# CONFIG_USB_GADGET is not set 712# CONFIG_USB_GADGET is not set
714
715#
716# MMC/SD Card support
717#
718# CONFIG_MMC is not set 713# CONFIG_MMC is not set
719 714
720# 715#
@@ -758,10 +753,6 @@ CONFIG_USB_ARCH_HAS_EHCI=y
758# 753#
759 754
760# 755#
761# Virtualization
762#
763
764#
765# File systems 756# File systems
766# 757#
767CONFIG_EXT2_FS=y 758CONFIG_EXT2_FS=y
@@ -846,6 +837,7 @@ CONFIG_ROOT_NFS=y
846CONFIG_LOCKD=y 837CONFIG_LOCKD=y
847CONFIG_NFS_COMMON=y 838CONFIG_NFS_COMMON=y
848CONFIG_SUNRPC=y 839CONFIG_SUNRPC=y
840# CONFIG_SUNRPC_BIND34 is not set
849# CONFIG_RPCSEC_GSS_KRB5 is not set 841# CONFIG_RPCSEC_GSS_KRB5 is not set
850# CONFIG_RPCSEC_GSS_SPKM3 is not set 842# CONFIG_RPCSEC_GSS_SPKM3 is not set
851# CONFIG_SMB_FS is not set 843# CONFIG_SMB_FS is not set
@@ -871,6 +863,7 @@ CONFIG_PARTITION_ADVANCED=y
871# CONFIG_SUN_PARTITION is not set 863# CONFIG_SUN_PARTITION is not set
872# CONFIG_KARMA_PARTITION is not set 864# CONFIG_KARMA_PARTITION is not set
873# CONFIG_EFI_PARTITION is not set 865# CONFIG_EFI_PARTITION is not set
866# CONFIG_SYSV68_PARTITION is not set
874 867
875# 868#
876# Native Language Support 869# Native Language Support
@@ -881,6 +874,7 @@ CONFIG_PARTITION_ADVANCED=y
881# Distributed Lock Manager 874# Distributed Lock Manager
882# 875#
883# CONFIG_DLM is not set 876# CONFIG_DLM is not set
877# CONFIG_UCC_SLOW is not set
884 878
885# 879#
886# Library routines 880# Library routines
@@ -888,10 +882,13 @@ CONFIG_PARTITION_ADVANCED=y
888CONFIG_BITREVERSE=y 882CONFIG_BITREVERSE=y
889# CONFIG_CRC_CCITT is not set 883# CONFIG_CRC_CCITT is not set
890# CONFIG_CRC16 is not set 884# CONFIG_CRC16 is not set
885# CONFIG_CRC_ITU_T is not set
891CONFIG_CRC32=y 886CONFIG_CRC32=y
892# CONFIG_LIBCRC32C is not set 887# CONFIG_LIBCRC32C is not set
893CONFIG_PLIST=y 888CONFIG_PLIST=y
894CONFIG_IOMAP_COPY=y 889CONFIG_HAS_IOMEM=y
890CONFIG_HAS_IOPORT=y
891CONFIG_HAS_DMA=y
895 892
896# 893#
897# Instrumentation Support 894# Instrumentation Support
@@ -908,15 +905,15 @@ CONFIG_ENABLE_MUST_CHECK=y
908# CONFIG_DEBUG_FS is not set 905# CONFIG_DEBUG_FS is not set
909# CONFIG_HEADERS_CHECK is not set 906# CONFIG_HEADERS_CHECK is not set
910CONFIG_DEBUG_KERNEL=y 907CONFIG_DEBUG_KERNEL=y
911CONFIG_LOG_BUF_SHIFT=14 908# CONFIG_DEBUG_SHIRQ is not set
912CONFIG_DETECT_SOFTLOCKUP=y 909CONFIG_DETECT_SOFTLOCKUP=y
913# CONFIG_SCHEDSTATS is not set 910# CONFIG_SCHEDSTATS is not set
911# CONFIG_TIMER_STATS is not set
914# CONFIG_DEBUG_SLAB is not set 912# CONFIG_DEBUG_SLAB is not set
915# CONFIG_DEBUG_RT_MUTEXES is not set 913# CONFIG_DEBUG_RT_MUTEXES is not set
916# CONFIG_RT_MUTEX_TESTER is not set 914# CONFIG_RT_MUTEX_TESTER is not set
917# CONFIG_DEBUG_SPINLOCK is not set 915# CONFIG_DEBUG_SPINLOCK is not set
918CONFIG_DEBUG_MUTEXES=y 916CONFIG_DEBUG_MUTEXES=y
919# CONFIG_DEBUG_RWSEMS is not set
920# CONFIG_DEBUG_SPINLOCK_SLEEP is not set 917# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
921# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set 918# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
922# CONFIG_DEBUG_KOBJECT is not set 919# CONFIG_DEBUG_KOBJECT is not set
@@ -925,7 +922,10 @@ CONFIG_DEBUG_MUTEXES=y
925# CONFIG_DEBUG_VM is not set 922# CONFIG_DEBUG_VM is not set
926# CONFIG_DEBUG_LIST is not set 923# CONFIG_DEBUG_LIST is not set
927CONFIG_FORCED_INLINING=y 924CONFIG_FORCED_INLINING=y
928# CONFIG_RCU_TORTURE_TEST is not set 925# CONFIG_FAULT_INJECTION is not set
926# CONFIG_DEBUG_STACKOVERFLOW is not set
927# CONFIG_DEBUG_STACK_USAGE is not set
928# CONFIG_DEBUG_PAGEALLOC is not set
929# CONFIG_DEBUGGER is not set 929# CONFIG_DEBUGGER is not set
930# CONFIG_BDI_SWITCH is not set 930# CONFIG_BDI_SWITCH is not set
931# CONFIG_BOOTX_TEXT is not set 931# CONFIG_BOOTX_TEXT is not set
diff --git a/arch/powerpc/configs/mpc8641_hpcn_defconfig b/arch/powerpc/configs/mpc8641_hpcn_defconfig
index 53fcd6932f5b..1ac94a605b05 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.20-rc5 3# Linux kernel version: 2.6.22-rc7
4# Mon Jan 22 22:27:14 2007 4# Sun Jul 1 23:57:00 2007
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7CONFIG_PPC32=y 7CONFIG_PPC32=y
@@ -24,7 +24,7 @@ CONFIG_PPC_UDBG_16550=y
24CONFIG_GENERIC_TBSYNC=y 24CONFIG_GENERIC_TBSYNC=y
25CONFIG_AUDIT_ARCH=y 25CONFIG_AUDIT_ARCH=y
26CONFIG_GENERIC_BUG=y 26CONFIG_GENERIC_BUG=y
27# CONFIG_DEFAULT_UIMAGE is not set 27CONFIG_DEFAULT_UIMAGE=y
28 28
29# 29#
30# Processor support 30# Processor support
@@ -34,9 +34,9 @@ CONFIG_GENERIC_BUG=y
34# CONFIG_PPC_83xx is not set 34# CONFIG_PPC_83xx is not set
35# CONFIG_PPC_85xx is not set 35# CONFIG_PPC_85xx is not set
36CONFIG_PPC_86xx=y 36CONFIG_PPC_86xx=y
37# CONFIG_PPC_8xx is not set
37# CONFIG_40x is not set 38# CONFIG_40x is not set
38# CONFIG_44x is not set 39# CONFIG_44x is not set
39# CONFIG_8xx is not set
40# CONFIG_E200 is not set 40# CONFIG_E200 is not set
41CONFIG_6xx=y 41CONFIG_6xx=y
42CONFIG_PPC_FPU=y 42CONFIG_PPC_FPU=y
@@ -45,6 +45,7 @@ CONFIG_PPC_FPU=y
45CONFIG_ALTIVEC=y 45CONFIG_ALTIVEC=y
46CONFIG_PPC_STD_MMU=y 46CONFIG_PPC_STD_MMU=y
47CONFIG_PPC_STD_MMU_32=y 47CONFIG_PPC_STD_MMU_32=y
48# CONFIG_PPC_MM_SLICES is not set
48CONFIG_SMP=y 49CONFIG_SMP=y
49CONFIG_NR_CPUS=2 50CONFIG_NR_CPUS=2
50CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 51CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
@@ -70,9 +71,11 @@ CONFIG_LOCALVERSION=""
70# CONFIG_AUDIT is not set 71# CONFIG_AUDIT is not set
71CONFIG_IKCONFIG=y 72CONFIG_IKCONFIG=y
72CONFIG_IKCONFIG_PROC=y 73CONFIG_IKCONFIG_PROC=y
74CONFIG_LOG_BUF_SHIFT=14
73# CONFIG_CPUSETS is not set 75# CONFIG_CPUSETS is not set
74CONFIG_SYSFS_DEPRECATED=y 76CONFIG_SYSFS_DEPRECATED=y
75# CONFIG_RELAY is not set 77# CONFIG_RELAY is not set
78CONFIG_BLK_DEV_INITRD=y
76CONFIG_INITRAMFS_SOURCE="" 79CONFIG_INITRAMFS_SOURCE=""
77# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 80# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
78CONFIG_SYSCTL=y 81CONFIG_SYSCTL=y
@@ -87,14 +90,19 @@ CONFIG_BUG=y
87# CONFIG_ELF_CORE is not set 90# CONFIG_ELF_CORE is not set
88CONFIG_BASE_FULL=y 91CONFIG_BASE_FULL=y
89CONFIG_FUTEX=y 92CONFIG_FUTEX=y
93CONFIG_ANON_INODES=y
90CONFIG_EPOLL=y 94CONFIG_EPOLL=y
95CONFIG_SIGNALFD=y
96CONFIG_TIMERFD=y
97CONFIG_EVENTFD=y
91CONFIG_SHMEM=y 98CONFIG_SHMEM=y
92CONFIG_SLAB=y
93CONFIG_VM_EVENT_COUNTERS=y 99CONFIG_VM_EVENT_COUNTERS=y
100CONFIG_SLAB=y
101# CONFIG_SLUB is not set
102# CONFIG_SLOB is not set
94CONFIG_RT_MUTEXES=y 103CONFIG_RT_MUTEXES=y
95# CONFIG_TINY_SHMEM is not set 104# CONFIG_TINY_SHMEM is not set
96CONFIG_BASE_SMALL=0 105CONFIG_BASE_SMALL=0
97# CONFIG_SLOB is not set
98 106
99# 107#
100# Loadable module support 108# Loadable module support
@@ -121,15 +129,28 @@ CONFIG_DEFAULT_DEADLINE=y
121# CONFIG_DEFAULT_CFQ is not set 129# CONFIG_DEFAULT_CFQ is not set
122# CONFIG_DEFAULT_NOOP is not set 130# CONFIG_DEFAULT_NOOP is not set
123CONFIG_DEFAULT_IOSCHED="deadline" 131CONFIG_DEFAULT_IOSCHED="deadline"
124# CONFIG_WANT_EARLY_SERIAL is not set
125CONFIG_PPC_INDIRECT_PCI_BE=y
126CONFIG_MPIC=y
127 132
128# 133#
129# Platform Support 134# Platform support
130# 135#
136# CONFIG_PPC_MPC52xx is not set
137# CONFIG_PPC_MPC5200 is not set
138# CONFIG_PPC_CELL is not set
139# CONFIG_PPC_CELL_NATIVE is not set
140# CONFIG_PQ2ADS is not set
131CONFIG_MPC8641_HPCN=y 141CONFIG_MPC8641_HPCN=y
132CONFIG_MPC8641=y 142CONFIG_MPC8641=y
143CONFIG_MPIC=y
144# CONFIG_MPIC_WEIRD is not set
145CONFIG_PPC_I8259=y
146# CONFIG_PPC_RTAS is not set
147# CONFIG_MMIO_NVRAM is not set
148# CONFIG_PPC_MPC106 is not set
149# CONFIG_PPC_970_NAP is not set
150# CONFIG_PPC_INDIRECT_IO is not set
151# CONFIG_GENERIC_IOMAP is not set
152# CONFIG_CPU_FREQ is not set
153# CONFIG_CPM2 is not set
133 154
134# 155#
135# Kernel options 156# Kernel options
@@ -159,33 +180,34 @@ CONFIG_FLAT_NODE_MEM_MAP=y
159# CONFIG_SPARSEMEM_STATIC is not set 180# CONFIG_SPARSEMEM_STATIC is not set
160CONFIG_SPLIT_PTLOCK_CPUS=4 181CONFIG_SPLIT_PTLOCK_CPUS=4
161# CONFIG_RESOURCES_64BIT is not set 182# CONFIG_RESOURCES_64BIT is not set
183CONFIG_ZONE_DMA_FLAG=1
162CONFIG_PROC_DEVICETREE=y 184CONFIG_PROC_DEVICETREE=y
163# CONFIG_CMDLINE_BOOL is not set 185# CONFIG_CMDLINE_BOOL is not set
164# CONFIG_PM is not set 186# CONFIG_PM is not set
165# CONFIG_SECCOMP is not set 187# CONFIG_SECCOMP is not set
188# CONFIG_WANT_DEVICE_TREE is not set
166CONFIG_ISA_DMA_API=y 189CONFIG_ISA_DMA_API=y
167 190
168# 191#
169# Bus options 192# Bus options
170# 193#
194CONFIG_ZONE_DMA=y
171CONFIG_GENERIC_ISA_DMA=y 195CONFIG_GENERIC_ISA_DMA=y
172# CONFIG_MPIC_WEIRD is not set
173CONFIG_PPC_I8259=y
174CONFIG_PPC_INDIRECT_PCI=y 196CONFIG_PPC_INDIRECT_PCI=y
197CONFIG_PPC_INDIRECT_PCI_BE=y
175CONFIG_FSL_SOC=y 198CONFIG_FSL_SOC=y
199CONFIG_FSL_PCIE=y
176CONFIG_PCI=y 200CONFIG_PCI=y
177CONFIG_PCI_DOMAINS=y 201CONFIG_PCI_DOMAINS=y
178# CONFIG_PCIEPORTBUS is not set 202# CONFIG_PCIEPORTBUS is not set
203CONFIG_ARCH_SUPPORTS_MSI=y
204# CONFIG_PCI_MSI is not set
179# CONFIG_PCI_DEBUG is not set 205# CONFIG_PCI_DEBUG is not set
180 206
181# 207#
182# PCCARD (PCMCIA/CardBus) support 208# PCCARD (PCMCIA/CardBus) support
183# 209#
184# CONFIG_PCCARD is not set 210# CONFIG_PCCARD is not set
185
186#
187# PCI Hotplug Support
188#
189# CONFIG_HOTPLUG_PCI is not set 211# CONFIG_HOTPLUG_PCI is not set
190 212
191# 213#
@@ -210,13 +232,13 @@ CONFIG_NET=y
210# 232#
211# Networking options 233# Networking options
212# 234#
213# CONFIG_NETDEBUG is not set
214CONFIG_PACKET=y 235CONFIG_PACKET=y
215# CONFIG_PACKET_MMAP is not set 236# CONFIG_PACKET_MMAP is not set
216CONFIG_UNIX=y 237CONFIG_UNIX=y
217CONFIG_XFRM=y 238CONFIG_XFRM=y
218CONFIG_XFRM_USER=y 239CONFIG_XFRM_USER=y
219# CONFIG_XFRM_SUB_POLICY is not set 240# CONFIG_XFRM_SUB_POLICY is not set
241# CONFIG_XFRM_MIGRATE is not set
220# CONFIG_NET_KEY is not set 242# CONFIG_NET_KEY is not set
221CONFIG_INET=y 243CONFIG_INET=y
222# CONFIG_IP_MULTICAST is not set 244# CONFIG_IP_MULTICAST is not set
@@ -234,7 +256,7 @@ CONFIG_IP_PNP_RARP=y
234# CONFIG_INET_ESP is not set 256# CONFIG_INET_ESP is not set
235# CONFIG_INET_IPCOMP is not set 257# CONFIG_INET_IPCOMP is not set
236# CONFIG_INET_XFRM_TUNNEL is not set 258# CONFIG_INET_XFRM_TUNNEL is not set
237# CONFIG_INET_TUNNEL is not set 259CONFIG_INET_TUNNEL=y
238CONFIG_INET_XFRM_MODE_TRANSPORT=y 260CONFIG_INET_XFRM_MODE_TRANSPORT=y
239CONFIG_INET_XFRM_MODE_TUNNEL=y 261CONFIG_INET_XFRM_MODE_TUNNEL=y
240CONFIG_INET_XFRM_MODE_BEET=y 262CONFIG_INET_XFRM_MODE_BEET=y
@@ -247,6 +269,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
247CONFIG_IPV6=y 269CONFIG_IPV6=y
248# CONFIG_IPV6_PRIVACY is not set 270# CONFIG_IPV6_PRIVACY is not set
249# CONFIG_IPV6_ROUTER_PREF is not set 271# CONFIG_IPV6_ROUTER_PREF is not set
272# CONFIG_IPV6_OPTIMISTIC_DAD is not set
250# CONFIG_INET6_AH is not set 273# CONFIG_INET6_AH is not set
251# CONFIG_INET6_ESP is not set 274# CONFIG_INET6_ESP is not set
252# CONFIG_INET6_IPCOMP is not set 275# CONFIG_INET6_IPCOMP is not set
@@ -262,20 +285,8 @@ CONFIG_IPV6_SIT=y
262# CONFIG_IPV6_MULTIPLE_TABLES is not set 285# CONFIG_IPV6_MULTIPLE_TABLES is not set
263# CONFIG_NETWORK_SECMARK is not set 286# CONFIG_NETWORK_SECMARK is not set
264# CONFIG_NETFILTER is not set 287# CONFIG_NETFILTER is not set
265
266#
267# DCCP Configuration (EXPERIMENTAL)
268#
269# CONFIG_IP_DCCP is not set 288# CONFIG_IP_DCCP is not set
270
271#
272# SCTP Configuration (EXPERIMENTAL)
273#
274# CONFIG_IP_SCTP is not set 289# CONFIG_IP_SCTP is not set
275
276#
277# TIPC Configuration (EXPERIMENTAL)
278#
279# CONFIG_TIPC is not set 290# CONFIG_TIPC is not set
280# CONFIG_ATM is not set 291# CONFIG_ATM is not set
281# CONFIG_BRIDGE is not set 292# CONFIG_BRIDGE is not set
@@ -301,7 +312,16 @@ CONFIG_IPV6_SIT=y
301# CONFIG_HAMRADIO is not set 312# CONFIG_HAMRADIO is not set
302# CONFIG_IRDA is not set 313# CONFIG_IRDA is not set
303# CONFIG_BT is not set 314# CONFIG_BT is not set
315# CONFIG_AF_RXRPC is not set
316
317#
318# Wireless
319#
320# CONFIG_CFG80211 is not set
321# CONFIG_WIRELESS_EXT is not set
322# CONFIG_MAC80211 is not set
304# CONFIG_IEEE80211 is not set 323# CONFIG_IEEE80211 is not set
324# CONFIG_RFKILL is not set
305 325
306# 326#
307# Device Drivers 327# Device Drivers
@@ -314,16 +334,13 @@ CONFIG_STANDALONE=y
314CONFIG_PREVENT_FIRMWARE_BUILD=y 334CONFIG_PREVENT_FIRMWARE_BUILD=y
315CONFIG_FW_LOADER=y 335CONFIG_FW_LOADER=y
316# CONFIG_DEBUG_DRIVER is not set 336# CONFIG_DEBUG_DRIVER is not set
337# CONFIG_DEBUG_DEVRES is not set
317# CONFIG_SYS_HYPERVISOR is not set 338# CONFIG_SYS_HYPERVISOR is not set
318 339
319# 340#
320# Connector - unified userspace <-> kernelspace linker 341# Connector - unified userspace <-> kernelspace linker
321# 342#
322# CONFIG_CONNECTOR is not set 343# CONFIG_CONNECTOR is not set
323
324#
325# Memory Technology Devices (MTD)
326#
327# CONFIG_MTD is not set 344# CONFIG_MTD is not set
328 345
329# 346#
@@ -334,6 +351,7 @@ CONFIG_FW_LOADER=y
334# 351#
335# Plug and Play support 352# Plug and Play support
336# 353#
354# CONFIG_PNPACPI is not set
337 355
338# 356#
339# Block devices 357# Block devices
@@ -352,19 +370,16 @@ CONFIG_BLK_DEV_RAM=y
352CONFIG_BLK_DEV_RAM_COUNT=16 370CONFIG_BLK_DEV_RAM_COUNT=16
353CONFIG_BLK_DEV_RAM_SIZE=131072 371CONFIG_BLK_DEV_RAM_SIZE=131072
354CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 372CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
355CONFIG_BLK_DEV_INITRD=y
356# CONFIG_CDROM_PKTCDVD is not set 373# CONFIG_CDROM_PKTCDVD is not set
357# CONFIG_ATA_OVER_ETH is not set 374# CONFIG_ATA_OVER_ETH is not set
358 375
359# 376#
360# Misc devices 377# Misc devices
361# 378#
379# CONFIG_PHANTOM is not set
362# CONFIG_SGI_IOC4 is not set 380# CONFIG_SGI_IOC4 is not set
363# CONFIG_TIFM_CORE is not set 381# CONFIG_TIFM_CORE is not set
364 382# CONFIG_BLINK is not set
365#
366# ATA/ATAPI/MFM/RLL support
367#
368# CONFIG_IDE is not set 383# CONFIG_IDE is not set
369 384
370# 385#
@@ -373,10 +388,6 @@ CONFIG_BLK_DEV_INITRD=y
373# CONFIG_RAID_ATTRS is not set 388# CONFIG_RAID_ATTRS is not set
374# CONFIG_SCSI is not set 389# CONFIG_SCSI is not set
375# CONFIG_SCSI_NETLINK is not set 390# CONFIG_SCSI_NETLINK is not set
376
377#
378# Serial ATA (prod) and Parallel ATA (experimental) drivers
379#
380# CONFIG_ATA is not set 391# CONFIG_ATA is not set
381 392
382# 393#
@@ -392,18 +403,14 @@ CONFIG_BLK_DEV_INITRD=y
392# 403#
393# IEEE 1394 (FireWire) support 404# IEEE 1394 (FireWire) support
394# 405#
406# CONFIG_FIREWIRE is not set
395# CONFIG_IEEE1394 is not set 407# CONFIG_IEEE1394 is not set
396 408
397# 409#
398# I2O device support 410# I2O device support
399# 411#
400# CONFIG_I2O is not set 412# CONFIG_I2O is not set
401 413# CONFIG_MACINTOSH_DRIVERS is not set
402#
403# Macintosh device drivers
404#
405# CONFIG_MAC_EMUMOUSEBTN is not set
406# CONFIG_WINDFARM is not set
407 414
408# 415#
409# Network device support 416# Network device support
@@ -413,15 +420,7 @@ CONFIG_DUMMY=y
413# CONFIG_BONDING is not set 420# CONFIG_BONDING is not set
414# CONFIG_EQUALIZER is not set 421# CONFIG_EQUALIZER is not set
415# CONFIG_TUN is not set 422# CONFIG_TUN is not set
416
417#
418# ARCnet devices
419#
420# CONFIG_ARCNET is not set 423# CONFIG_ARCNET is not set
421
422#
423# PHY device support
424#
425CONFIG_PHYLIB=y 424CONFIG_PHYLIB=y
426 425
427# 426#
@@ -453,10 +452,7 @@ CONFIG_MII=y
453# CONFIG_NET_TULIP is not set 452# CONFIG_NET_TULIP is not set
454# CONFIG_HP100 is not set 453# CONFIG_HP100 is not set
455# CONFIG_NET_PCI is not set 454# CONFIG_NET_PCI is not set
456 455CONFIG_NETDEV_1000=y
457#
458# Ethernet (1000 Mbit)
459#
460# CONFIG_ACENIC is not set 456# CONFIG_ACENIC is not set
461# CONFIG_DL2K is not set 457# CONFIG_DL2K is not set
462# CONFIG_E1000 is not set 458# CONFIG_E1000 is not set
@@ -468,34 +464,28 @@ CONFIG_MII=y
468# CONFIG_SKGE is not set 464# CONFIG_SKGE is not set
469# CONFIG_SKY2 is not set 465# CONFIG_SKY2 is not set
470# CONFIG_SK98LIN is not set 466# CONFIG_SK98LIN is not set
467# CONFIG_VIA_VELOCITY is not set
471# CONFIG_TIGON3 is not set 468# CONFIG_TIGON3 is not set
472# CONFIG_BNX2 is not set 469# CONFIG_BNX2 is not set
473CONFIG_GIANFAR=y 470CONFIG_GIANFAR=y
474# CONFIG_GFAR_NAPI is not set 471# CONFIG_GFAR_NAPI is not set
475# CONFIG_QLA3XXX is not set 472# CONFIG_QLA3XXX is not set
476 473# CONFIG_ATL1 is not set
477# 474CONFIG_NETDEV_10000=y
478# Ethernet (10000 Mbit)
479#
480# CONFIG_CHELSIO_T1 is not set 475# CONFIG_CHELSIO_T1 is not set
476# CONFIG_CHELSIO_T3 is not set
481# CONFIG_IXGB is not set 477# CONFIG_IXGB is not set
482# CONFIG_S2IO is not set 478# CONFIG_S2IO is not set
483# CONFIG_MYRI10GE is not set 479# CONFIG_MYRI10GE is not set
484# CONFIG_NETXEN_NIC is not set 480# CONFIG_NETXEN_NIC is not set
485 481# CONFIG_MLX4_CORE is not set
486#
487# Token Ring devices
488#
489# CONFIG_TR is not set 482# CONFIG_TR is not set
490 483
491# 484#
492# Wireless LAN (non-hamradio) 485# Wireless LAN
493#
494# CONFIG_NET_RADIO is not set
495
496#
497# Wan interfaces
498# 486#
487# CONFIG_WLAN_PRE80211 is not set
488# CONFIG_WLAN_80211 is not set
499# CONFIG_WAN is not set 489# CONFIG_WAN is not set
500# CONFIG_FDDI is not set 490# CONFIG_FDDI is not set
501# CONFIG_HIPPI is not set 491# CONFIG_HIPPI is not set
@@ -521,6 +511,7 @@ CONFIG_GIANFAR=y
521# 511#
522CONFIG_INPUT=y 512CONFIG_INPUT=y
523# CONFIG_INPUT_FF_MEMLESS is not set 513# CONFIG_INPUT_FF_MEMLESS is not set
514# CONFIG_INPUT_POLLDEV is not set
524 515
525# 516#
526# Userland interfaces 517# Userland interfaces
@@ -537,6 +528,7 @@ CONFIG_INPUT=y
537# CONFIG_INPUT_KEYBOARD is not set 528# CONFIG_INPUT_KEYBOARD is not set
538# CONFIG_INPUT_MOUSE is not set 529# CONFIG_INPUT_MOUSE is not set
539# CONFIG_INPUT_JOYSTICK is not set 530# CONFIG_INPUT_JOYSTICK is not set
531# CONFIG_INPUT_TABLET is not set
540# CONFIG_INPUT_TOUCHSCREEN is not set 532# CONFIG_INPUT_TOUCHSCREEN is not set
541# CONFIG_INPUT_MISC is not set 533# CONFIG_INPUT_MISC is not set
542 534
@@ -581,6 +573,7 @@ CONFIG_SERIAL_8250_RSA=y
581CONFIG_SERIAL_CORE=y 573CONFIG_SERIAL_CORE=y
582CONFIG_SERIAL_CORE_CONSOLE=y 574CONFIG_SERIAL_CORE_CONSOLE=y
583# CONFIG_SERIAL_JSM is not set 575# CONFIG_SERIAL_JSM is not set
576# CONFIG_SERIAL_OF_PLATFORM is not set
584CONFIG_UNIX98_PTYS=y 577CONFIG_UNIX98_PTYS=y
585# CONFIG_LEGACY_PTYS is not set 578# CONFIG_LEGACY_PTYS is not set
586 579
@@ -588,15 +581,10 @@ CONFIG_UNIX98_PTYS=y
588# IPMI 581# IPMI
589# 582#
590# CONFIG_IPMI_HANDLER is not set 583# CONFIG_IPMI_HANDLER is not set
591
592#
593# Watchdog Cards
594#
595# CONFIG_WATCHDOG is not set 584# CONFIG_WATCHDOG is not set
596# CONFIG_HW_RANDOM is not set 585# CONFIG_HW_RANDOM is not set
597# CONFIG_NVRAM is not set 586# CONFIG_NVRAM is not set
598# CONFIG_GEN_RTC is not set 587# CONFIG_GEN_RTC is not set
599# CONFIG_DTLK is not set
600# CONFIG_R3964 is not set 588# CONFIG_R3964 is not set
601# CONFIG_APPLICOM is not set 589# CONFIG_APPLICOM is not set
602# CONFIG_AGP is not set 590# CONFIG_AGP is not set
@@ -607,11 +595,9 @@ CONFIG_UNIX98_PTYS=y
607# TPM devices 595# TPM devices
608# 596#
609# CONFIG_TCG_TPM is not set 597# CONFIG_TCG_TPM is not set
610 598CONFIG_DEVPORT=y
611#
612# I2C support
613#
614CONFIG_I2C=y 599CONFIG_I2C=y
600CONFIG_I2C_BOARDINFO=y
615# CONFIG_I2C_CHARDEV is not set 601# CONFIG_I2C_CHARDEV is not set
616 602
617# 603#
@@ -638,13 +624,13 @@ CONFIG_I2C_MPC=y
638# CONFIG_I2C_PARPORT_LIGHT is not set 624# CONFIG_I2C_PARPORT_LIGHT is not set
639# CONFIG_I2C_PROSAVAGE is not set 625# CONFIG_I2C_PROSAVAGE is not set
640# CONFIG_I2C_SAVAGE4 is not set 626# CONFIG_I2C_SAVAGE4 is not set
627# CONFIG_I2C_SIMTEC is not set
641# CONFIG_I2C_SIS5595 is not set 628# CONFIG_I2C_SIS5595 is not set
642# CONFIG_I2C_SIS630 is not set 629# CONFIG_I2C_SIS630 is not set
643# CONFIG_I2C_SIS96X is not set 630# CONFIG_I2C_SIS96X is not set
644# CONFIG_I2C_VIA is not set 631# CONFIG_I2C_VIA is not set
645# CONFIG_I2C_VIAPRO is not set 632# CONFIG_I2C_VIAPRO is not set
646# CONFIG_I2C_VOODOO3 is not set 633# CONFIG_I2C_VOODOO3 is not set
647# CONFIG_I2C_PCA_ISA is not set
648 634
649# 635#
650# Miscellaneous I2C Chip support 636# Miscellaneous I2C Chip support
@@ -672,27 +658,30 @@ CONFIG_SENSORS_EEPROM=y
672# Dallas's 1-wire bus 658# Dallas's 1-wire bus
673# 659#
674# CONFIG_W1 is not set 660# CONFIG_W1 is not set
661# CONFIG_HWMON is not set
675 662
676# 663#
677# Hardware Monitoring support 664# Multifunction device drivers
678# 665#
679# CONFIG_HWMON is not set 666# CONFIG_MFD_SM501 is not set
680# CONFIG_HWMON_VID is not set
681 667
682# 668#
683# Multimedia devices 669# Multimedia devices
684# 670#
685# CONFIG_VIDEO_DEV is not set 671# CONFIG_VIDEO_DEV is not set
672# CONFIG_DVB_CORE is not set
673CONFIG_DAB=y
686 674
687# 675#
688# Digital Video Broadcasting Devices 676# Graphics support
689# 677#
690# CONFIG_DVB is not set 678# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
691 679
692# 680#
693# Graphics support 681# Display device support
694# 682#
695CONFIG_FIRMWARE_EDID=y 683# CONFIG_DISPLAY_SUPPORT is not set
684# CONFIG_VGASTATE is not set
696# CONFIG_FB is not set 685# CONFIG_FB is not set
697# CONFIG_FB_IBM_GXT4500 is not set 686# CONFIG_FB_IBM_GXT4500 is not set
698 687
@@ -702,7 +691,6 @@ CONFIG_FIRMWARE_EDID=y
702CONFIG_VGA_CONSOLE=y 691CONFIG_VGA_CONSOLE=y
703# CONFIG_VGACON_SOFT_SCROLLBACK is not set 692# CONFIG_VGACON_SOFT_SCROLLBACK is not set
704CONFIG_DUMMY_CONSOLE=y 693CONFIG_DUMMY_CONSOLE=y
705# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
706 694
707# 695#
708# Sound 696# Sound
@@ -713,6 +701,7 @@ CONFIG_DUMMY_CONSOLE=y
713# HID Devices 701# HID Devices
714# 702#
715CONFIG_HID=y 703CONFIG_HID=y
704# CONFIG_HID_DEBUG is not set
716 705
717# 706#
718# USB support 707# USB support
@@ -730,10 +719,6 @@ CONFIG_USB_ARCH_HAS_EHCI=y
730# USB Gadget Support 719# USB Gadget Support
731# 720#
732# CONFIG_USB_GADGET is not set 721# CONFIG_USB_GADGET is not set
733
734#
735# MMC/SD Card support
736#
737# CONFIG_MMC is not set 722# CONFIG_MMC is not set
738 723
739# 724#
@@ -777,10 +762,6 @@ CONFIG_USB_ARCH_HAS_EHCI=y
777# 762#
778 763
779# 764#
780# Virtualization
781#
782
783#
784# File systems 765# File systems
785# 766#
786CONFIG_EXT2_FS=y 767CONFIG_EXT2_FS=y
@@ -869,6 +850,7 @@ CONFIG_LOCKD_V4=y
869CONFIG_EXPORTFS=y 850CONFIG_EXPORTFS=y
870CONFIG_NFS_COMMON=y 851CONFIG_NFS_COMMON=y
871CONFIG_SUNRPC=y 852CONFIG_SUNRPC=y
853# CONFIG_SUNRPC_BIND34 is not set
872# CONFIG_RPCSEC_GSS_KRB5 is not set 854# CONFIG_RPCSEC_GSS_KRB5 is not set
873# CONFIG_RPCSEC_GSS_SPKM3 is not set 855# CONFIG_RPCSEC_GSS_SPKM3 is not set
874# CONFIG_SMB_FS is not set 856# CONFIG_SMB_FS is not set
@@ -899,6 +881,7 @@ CONFIG_LDM_PARTITION=y
899# CONFIG_SUN_PARTITION is not set 881# CONFIG_SUN_PARTITION is not set
900# CONFIG_KARMA_PARTITION is not set 882# CONFIG_KARMA_PARTITION is not set
901# CONFIG_EFI_PARTITION is not set 883# CONFIG_EFI_PARTITION is not set
884# CONFIG_SYSV68_PARTITION is not set
902 885
903# 886#
904# Native Language Support 887# Native Language Support
@@ -948,6 +931,7 @@ CONFIG_NLS_DEFAULT="iso8859-1"
948# Distributed Lock Manager 931# Distributed Lock Manager
949# 932#
950# CONFIG_DLM is not set 933# CONFIG_DLM is not set
934# CONFIG_UCC_SLOW is not set
951 935
952# 936#
953# Library routines 937# Library routines
@@ -955,10 +939,13 @@ CONFIG_NLS_DEFAULT="iso8859-1"
955CONFIG_BITREVERSE=y 939CONFIG_BITREVERSE=y
956# CONFIG_CRC_CCITT is not set 940# CONFIG_CRC_CCITT is not set
957# CONFIG_CRC16 is not set 941# CONFIG_CRC16 is not set
942# CONFIG_CRC_ITU_T is not set
958CONFIG_CRC32=y 943CONFIG_CRC32=y
959# CONFIG_LIBCRC32C is not set 944# CONFIG_LIBCRC32C is not set
960CONFIG_PLIST=y 945CONFIG_PLIST=y
961CONFIG_IOMAP_COPY=y 946CONFIG_HAS_IOMEM=y
947CONFIG_HAS_IOPORT=y
948CONFIG_HAS_DMA=y
962 949
963# 950#
964# Instrumentation Support 951# Instrumentation Support
@@ -975,15 +962,15 @@ CONFIG_ENABLE_MUST_CHECK=y
975# CONFIG_DEBUG_FS is not set 962# CONFIG_DEBUG_FS is not set
976# CONFIG_HEADERS_CHECK is not set 963# CONFIG_HEADERS_CHECK is not set
977CONFIG_DEBUG_KERNEL=y 964CONFIG_DEBUG_KERNEL=y
978CONFIG_LOG_BUF_SHIFT=14 965# CONFIG_DEBUG_SHIRQ is not set
979CONFIG_DETECT_SOFTLOCKUP=y 966CONFIG_DETECT_SOFTLOCKUP=y
980# CONFIG_SCHEDSTATS is not set 967# CONFIG_SCHEDSTATS is not set
968# CONFIG_TIMER_STATS is not set
981# CONFIG_DEBUG_SLAB is not set 969# CONFIG_DEBUG_SLAB is not set
982# CONFIG_DEBUG_RT_MUTEXES is not set 970# CONFIG_DEBUG_RT_MUTEXES is not set
983# CONFIG_RT_MUTEX_TESTER is not set 971# CONFIG_RT_MUTEX_TESTER is not set
984# CONFIG_DEBUG_SPINLOCK is not set 972# CONFIG_DEBUG_SPINLOCK is not set
985# CONFIG_DEBUG_MUTEXES is not set 973# CONFIG_DEBUG_MUTEXES is not set
986# CONFIG_DEBUG_RWSEMS is not set
987# CONFIG_DEBUG_SPINLOCK_SLEEP is not set 974# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
988# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set 975# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
989# CONFIG_DEBUG_KOBJECT is not set 976# CONFIG_DEBUG_KOBJECT is not set
@@ -993,7 +980,10 @@ CONFIG_DETECT_SOFTLOCKUP=y
993# CONFIG_DEBUG_VM is not set 980# CONFIG_DEBUG_VM is not set
994# CONFIG_DEBUG_LIST is not set 981# CONFIG_DEBUG_LIST is not set
995CONFIG_FORCED_INLINING=y 982CONFIG_FORCED_INLINING=y
996# CONFIG_RCU_TORTURE_TEST is not set 983# CONFIG_FAULT_INJECTION is not set
984# CONFIG_DEBUG_STACKOVERFLOW is not set
985# CONFIG_DEBUG_STACK_USAGE is not set
986# CONFIG_DEBUG_PAGEALLOC is not set
997# CONFIG_DEBUGGER is not set 987# CONFIG_DEBUGGER is not set
998# CONFIG_BDI_SWITCH is not set 988# CONFIG_BDI_SWITCH is not set
999# CONFIG_BOOTX_TEXT is not set 989# CONFIG_BOOTX_TEXT is not set
diff --git a/arch/powerpc/configs/mpc866_ads_defconfig b/arch/powerpc/configs/mpc866_ads_defconfig
index 539d9e3d3668..e6b18ea8f643 100644
--- a/arch/powerpc/configs/mpc866_ads_defconfig
+++ b/arch/powerpc/configs/mpc866_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.19-rc6 3# Linux kernel version: 2.6.22-rc7
4# Fri Nov 24 21:13:55 2006 4# Sun Jul 1 23:57:00 2007
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7CONFIG_PPC32=y 7CONFIG_PPC32=y
@@ -10,6 +10,7 @@ CONFIG_MMU=y
10CONFIG_GENERIC_HARDIRQS=y 10CONFIG_GENERIC_HARDIRQS=y
11CONFIG_IRQ_PER_CPU=y 11CONFIG_IRQ_PER_CPU=y
12CONFIG_RWSEM_XCHGADD_ALGORITHM=y 12CONFIG_RWSEM_XCHGADD_ALGORITHM=y
13CONFIG_ARCH_HAS_ILOG2_U32=y
13CONFIG_GENERIC_HWEIGHT=y 14CONFIG_GENERIC_HWEIGHT=y
14CONFIG_GENERIC_CALIBRATE_DELAY=y 15CONFIG_GENERIC_CALIBRATE_DELAY=y
15CONFIG_GENERIC_FIND_NEXT_BIT=y 16CONFIG_GENERIC_FIND_NEXT_BIT=y
@@ -28,7 +29,6 @@ CONFIG_AUDIT_ARCH=y
28# Processor support 29# Processor support
29# 30#
30# CONFIG_CLASSIC32 is not set 31# CONFIG_CLASSIC32 is not set
31# CONFIG_PPC_52xx is not set
32# CONFIG_PPC_82xx is not set 32# CONFIG_PPC_82xx is not set
33# CONFIG_PPC_83xx is not set 33# CONFIG_PPC_83xx is not set
34# CONFIG_PPC_85xx is not set 34# CONFIG_PPC_85xx is not set
@@ -40,6 +40,7 @@ CONFIG_PPC_8xx=y
40CONFIG_8xx=y 40CONFIG_8xx=y
41# CONFIG_PPC_DCR_NATIVE is not set 41# CONFIG_PPC_DCR_NATIVE is not set
42# CONFIG_PPC_DCR_MMIO is not set 42# CONFIG_PPC_DCR_MMIO is not set
43# CONFIG_PPC_MM_SLICES is not set
43CONFIG_NOT_COHERENT_CACHE=y 44CONFIG_NOT_COHERENT_CACHE=y
44CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 45CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
45 46
@@ -58,14 +59,17 @@ CONFIG_LOCALVERSION_AUTO=y
58# CONFIG_SWAP is not set 59# CONFIG_SWAP is not set
59CONFIG_SYSVIPC=y 60CONFIG_SYSVIPC=y
60# CONFIG_IPC_NS is not set 61# CONFIG_IPC_NS is not set
62CONFIG_SYSVIPC_SYSCTL=y
61# CONFIG_POSIX_MQUEUE is not set 63# CONFIG_POSIX_MQUEUE is not set
62# CONFIG_BSD_PROCESS_ACCT is not set 64# CONFIG_BSD_PROCESS_ACCT is not set
63# CONFIG_TASKSTATS is not set 65# CONFIG_TASKSTATS is not set
64# CONFIG_UTS_NS is not set 66# CONFIG_UTS_NS is not set
65# CONFIG_AUDIT is not set 67# CONFIG_AUDIT is not set
66# CONFIG_IKCONFIG is not set 68# CONFIG_IKCONFIG is not set
69CONFIG_LOG_BUF_SHIFT=14
70CONFIG_SYSFS_DEPRECATED=y
67# CONFIG_RELAY is not set 71# CONFIG_RELAY is not set
68CONFIG_INITRAMFS_SOURCE="" 72# CONFIG_BLK_DEV_INITRD is not set
69# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 73# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
70CONFIG_SYSCTL=y 74CONFIG_SYSCTL=y
71CONFIG_EMBEDDED=y 75CONFIG_EMBEDDED=y
@@ -78,14 +82,19 @@ CONFIG_PRINTK=y
78CONFIG_ELF_CORE=y 82CONFIG_ELF_CORE=y
79# CONFIG_BASE_FULL is not set 83# CONFIG_BASE_FULL is not set
80CONFIG_FUTEX=y 84CONFIG_FUTEX=y
85CONFIG_ANON_INODES=y
81# CONFIG_EPOLL is not set 86# CONFIG_EPOLL is not set
87CONFIG_SIGNALFD=y
88CONFIG_TIMERFD=y
89CONFIG_EVENTFD=y
82CONFIG_SHMEM=y 90CONFIG_SHMEM=y
83CONFIG_SLAB=y
84# CONFIG_VM_EVENT_COUNTERS is not set 91# CONFIG_VM_EVENT_COUNTERS is not set
92CONFIG_SLAB=y
93# CONFIG_SLUB is not set
94# CONFIG_SLOB is not set
85CONFIG_RT_MUTEXES=y 95CONFIG_RT_MUTEXES=y
86# CONFIG_TINY_SHMEM is not set 96# CONFIG_TINY_SHMEM is not set
87CONFIG_BASE_SMALL=1 97CONFIG_BASE_SMALL=1
88# CONFIG_SLOB is not set
89 98
90# 99#
91# Loadable module support 100# Loadable module support
@@ -112,13 +121,14 @@ CONFIG_DEFAULT_AS=y
112# CONFIG_DEFAULT_CFQ is not set 121# CONFIG_DEFAULT_CFQ is not set
113# CONFIG_DEFAULT_NOOP is not set 122# CONFIG_DEFAULT_NOOP is not set
114CONFIG_DEFAULT_IOSCHED="anticipatory" 123CONFIG_DEFAULT_IOSCHED="anticipatory"
115# CONFIG_WANT_EARLY_SERIAL is not set
116CONFIG_EMBEDDEDBOOT=y
117# CONFIG_MPIC is not set
118 124
119# 125#
120# Platform support 126# Platform support
121# 127#
128# CONFIG_PPC_MPC52xx is not set
129# CONFIG_PPC_MPC5200 is not set
130# CONFIG_PPC_CELL is not set
131# CONFIG_PPC_CELL_NATIVE is not set
122CONFIG_CPM1=y 132CONFIG_CPM1=y
123# CONFIG_MPC8XXFADS is not set 133# CONFIG_MPC8XXFADS is not set
124CONFIG_MPC86XADS=y 134CONFIG_MPC86XADS=y
@@ -137,6 +147,18 @@ CONFIG_NO_UCODE_PATCH=y
137# CONFIG_USB_SOF_UCODE_PATCH is not set 147# CONFIG_USB_SOF_UCODE_PATCH is not set
138# CONFIG_I2C_SPI_UCODE_PATCH is not set 148# CONFIG_I2C_SPI_UCODE_PATCH is not set
139# CONFIG_I2C_SPI_SMC1_UCODE_PATCH is not set 149# CONFIG_I2C_SPI_SMC1_UCODE_PATCH is not set
150# CONFIG_PQ2ADS is not set
151# CONFIG_MPIC is not set
152# CONFIG_MPIC_WEIRD is not set
153# CONFIG_PPC_I8259 is not set
154# CONFIG_PPC_RTAS is not set
155# CONFIG_MMIO_NVRAM is not set
156# CONFIG_PPC_MPC106 is not set
157# CONFIG_PPC_970_NAP is not set
158# CONFIG_PPC_INDIRECT_IO is not set
159# CONFIG_GENERIC_IOMAP is not set
160# CONFIG_CPU_FREQ is not set
161# CONFIG_CPM2 is not set
140 162
141# 163#
142# Kernel options 164# Kernel options
@@ -144,6 +166,7 @@ CONFIG_NO_UCODE_PATCH=y
144# CONFIG_HIGHMEM is not set 166# CONFIG_HIGHMEM is not set
145# CONFIG_HZ_100 is not set 167# CONFIG_HZ_100 is not set
146# CONFIG_HZ_250 is not set 168# CONFIG_HZ_250 is not set
169# CONFIG_HZ_300 is not set
147CONFIG_HZ_1000=y 170CONFIG_HZ_1000=y
148CONFIG_HZ=1000 171CONFIG_HZ=1000
149CONFIG_PREEMPT_NONE=y 172CONFIG_PREEMPT_NONE=y
@@ -164,31 +187,29 @@ CONFIG_FLAT_NODE_MEM_MAP=y
164# CONFIG_SPARSEMEM_STATIC is not set 187# CONFIG_SPARSEMEM_STATIC is not set
165CONFIG_SPLIT_PTLOCK_CPUS=4 188CONFIG_SPLIT_PTLOCK_CPUS=4
166# CONFIG_RESOURCES_64BIT is not set 189# CONFIG_RESOURCES_64BIT is not set
190CONFIG_ZONE_DMA_FLAG=1
167# CONFIG_PROC_DEVICETREE is not set 191# CONFIG_PROC_DEVICETREE is not set
168# CONFIG_CMDLINE_BOOL is not set 192# CONFIG_CMDLINE_BOOL is not set
169# CONFIG_PM is not set 193# CONFIG_PM is not set
170# CONFIG_SECCOMP is not set 194# CONFIG_SECCOMP is not set
195# CONFIG_WANT_DEVICE_TREE is not set
171CONFIG_ISA_DMA_API=y 196CONFIG_ISA_DMA_API=y
172 197
173# 198#
174# Bus options 199# Bus options
175# 200#
176# CONFIG_MPIC_WEIRD is not set 201CONFIG_ZONE_DMA=y
177# CONFIG_PPC_I8259 is not set
178CONFIG_FSL_SOC=y 202CONFIG_FSL_SOC=y
179# CONFIG_PCI is not set 203# CONFIG_PCI is not set
180# CONFIG_PCI_DOMAINS is not set 204# CONFIG_PCI_DOMAINS is not set
181# CONFIG_PCI_QSPAN is not set 205# CONFIG_PCI_QSPAN is not set
206# CONFIG_ARCH_SUPPORTS_MSI is not set
182 207
183# 208#
184# PCCARD (PCMCIA/CardBus) support 209# PCCARD (PCMCIA/CardBus) support
185# 210#
186 211
187# 212#
188# PCI Hotplug Support
189#
190
191#
192# Advanced setup 213# Advanced setup
193# 214#
194# CONFIG_ADVANCED_OPTIONS is not set 215# CONFIG_ADVANCED_OPTIONS is not set
@@ -212,13 +233,13 @@ CONFIG_NET=y
212# 233#
213# Networking options 234# Networking options
214# 235#
215# CONFIG_NETDEBUG is not set
216CONFIG_PACKET=y 236CONFIG_PACKET=y
217# CONFIG_PACKET_MMAP is not set 237# CONFIG_PACKET_MMAP is not set
218CONFIG_UNIX=y 238CONFIG_UNIX=y
219CONFIG_XFRM=y 239CONFIG_XFRM=y
220# CONFIG_XFRM_USER is not set 240# CONFIG_XFRM_USER is not set
221# CONFIG_XFRM_SUB_POLICY is not set 241# CONFIG_XFRM_SUB_POLICY is not set
242# CONFIG_XFRM_MIGRATE is not set
222# CONFIG_NET_KEY is not set 243# CONFIG_NET_KEY is not set
223CONFIG_INET=y 244CONFIG_INET=y
224CONFIG_IP_MULTICAST=y 245CONFIG_IP_MULTICAST=y
@@ -246,25 +267,14 @@ CONFIG_INET_TCP_DIAG=y
246# CONFIG_TCP_CONG_ADVANCED is not set 267# CONFIG_TCP_CONG_ADVANCED is not set
247CONFIG_TCP_CONG_CUBIC=y 268CONFIG_TCP_CONG_CUBIC=y
248CONFIG_DEFAULT_TCP_CONG="cubic" 269CONFIG_DEFAULT_TCP_CONG="cubic"
270# CONFIG_TCP_MD5SIG is not set
249# CONFIG_IPV6 is not set 271# CONFIG_IPV6 is not set
250# CONFIG_INET6_XFRM_TUNNEL is not set 272# CONFIG_INET6_XFRM_TUNNEL is not set
251# CONFIG_INET6_TUNNEL is not set 273# CONFIG_INET6_TUNNEL is not set
252# CONFIG_NETWORK_SECMARK is not set 274# CONFIG_NETWORK_SECMARK is not set
253# CONFIG_NETFILTER is not set 275# CONFIG_NETFILTER is not set
254
255#
256# DCCP Configuration (EXPERIMENTAL)
257#
258# CONFIG_IP_DCCP is not set 276# CONFIG_IP_DCCP is not set
259
260#
261# SCTP Configuration (EXPERIMENTAL)
262#
263# CONFIG_IP_SCTP is not set 277# CONFIG_IP_SCTP is not set
264
265#
266# TIPC Configuration (EXPERIMENTAL)
267#
268# CONFIG_TIPC is not set 278# CONFIG_TIPC is not set
269# CONFIG_ATM is not set 279# CONFIG_ATM is not set
270# CONFIG_BRIDGE is not set 280# CONFIG_BRIDGE is not set
@@ -290,7 +300,16 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
290# CONFIG_HAMRADIO is not set 300# CONFIG_HAMRADIO is not set
291# CONFIG_IRDA is not set 301# CONFIG_IRDA is not set
292# CONFIG_BT is not set 302# CONFIG_BT is not set
303# CONFIG_AF_RXRPC is not set
304
305#
306# Wireless
307#
308# CONFIG_CFG80211 is not set
309# CONFIG_WIRELESS_EXT is not set
310# CONFIG_MAC80211 is not set
293# CONFIG_IEEE80211 is not set 311# CONFIG_IEEE80211 is not set
312# CONFIG_RFKILL is not set
294 313
295# 314#
296# Device Drivers 315# Device Drivers
@@ -307,10 +326,6 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y
307# Connector - unified userspace <-> kernelspace linker 326# Connector - unified userspace <-> kernelspace linker
308# 327#
309# CONFIG_CONNECTOR is not set 328# CONFIG_CONNECTOR is not set
310
311#
312# Memory Technology Devices (MTD)
313#
314# CONFIG_MTD is not set 329# CONFIG_MTD is not set
315 330
316# 331#
@@ -321,6 +336,7 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y
321# 336#
322# Plug and Play support 337# Plug and Play support
323# 338#
339# CONFIG_PNPACPI is not set
324 340
325# 341#
326# Block devices 342# Block devices
@@ -331,18 +347,13 @@ CONFIG_BLK_DEV_LOOP=y
331# CONFIG_BLK_DEV_CRYPTOLOOP is not set 347# CONFIG_BLK_DEV_CRYPTOLOOP is not set
332# CONFIG_BLK_DEV_NBD is not set 348# CONFIG_BLK_DEV_NBD is not set
333# CONFIG_BLK_DEV_RAM is not set 349# CONFIG_BLK_DEV_RAM is not set
334# CONFIG_BLK_DEV_INITRD is not set
335# CONFIG_CDROM_PKTCDVD is not set 350# CONFIG_CDROM_PKTCDVD is not set
336# CONFIG_ATA_OVER_ETH is not set 351# CONFIG_ATA_OVER_ETH is not set
337 352
338# 353#
339# Misc devices 354# Misc devices
340# 355#
341# CONFIG_TIFM_CORE is not set 356# CONFIG_BLINK is not set
342
343#
344# ATA/ATAPI/MFM/RLL support
345#
346# CONFIG_IDE is not set 357# CONFIG_IDE is not set
347 358
348# 359#
@@ -351,34 +362,13 @@ CONFIG_BLK_DEV_LOOP=y
351# CONFIG_RAID_ATTRS is not set 362# CONFIG_RAID_ATTRS is not set
352# CONFIG_SCSI is not set 363# CONFIG_SCSI is not set
353# CONFIG_SCSI_NETLINK is not set 364# CONFIG_SCSI_NETLINK is not set
354
355#
356# Serial ATA (prod) and Parallel ATA (experimental) drivers
357#
358# CONFIG_ATA is not set 365# CONFIG_ATA is not set
359 366
360# 367#
361# Multi-device support (RAID and LVM) 368# Multi-device support (RAID and LVM)
362# 369#
363# CONFIG_MD is not set 370# CONFIG_MD is not set
364 371# CONFIG_MACINTOSH_DRIVERS is not set
365#
366# Fusion MPT device support
367#
368# CONFIG_FUSION is not set
369
370#
371# IEEE 1394 (FireWire) support
372#
373
374#
375# I2O device support
376#
377
378#
379# Macintosh device drivers
380#
381# CONFIG_WINDFARM is not set
382 372
383# 373#
384# Network device support 374# Network device support
@@ -388,10 +378,6 @@ CONFIG_NETDEVICES=y
388# CONFIG_BONDING is not set 378# CONFIG_BONDING is not set
389# CONFIG_EQUALIZER is not set 379# CONFIG_EQUALIZER is not set
390# CONFIG_TUN is not set 380# CONFIG_TUN is not set
391
392#
393# PHY device support
394#
395CONFIG_PHYLIB=y 381CONFIG_PHYLIB=y
396 382
397# 383#
@@ -404,6 +390,7 @@ CONFIG_PHYLIB=y
404# CONFIG_CICADA_PHY is not set 390# CONFIG_CICADA_PHY is not set
405# CONFIG_VITESSE_PHY is not set 391# CONFIG_VITESSE_PHY is not set
406# CONFIG_SMSC_PHY is not set 392# CONFIG_SMSC_PHY is not set
393# CONFIG_BROADCOM_PHY is not set
407CONFIG_FIXED_PHY=y 394CONFIG_FIXED_PHY=y
408CONFIG_FIXED_MII_10_FDX=y 395CONFIG_FIXED_MII_10_FDX=y
409CONFIG_FIXED_MII_100_FDX=y 396CONFIG_FIXED_MII_100_FDX=y
@@ -417,27 +404,14 @@ CONFIG_MII=y
417CONFIG_FS_ENET=y 404CONFIG_FS_ENET=y
418CONFIG_FS_ENET_HAS_SCC=y 405CONFIG_FS_ENET_HAS_SCC=y
419CONFIG_FS_ENET_HAS_FEC=y 406CONFIG_FS_ENET_HAS_FEC=y
407CONFIG_NETDEV_1000=y
408CONFIG_NETDEV_10000=y
420 409
421# 410#
422# Ethernet (1000 Mbit) 411# Wireless LAN
423#
424
425#
426# Ethernet (10000 Mbit)
427#
428
429#
430# Token Ring devices
431#
432
433#
434# Wireless LAN (non-hamradio)
435#
436# CONFIG_NET_RADIO is not set
437
438#
439# Wan interfaces
440# 412#
413# CONFIG_WLAN_PRE80211 is not set
414# CONFIG_WLAN_80211 is not set
441# CONFIG_WAN is not set 415# CONFIG_WAN is not set
442# CONFIG_PPP is not set 416# CONFIG_PPP is not set
443# CONFIG_SLIP is not set 417# CONFIG_SLIP is not set
@@ -461,6 +435,7 @@ CONFIG_FS_ENET_HAS_FEC=y
461# 435#
462CONFIG_INPUT=y 436CONFIG_INPUT=y
463# CONFIG_INPUT_FF_MEMLESS is not set 437# CONFIG_INPUT_FF_MEMLESS is not set
438# CONFIG_INPUT_POLLDEV is not set
464 439
465# 440#
466# Userland interfaces 441# Userland interfaces
@@ -486,9 +461,16 @@ CONFIG_KEYBOARD_ATKBD=y
486# CONFIG_KEYBOARD_STOWAWAY is not set 461# CONFIG_KEYBOARD_STOWAWAY is not set
487CONFIG_INPUT_MOUSE=y 462CONFIG_INPUT_MOUSE=y
488CONFIG_MOUSE_PS2=y 463CONFIG_MOUSE_PS2=y
464CONFIG_MOUSE_PS2_ALPS=y
465CONFIG_MOUSE_PS2_LOGIPS2PP=y
466CONFIG_MOUSE_PS2_SYNAPTICS=y
467CONFIG_MOUSE_PS2_LIFEBOOK=y
468CONFIG_MOUSE_PS2_TRACKPOINT=y
469# CONFIG_MOUSE_PS2_TOUCHKIT is not set
489# CONFIG_MOUSE_SERIAL is not set 470# CONFIG_MOUSE_SERIAL is not set
490# CONFIG_MOUSE_VSXXXAA is not set 471# CONFIG_MOUSE_VSXXXAA is not set
491# CONFIG_INPUT_JOYSTICK is not set 472# CONFIG_INPUT_JOYSTICK is not set
473# CONFIG_INPUT_TABLET is not set
492# CONFIG_INPUT_TOUCHSCREEN is not set 474# CONFIG_INPUT_TOUCHSCREEN is not set
493# CONFIG_INPUT_MISC is not set 475# CONFIG_INPUT_MISC is not set
494 476
@@ -516,6 +498,7 @@ CONFIG_SERIO_LIBPS2=y
516# 498#
517# Non-8250 serial port support 499# Non-8250 serial port support
518# 500#
501# CONFIG_SERIAL_UARTLITE is not set
519CONFIG_SERIAL_CORE=y 502CONFIG_SERIAL_CORE=y
520CONFIG_SERIAL_CORE_CONSOLE=y 503CONFIG_SERIAL_CORE_CONSOLE=y
521CONFIG_SERIAL_CPM=y 504CONFIG_SERIAL_CPM=y
@@ -533,31 +516,18 @@ CONFIG_UNIX98_PTYS=y
533# IPMI 516# IPMI
534# 517#
535# CONFIG_IPMI_HANDLER is not set 518# CONFIG_IPMI_HANDLER is not set
536
537#
538# Watchdog Cards
539#
540# CONFIG_WATCHDOG is not set 519# CONFIG_WATCHDOG is not set
541CONFIG_HW_RANDOM=y 520CONFIG_HW_RANDOM=y
542# CONFIG_NVRAM is not set 521# CONFIG_NVRAM is not set
543CONFIG_GEN_RTC=y 522CONFIG_GEN_RTC=y
544# CONFIG_GEN_RTC_X is not set 523# CONFIG_GEN_RTC_X is not set
545# CONFIG_DTLK is not set
546# CONFIG_R3964 is not set 524# CONFIG_R3964 is not set
547
548#
549# Ftape, the floppy tape device driver
550#
551# CONFIG_RAW_DRIVER is not set 525# CONFIG_RAW_DRIVER is not set
552 526
553# 527#
554# TPM devices 528# TPM devices
555# 529#
556# CONFIG_TCG_TPM is not set 530# CONFIG_TCG_TPM is not set
557
558#
559# I2C support
560#
561# CONFIG_I2C is not set 531# CONFIG_I2C is not set
562 532
563# 533#
@@ -570,33 +540,41 @@ CONFIG_GEN_RTC=y
570# Dallas's 1-wire bus 540# Dallas's 1-wire bus
571# 541#
572# CONFIG_W1 is not set 542# CONFIG_W1 is not set
573
574#
575# Hardware Monitoring support
576#
577CONFIG_HWMON=y 543CONFIG_HWMON=y
578# CONFIG_HWMON_VID is not set 544# CONFIG_HWMON_VID is not set
579# CONFIG_SENSORS_ABITUGURU is not set 545# CONFIG_SENSORS_ABITUGURU is not set
580# CONFIG_SENSORS_F71805F is not set 546# CONFIG_SENSORS_F71805F is not set
547# CONFIG_SENSORS_PC87427 is not set
548# CONFIG_SENSORS_SMSC47M1 is not set
549# CONFIG_SENSORS_SMSC47B397 is not set
581# CONFIG_SENSORS_VT1211 is not set 550# CONFIG_SENSORS_VT1211 is not set
551# CONFIG_SENSORS_W83627HF is not set
582# CONFIG_HWMON_DEBUG_CHIP is not set 552# CONFIG_HWMON_DEBUG_CHIP is not set
583 553
584# 554#
555# Multifunction device drivers
556#
557# CONFIG_MFD_SM501 is not set
558
559#
585# Multimedia devices 560# Multimedia devices
586# 561#
587# CONFIG_VIDEO_DEV is not set 562# CONFIG_VIDEO_DEV is not set
563# CONFIG_DVB_CORE is not set
564CONFIG_DAB=y
588 565
589# 566#
590# Digital Video Broadcasting Devices 567# Graphics support
591# 568#
592# CONFIG_DVB is not set 569# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
593 570
594# 571#
595# Graphics support 572# Display device support
596# 573#
597CONFIG_FIRMWARE_EDID=y 574# CONFIG_DISPLAY_SUPPORT is not set
575# CONFIG_VGASTATE is not set
598# CONFIG_FB is not set 576# CONFIG_FB is not set
599# CONFIG_BACKLIGHT_LCD_SUPPORT is not set 577# CONFIG_FB_IBM_GXT4500 is not set
600 578
601# 579#
602# Sound 580# Sound
@@ -604,6 +582,12 @@ CONFIG_FIRMWARE_EDID=y
604# CONFIG_SOUND is not set 582# CONFIG_SOUND is not set
605 583
606# 584#
585# HID Devices
586#
587CONFIG_HID=y
588# CONFIG_HID_DEBUG is not set
589
590#
607# USB support 591# USB support
608# 592#
609# CONFIG_USB_ARCH_HAS_HCD is not set 593# CONFIG_USB_ARCH_HAS_HCD is not set
@@ -618,10 +602,6 @@ CONFIG_FIRMWARE_EDID=y
618# USB Gadget Support 602# USB Gadget Support
619# 603#
620# CONFIG_USB_GADGET is not set 604# CONFIG_USB_GADGET is not set
621
622#
623# MMC/SD Card support
624#
625# CONFIG_MMC is not set 605# CONFIG_MMC is not set
626 606
627# 607#
@@ -752,6 +732,7 @@ CONFIG_LOCKD=y
752CONFIG_LOCKD_V4=y 732CONFIG_LOCKD_V4=y
753CONFIG_NFS_COMMON=y 733CONFIG_NFS_COMMON=y
754CONFIG_SUNRPC=y 734CONFIG_SUNRPC=y
735# CONFIG_SUNRPC_BIND34 is not set
755# CONFIG_RPCSEC_GSS_KRB5 is not set 736# CONFIG_RPCSEC_GSS_KRB5 is not set
756# CONFIG_RPCSEC_GSS_SPKM3 is not set 737# CONFIG_RPCSEC_GSS_SPKM3 is not set
757# CONFIG_SMB_FS is not set 738# CONFIG_SMB_FS is not set
@@ -781,6 +762,7 @@ CONFIG_MSDOS_PARTITION=y
781# CONFIG_SUN_PARTITION is not set 762# CONFIG_SUN_PARTITION is not set
782# CONFIG_KARMA_PARTITION is not set 763# CONFIG_KARMA_PARTITION is not set
783# CONFIG_EFI_PARTITION is not set 764# CONFIG_EFI_PARTITION is not set
765# CONFIG_SYSV68_PARTITION is not set
784 766
785# 767#
786# Native Language Support 768# Native Language Support
@@ -788,14 +770,25 @@ CONFIG_MSDOS_PARTITION=y
788# CONFIG_NLS is not set 770# CONFIG_NLS is not set
789 771
790# 772#
773# Distributed Lock Manager
774#
775# CONFIG_DLM is not set
776# CONFIG_UCC_SLOW is not set
777
778#
791# Library routines 779# Library routines
792# 780#
781CONFIG_BITREVERSE=y
793CONFIG_CRC_CCITT=y 782CONFIG_CRC_CCITT=y
794# CONFIG_CRC16 is not set 783# CONFIG_CRC16 is not set
784# CONFIG_CRC_ITU_T is not set
795CONFIG_CRC32=y 785CONFIG_CRC32=y
796# CONFIG_LIBCRC32C is not set 786# CONFIG_LIBCRC32C is not set
797CONFIG_ZLIB_INFLATE=y 787CONFIG_ZLIB_INFLATE=y
798CONFIG_PLIST=y 788CONFIG_PLIST=y
789CONFIG_HAS_IOMEM=y
790CONFIG_HAS_IOPORT=y
791CONFIG_HAS_DMA=y
799 792
800# 793#
801# Instrumentation Support 794# Instrumentation Support
@@ -809,11 +802,9 @@ CONFIG_PLIST=y
809CONFIG_ENABLE_MUST_CHECK=y 802CONFIG_ENABLE_MUST_CHECK=y
810# CONFIG_MAGIC_SYSRQ is not set 803# CONFIG_MAGIC_SYSRQ is not set
811# CONFIG_UNUSED_SYMBOLS is not set 804# CONFIG_UNUSED_SYMBOLS is not set
812# CONFIG_DEBUG_KERNEL is not set
813CONFIG_LOG_BUF_SHIFT=14
814# CONFIG_DEBUG_FS is not set 805# CONFIG_DEBUG_FS is not set
815# CONFIG_UNWIND_INFO is not set
816# CONFIG_HEADERS_CHECK is not set 806# CONFIG_HEADERS_CHECK is not set
807# CONFIG_DEBUG_KERNEL is not set
817# CONFIG_BOOTX_TEXT is not set 808# CONFIG_BOOTX_TEXT is not set
818# CONFIG_PPC_EARLY_DEBUG is not set 809# CONFIG_PPC_EARLY_DEBUG is not set
819 810
diff --git a/arch/powerpc/configs/mpc885_ads_defconfig b/arch/powerpc/configs/mpc885_ads_defconfig
index e2c17d8da4fc..fc4f9b766aa7 100644
--- a/arch/powerpc/configs/mpc885_ads_defconfig
+++ b/arch/powerpc/configs/mpc885_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.19-rc4 3# Linux kernel version: 2.6.22-rc7
4# Fri Nov 10 21:30:40 2006 4# Sun Jul 1 23:57:01 2007
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7CONFIG_PPC32=y 7CONFIG_PPC32=y
@@ -10,6 +10,7 @@ CONFIG_MMU=y
10CONFIG_GENERIC_HARDIRQS=y 10CONFIG_GENERIC_HARDIRQS=y
11CONFIG_IRQ_PER_CPU=y 11CONFIG_IRQ_PER_CPU=y
12CONFIG_RWSEM_XCHGADD_ALGORITHM=y 12CONFIG_RWSEM_XCHGADD_ALGORITHM=y
13CONFIG_ARCH_HAS_ILOG2_U32=y
13CONFIG_GENERIC_HWEIGHT=y 14CONFIG_GENERIC_HWEIGHT=y
14CONFIG_GENERIC_CALIBRATE_DELAY=y 15CONFIG_GENERIC_CALIBRATE_DELAY=y
15CONFIG_GENERIC_FIND_NEXT_BIT=y 16CONFIG_GENERIC_FIND_NEXT_BIT=y
@@ -28,7 +29,6 @@ CONFIG_AUDIT_ARCH=y
28# Processor support 29# Processor support
29# 30#
30# CONFIG_CLASSIC32 is not set 31# CONFIG_CLASSIC32 is not set
31# CONFIG_PPC_52xx is not set
32# CONFIG_PPC_82xx is not set 32# CONFIG_PPC_82xx is not set
33# CONFIG_PPC_83xx is not set 33# CONFIG_PPC_83xx is not set
34# CONFIG_PPC_85xx is not set 34# CONFIG_PPC_85xx is not set
@@ -38,6 +38,9 @@ CONFIG_PPC_8xx=y
38# CONFIG_44x is not set 38# CONFIG_44x is not set
39# CONFIG_E200 is not set 39# CONFIG_E200 is not set
40CONFIG_8xx=y 40CONFIG_8xx=y
41# CONFIG_PPC_DCR_NATIVE is not set
42# CONFIG_PPC_DCR_MMIO is not set
43# CONFIG_PPC_MM_SLICES is not set
41CONFIG_NOT_COHERENT_CACHE=y 44CONFIG_NOT_COHERENT_CACHE=y
42CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 45CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
43 46
@@ -56,14 +59,17 @@ CONFIG_LOCALVERSION_AUTO=y
56# CONFIG_SWAP is not set 59# CONFIG_SWAP is not set
57CONFIG_SYSVIPC=y 60CONFIG_SYSVIPC=y
58# CONFIG_IPC_NS is not set 61# CONFIG_IPC_NS is not set
62CONFIG_SYSVIPC_SYSCTL=y
59# CONFIG_POSIX_MQUEUE is not set 63# CONFIG_POSIX_MQUEUE is not set
60# CONFIG_BSD_PROCESS_ACCT is not set 64# CONFIG_BSD_PROCESS_ACCT is not set
61# CONFIG_TASKSTATS is not set 65# CONFIG_TASKSTATS is not set
62# CONFIG_UTS_NS is not set 66# CONFIG_UTS_NS is not set
63# CONFIG_AUDIT is not set 67# CONFIG_AUDIT is not set
64# CONFIG_IKCONFIG is not set 68# CONFIG_IKCONFIG is not set
69CONFIG_LOG_BUF_SHIFT=14
70CONFIG_SYSFS_DEPRECATED=y
65# CONFIG_RELAY is not set 71# CONFIG_RELAY is not set
66CONFIG_INITRAMFS_SOURCE="" 72# CONFIG_BLK_DEV_INITRD is not set
67# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 73# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
68CONFIG_SYSCTL=y 74CONFIG_SYSCTL=y
69CONFIG_EMBEDDED=y 75CONFIG_EMBEDDED=y
@@ -76,14 +82,19 @@ CONFIG_PRINTK=y
76CONFIG_ELF_CORE=y 82CONFIG_ELF_CORE=y
77# CONFIG_BASE_FULL is not set 83# CONFIG_BASE_FULL is not set
78CONFIG_FUTEX=y 84CONFIG_FUTEX=y
85CONFIG_ANON_INODES=y
79# CONFIG_EPOLL is not set 86# CONFIG_EPOLL is not set
87CONFIG_SIGNALFD=y
88CONFIG_TIMERFD=y
89CONFIG_EVENTFD=y
80CONFIG_SHMEM=y 90CONFIG_SHMEM=y
81CONFIG_SLAB=y
82# CONFIG_VM_EVENT_COUNTERS is not set 91# CONFIG_VM_EVENT_COUNTERS is not set
92CONFIG_SLAB=y
93# CONFIG_SLUB is not set
94# CONFIG_SLOB is not set
83CONFIG_RT_MUTEXES=y 95CONFIG_RT_MUTEXES=y
84# CONFIG_TINY_SHMEM is not set 96# CONFIG_TINY_SHMEM is not set
85CONFIG_BASE_SMALL=1 97CONFIG_BASE_SMALL=1
86# CONFIG_SLOB is not set
87 98
88# 99#
89# Loadable module support 100# Loadable module support
@@ -110,19 +121,27 @@ CONFIG_DEFAULT_AS=y
110# CONFIG_DEFAULT_CFQ is not set 121# CONFIG_DEFAULT_CFQ is not set
111# CONFIG_DEFAULT_NOOP is not set 122# CONFIG_DEFAULT_NOOP is not set
112CONFIG_DEFAULT_IOSCHED="anticipatory" 123CONFIG_DEFAULT_IOSCHED="anticipatory"
113# CONFIG_WANT_EARLY_SERIAL is not set
114CONFIG_EMBEDDEDBOOT=y
115# CONFIG_MPIC is not set
116 124
117# 125#
118# Platform support 126# Platform support
119# 127#
128# CONFIG_PPC_MPC52xx is not set
129# CONFIG_PPC_MPC5200 is not set
130# CONFIG_PPC_CELL is not set
131# CONFIG_PPC_CELL_NATIVE is not set
120CONFIG_CPM1=y 132CONFIG_CPM1=y
121# CONFIG_MPC8XXFADS is not set 133# CONFIG_MPC8XXFADS is not set
122# CONFIG_MPC86XADS is not set 134# CONFIG_MPC86XADS is not set
123CONFIG_MPC885ADS=y 135CONFIG_MPC885ADS=y
124 136
125# 137#
138# Freescale Ethernet driver platform-specific options
139#
140CONFIG_MPC8xx_SECOND_ETH=y
141CONFIG_MPC8xx_SECOND_ETH_FEC2=y
142# CONFIG_MPC8xx_SECOND_ETH_SCC3 is not set
143
144#
126# MPC8xx CPM Options 145# MPC8xx CPM Options
127# 146#
128 147
@@ -135,6 +154,18 @@ CONFIG_NO_UCODE_PATCH=y
135# CONFIG_USB_SOF_UCODE_PATCH is not set 154# CONFIG_USB_SOF_UCODE_PATCH is not set
136# CONFIG_I2C_SPI_UCODE_PATCH is not set 155# CONFIG_I2C_SPI_UCODE_PATCH is not set
137# CONFIG_I2C_SPI_SMC1_UCODE_PATCH is not set 156# CONFIG_I2C_SPI_SMC1_UCODE_PATCH is not set
157# CONFIG_PQ2ADS is not set
158# CONFIG_MPIC is not set
159# CONFIG_MPIC_WEIRD is not set
160# CONFIG_PPC_I8259 is not set
161# CONFIG_PPC_RTAS is not set
162# CONFIG_MMIO_NVRAM is not set
163# CONFIG_PPC_MPC106 is not set
164# CONFIG_PPC_970_NAP is not set
165# CONFIG_PPC_INDIRECT_IO is not set
166# CONFIG_GENERIC_IOMAP is not set
167# CONFIG_CPU_FREQ is not set
168# CONFIG_CPM2 is not set
138 169
139# 170#
140# Kernel options 171# Kernel options
@@ -142,6 +173,7 @@ CONFIG_NO_UCODE_PATCH=y
142# CONFIG_HIGHMEM is not set 173# CONFIG_HIGHMEM is not set
143# CONFIG_HZ_100 is not set 174# CONFIG_HZ_100 is not set
144# CONFIG_HZ_250 is not set 175# CONFIG_HZ_250 is not set
176# CONFIG_HZ_300 is not set
145CONFIG_HZ_1000=y 177CONFIG_HZ_1000=y
146CONFIG_HZ=1000 178CONFIG_HZ=1000
147CONFIG_PREEMPT_NONE=y 179CONFIG_PREEMPT_NONE=y
@@ -162,31 +194,29 @@ CONFIG_FLAT_NODE_MEM_MAP=y
162# CONFIG_SPARSEMEM_STATIC is not set 194# CONFIG_SPARSEMEM_STATIC is not set
163CONFIG_SPLIT_PTLOCK_CPUS=4 195CONFIG_SPLIT_PTLOCK_CPUS=4
164# CONFIG_RESOURCES_64BIT is not set 196# CONFIG_RESOURCES_64BIT is not set
197CONFIG_ZONE_DMA_FLAG=1
165# CONFIG_PROC_DEVICETREE is not set 198# CONFIG_PROC_DEVICETREE is not set
166# CONFIG_CMDLINE_BOOL is not set 199# CONFIG_CMDLINE_BOOL is not set
167# CONFIG_PM is not set 200# CONFIG_PM is not set
168# CONFIG_SECCOMP is not set 201# CONFIG_SECCOMP is not set
202# CONFIG_WANT_DEVICE_TREE is not set
169CONFIG_ISA_DMA_API=y 203CONFIG_ISA_DMA_API=y
170 204
171# 205#
172# Bus options 206# Bus options
173# 207#
174# CONFIG_MPIC_WEIRD is not set 208CONFIG_ZONE_DMA=y
175# CONFIG_PPC_I8259 is not set
176CONFIG_FSL_SOC=y 209CONFIG_FSL_SOC=y
177# CONFIG_PCI is not set 210# CONFIG_PCI is not set
178# CONFIG_PCI_DOMAINS is not set 211# CONFIG_PCI_DOMAINS is not set
179# CONFIG_PCI_QSPAN is not set 212# CONFIG_PCI_QSPAN is not set
213# CONFIG_ARCH_SUPPORTS_MSI is not set
180 214
181# 215#
182# PCCARD (PCMCIA/CardBus) support 216# PCCARD (PCMCIA/CardBus) support
183# 217#
184 218
185# 219#
186# PCI Hotplug Support
187#
188
189#
190# Advanced setup 220# Advanced setup
191# 221#
192# CONFIG_ADVANCED_OPTIONS is not set 222# CONFIG_ADVANCED_OPTIONS is not set
@@ -210,13 +240,13 @@ CONFIG_NET=y
210# 240#
211# Networking options 241# Networking options
212# 242#
213# CONFIG_NETDEBUG is not set
214CONFIG_PACKET=y 243CONFIG_PACKET=y
215# CONFIG_PACKET_MMAP is not set 244# CONFIG_PACKET_MMAP is not set
216CONFIG_UNIX=y 245CONFIG_UNIX=y
217CONFIG_XFRM=y 246CONFIG_XFRM=y
218# CONFIG_XFRM_USER is not set 247# CONFIG_XFRM_USER is not set
219# CONFIG_XFRM_SUB_POLICY is not set 248# CONFIG_XFRM_SUB_POLICY is not set
249# CONFIG_XFRM_MIGRATE is not set
220# CONFIG_NET_KEY is not set 250# CONFIG_NET_KEY is not set
221CONFIG_INET=y 251CONFIG_INET=y
222CONFIG_IP_MULTICAST=y 252CONFIG_IP_MULTICAST=y
@@ -244,25 +274,14 @@ CONFIG_INET_TCP_DIAG=y
244# CONFIG_TCP_CONG_ADVANCED is not set 274# CONFIG_TCP_CONG_ADVANCED is not set
245CONFIG_TCP_CONG_CUBIC=y 275CONFIG_TCP_CONG_CUBIC=y
246CONFIG_DEFAULT_TCP_CONG="cubic" 276CONFIG_DEFAULT_TCP_CONG="cubic"
277# CONFIG_TCP_MD5SIG is not set
247# CONFIG_IPV6 is not set 278# CONFIG_IPV6 is not set
248# CONFIG_INET6_XFRM_TUNNEL is not set 279# CONFIG_INET6_XFRM_TUNNEL is not set
249# CONFIG_INET6_TUNNEL is not set 280# CONFIG_INET6_TUNNEL is not set
250# CONFIG_NETWORK_SECMARK is not set 281# CONFIG_NETWORK_SECMARK is not set
251# CONFIG_NETFILTER is not set 282# CONFIG_NETFILTER is not set
252
253#
254# DCCP Configuration (EXPERIMENTAL)
255#
256# CONFIG_IP_DCCP is not set 283# CONFIG_IP_DCCP is not set
257
258#
259# SCTP Configuration (EXPERIMENTAL)
260#
261# CONFIG_IP_SCTP is not set 284# CONFIG_IP_SCTP is not set
262
263#
264# TIPC Configuration (EXPERIMENTAL)
265#
266# CONFIG_TIPC is not set 285# CONFIG_TIPC is not set
267# CONFIG_ATM is not set 286# CONFIG_ATM is not set
268# CONFIG_BRIDGE is not set 287# CONFIG_BRIDGE is not set
@@ -288,7 +307,16 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
288# CONFIG_HAMRADIO is not set 307# CONFIG_HAMRADIO is not set
289# CONFIG_IRDA is not set 308# CONFIG_IRDA is not set
290# CONFIG_BT is not set 309# CONFIG_BT is not set
310# CONFIG_AF_RXRPC is not set
311
312#
313# Wireless
314#
315# CONFIG_CFG80211 is not set
316# CONFIG_WIRELESS_EXT is not set
317# CONFIG_MAC80211 is not set
291# CONFIG_IEEE80211 is not set 318# CONFIG_IEEE80211 is not set
319# CONFIG_RFKILL is not set
292 320
293# 321#
294# Device Drivers 322# Device Drivers
@@ -305,10 +333,6 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y
305# Connector - unified userspace <-> kernelspace linker 333# Connector - unified userspace <-> kernelspace linker
306# 334#
307# CONFIG_CONNECTOR is not set 335# CONFIG_CONNECTOR is not set
308
309#
310# Memory Technology Devices (MTD)
311#
312# CONFIG_MTD is not set 336# CONFIG_MTD is not set
313 337
314# 338#
@@ -319,6 +343,7 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y
319# 343#
320# Plug and Play support 344# Plug and Play support
321# 345#
346# CONFIG_PNPACPI is not set
322 347
323# 348#
324# Block devices 349# Block devices
@@ -329,18 +354,13 @@ CONFIG_BLK_DEV_LOOP=y
329# CONFIG_BLK_DEV_CRYPTOLOOP is not set 354# CONFIG_BLK_DEV_CRYPTOLOOP is not set
330# CONFIG_BLK_DEV_NBD is not set 355# CONFIG_BLK_DEV_NBD is not set
331# CONFIG_BLK_DEV_RAM is not set 356# CONFIG_BLK_DEV_RAM is not set
332# CONFIG_BLK_DEV_INITRD is not set
333# CONFIG_CDROM_PKTCDVD is not set 357# CONFIG_CDROM_PKTCDVD is not set
334# CONFIG_ATA_OVER_ETH is not set 358# CONFIG_ATA_OVER_ETH is not set
335 359
336# 360#
337# Misc devices 361# Misc devices
338# 362#
339# CONFIG_TIFM_CORE is not set 363# CONFIG_BLINK is not set
340
341#
342# ATA/ATAPI/MFM/RLL support
343#
344# CONFIG_IDE is not set 364# CONFIG_IDE is not set
345 365
346# 366#
@@ -349,34 +369,13 @@ CONFIG_BLK_DEV_LOOP=y
349# CONFIG_RAID_ATTRS is not set 369# CONFIG_RAID_ATTRS is not set
350# CONFIG_SCSI is not set 370# CONFIG_SCSI is not set
351# CONFIG_SCSI_NETLINK is not set 371# CONFIG_SCSI_NETLINK is not set
352
353#
354# Serial ATA (prod) and Parallel ATA (experimental) drivers
355#
356# CONFIG_ATA is not set 372# CONFIG_ATA is not set
357 373
358# 374#
359# Multi-device support (RAID and LVM) 375# Multi-device support (RAID and LVM)
360# 376#
361# CONFIG_MD is not set 377# CONFIG_MD is not set
362 378# CONFIG_MACINTOSH_DRIVERS is not set
363#
364# Fusion MPT device support
365#
366# CONFIG_FUSION is not set
367
368#
369# IEEE 1394 (FireWire) support
370#
371
372#
373# I2O device support
374#
375
376#
377# Macintosh device drivers
378#
379# CONFIG_WINDFARM is not set
380 379
381# 380#
382# Network device support 381# Network device support
@@ -386,10 +385,6 @@ CONFIG_NETDEVICES=y
386# CONFIG_BONDING is not set 385# CONFIG_BONDING is not set
387# CONFIG_EQUALIZER is not set 386# CONFIG_EQUALIZER is not set
388# CONFIG_TUN is not set 387# CONFIG_TUN is not set
389
390#
391# PHY device support
392#
393CONFIG_PHYLIB=y 388CONFIG_PHYLIB=y
394 389
395# 390#
@@ -402,6 +397,7 @@ CONFIG_DAVICOM_PHY=y
402# CONFIG_CICADA_PHY is not set 397# CONFIG_CICADA_PHY is not set
403# CONFIG_VITESSE_PHY is not set 398# CONFIG_VITESSE_PHY is not set
404# CONFIG_SMSC_PHY is not set 399# CONFIG_SMSC_PHY is not set
400# CONFIG_BROADCOM_PHY is not set
405CONFIG_FIXED_PHY=y 401CONFIG_FIXED_PHY=y
406CONFIG_FIXED_MII_10_FDX=y 402CONFIG_FIXED_MII_10_FDX=y
407# CONFIG_FIXED_MII_100_FDX is not set 403# CONFIG_FIXED_MII_100_FDX is not set
@@ -415,27 +411,14 @@ CONFIG_MII=y
415CONFIG_FS_ENET=y 411CONFIG_FS_ENET=y
416CONFIG_FS_ENET_HAS_SCC=y 412CONFIG_FS_ENET_HAS_SCC=y
417CONFIG_FS_ENET_HAS_FEC=y 413CONFIG_FS_ENET_HAS_FEC=y
414CONFIG_NETDEV_1000=y
415CONFIG_NETDEV_10000=y
418 416
419# 417#
420# Ethernet (1000 Mbit) 418# Wireless LAN
421#
422
423#
424# Ethernet (10000 Mbit)
425#
426
427#
428# Token Ring devices
429#
430
431#
432# Wireless LAN (non-hamradio)
433#
434# CONFIG_NET_RADIO is not set
435
436#
437# Wan interfaces
438# 419#
420# CONFIG_WLAN_PRE80211 is not set
421# CONFIG_WLAN_80211 is not set
439# CONFIG_WAN is not set 422# CONFIG_WAN is not set
440# CONFIG_PPP is not set 423# CONFIG_PPP is not set
441# CONFIG_SLIP is not set 424# CONFIG_SLIP is not set
@@ -459,6 +442,7 @@ CONFIG_FS_ENET_HAS_FEC=y
459# 442#
460CONFIG_INPUT=y 443CONFIG_INPUT=y
461# CONFIG_INPUT_FF_MEMLESS is not set 444# CONFIG_INPUT_FF_MEMLESS is not set
445# CONFIG_INPUT_POLLDEV is not set
462 446
463# 447#
464# Userland interfaces 448# Userland interfaces
@@ -484,9 +468,16 @@ CONFIG_KEYBOARD_ATKBD=y
484# CONFIG_KEYBOARD_STOWAWAY is not set 468# CONFIG_KEYBOARD_STOWAWAY is not set
485CONFIG_INPUT_MOUSE=y 469CONFIG_INPUT_MOUSE=y
486CONFIG_MOUSE_PS2=y 470CONFIG_MOUSE_PS2=y
471CONFIG_MOUSE_PS2_ALPS=y
472CONFIG_MOUSE_PS2_LOGIPS2PP=y
473CONFIG_MOUSE_PS2_SYNAPTICS=y
474CONFIG_MOUSE_PS2_LIFEBOOK=y
475CONFIG_MOUSE_PS2_TRACKPOINT=y
476# CONFIG_MOUSE_PS2_TOUCHKIT is not set
487# CONFIG_MOUSE_SERIAL is not set 477# CONFIG_MOUSE_SERIAL is not set
488# CONFIG_MOUSE_VSXXXAA is not set 478# CONFIG_MOUSE_VSXXXAA is not set
489# CONFIG_INPUT_JOYSTICK is not set 479# CONFIG_INPUT_JOYSTICK is not set
480# CONFIG_INPUT_TABLET is not set
490# CONFIG_INPUT_TOUCHSCREEN is not set 481# CONFIG_INPUT_TOUCHSCREEN is not set
491# CONFIG_INPUT_MISC is not set 482# CONFIG_INPUT_MISC is not set
492 483
@@ -514,6 +505,7 @@ CONFIG_SERIO_LIBPS2=y
514# 505#
515# Non-8250 serial port support 506# Non-8250 serial port support
516# 507#
508# CONFIG_SERIAL_UARTLITE is not set
517CONFIG_SERIAL_CORE=y 509CONFIG_SERIAL_CORE=y
518CONFIG_SERIAL_CORE_CONSOLE=y 510CONFIG_SERIAL_CORE_CONSOLE=y
519CONFIG_SERIAL_CPM=y 511CONFIG_SERIAL_CPM=y
@@ -531,31 +523,18 @@ CONFIG_UNIX98_PTYS=y
531# IPMI 523# IPMI
532# 524#
533# CONFIG_IPMI_HANDLER is not set 525# CONFIG_IPMI_HANDLER is not set
534
535#
536# Watchdog Cards
537#
538# CONFIG_WATCHDOG is not set 526# CONFIG_WATCHDOG is not set
539CONFIG_HW_RANDOM=y 527CONFIG_HW_RANDOM=y
540# CONFIG_NVRAM is not set 528# CONFIG_NVRAM is not set
541CONFIG_GEN_RTC=y 529CONFIG_GEN_RTC=y
542# CONFIG_GEN_RTC_X is not set 530# CONFIG_GEN_RTC_X is not set
543# CONFIG_DTLK is not set
544# CONFIG_R3964 is not set 531# CONFIG_R3964 is not set
545
546#
547# Ftape, the floppy tape device driver
548#
549# CONFIG_RAW_DRIVER is not set 532# CONFIG_RAW_DRIVER is not set
550 533
551# 534#
552# TPM devices 535# TPM devices
553# 536#
554# CONFIG_TCG_TPM is not set 537# CONFIG_TCG_TPM is not set
555
556#
557# I2C support
558#
559# CONFIG_I2C is not set 538# CONFIG_I2C is not set
560 539
561# 540#
@@ -568,33 +547,41 @@ CONFIG_GEN_RTC=y
568# Dallas's 1-wire bus 547# Dallas's 1-wire bus
569# 548#
570# CONFIG_W1 is not set 549# CONFIG_W1 is not set
571
572#
573# Hardware Monitoring support
574#
575CONFIG_HWMON=y 550CONFIG_HWMON=y
576# CONFIG_HWMON_VID is not set 551# CONFIG_HWMON_VID is not set
577# CONFIG_SENSORS_ABITUGURU is not set 552# CONFIG_SENSORS_ABITUGURU is not set
578# CONFIG_SENSORS_F71805F is not set 553# CONFIG_SENSORS_F71805F is not set
554# CONFIG_SENSORS_PC87427 is not set
555# CONFIG_SENSORS_SMSC47M1 is not set
556# CONFIG_SENSORS_SMSC47B397 is not set
579# CONFIG_SENSORS_VT1211 is not set 557# CONFIG_SENSORS_VT1211 is not set
558# CONFIG_SENSORS_W83627HF is not set
580# CONFIG_HWMON_DEBUG_CHIP is not set 559# CONFIG_HWMON_DEBUG_CHIP is not set
581 560
582# 561#
562# Multifunction device drivers
563#
564# CONFIG_MFD_SM501 is not set
565
566#
583# Multimedia devices 567# Multimedia devices
584# 568#
585# CONFIG_VIDEO_DEV is not set 569# CONFIG_VIDEO_DEV is not set
570# CONFIG_DVB_CORE is not set
571CONFIG_DAB=y
586 572
587# 573#
588# Digital Video Broadcasting Devices 574# Graphics support
589# 575#
590# CONFIG_DVB is not set 576# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
591 577
592# 578#
593# Graphics support 579# Display device support
594# 580#
595CONFIG_FIRMWARE_EDID=y 581# CONFIG_DISPLAY_SUPPORT is not set
582# CONFIG_VGASTATE is not set
596# CONFIG_FB is not set 583# CONFIG_FB is not set
597# CONFIG_BACKLIGHT_LCD_SUPPORT is not set 584# CONFIG_FB_IBM_GXT4500 is not set
598 585
599# 586#
600# Sound 587# Sound
@@ -602,6 +589,12 @@ CONFIG_FIRMWARE_EDID=y
602# CONFIG_SOUND is not set 589# CONFIG_SOUND is not set
603 590
604# 591#
592# HID Devices
593#
594CONFIG_HID=y
595# CONFIG_HID_DEBUG is not set
596
597#
605# USB support 598# USB support
606# 599#
607# CONFIG_USB_ARCH_HAS_HCD is not set 600# CONFIG_USB_ARCH_HAS_HCD is not set
@@ -616,10 +609,6 @@ CONFIG_FIRMWARE_EDID=y
616# USB Gadget Support 609# USB Gadget Support
617# 610#
618# CONFIG_USB_GADGET is not set 611# CONFIG_USB_GADGET is not set
619
620#
621# MMC/SD Card support
622#
623# CONFIG_MMC is not set 612# CONFIG_MMC is not set
624 613
625# 614#
@@ -750,6 +739,7 @@ CONFIG_LOCKD=y
750CONFIG_LOCKD_V4=y 739CONFIG_LOCKD_V4=y
751CONFIG_NFS_COMMON=y 740CONFIG_NFS_COMMON=y
752CONFIG_SUNRPC=y 741CONFIG_SUNRPC=y
742# CONFIG_SUNRPC_BIND34 is not set
753# CONFIG_RPCSEC_GSS_KRB5 is not set 743# CONFIG_RPCSEC_GSS_KRB5 is not set
754# CONFIG_RPCSEC_GSS_SPKM3 is not set 744# CONFIG_RPCSEC_GSS_SPKM3 is not set
755# CONFIG_SMB_FS is not set 745# CONFIG_SMB_FS is not set
@@ -779,6 +769,7 @@ CONFIG_MSDOS_PARTITION=y
779# CONFIG_SUN_PARTITION is not set 769# CONFIG_SUN_PARTITION is not set
780# CONFIG_KARMA_PARTITION is not set 770# CONFIG_KARMA_PARTITION is not set
781# CONFIG_EFI_PARTITION is not set 771# CONFIG_EFI_PARTITION is not set
772# CONFIG_SYSV68_PARTITION is not set
782 773
783# 774#
784# Native Language Support 775# Native Language Support
@@ -786,14 +777,25 @@ CONFIG_MSDOS_PARTITION=y
786# CONFIG_NLS is not set 777# CONFIG_NLS is not set
787 778
788# 779#
780# Distributed Lock Manager
781#
782# CONFIG_DLM is not set
783# CONFIG_UCC_SLOW is not set
784
785#
789# Library routines 786# Library routines
790# 787#
788CONFIG_BITREVERSE=y
791CONFIG_CRC_CCITT=y 789CONFIG_CRC_CCITT=y
792# CONFIG_CRC16 is not set 790# CONFIG_CRC16 is not set
791# CONFIG_CRC_ITU_T is not set
793CONFIG_CRC32=y 792CONFIG_CRC32=y
794# CONFIG_LIBCRC32C is not set 793# CONFIG_LIBCRC32C is not set
795CONFIG_ZLIB_INFLATE=y 794CONFIG_ZLIB_INFLATE=y
796CONFIG_PLIST=y 795CONFIG_PLIST=y
796CONFIG_HAS_IOMEM=y
797CONFIG_HAS_IOPORT=y
798CONFIG_HAS_DMA=y
797 799
798# 800#
799# Instrumentation Support 801# Instrumentation Support
@@ -807,11 +809,9 @@ CONFIG_PLIST=y
807CONFIG_ENABLE_MUST_CHECK=y 809CONFIG_ENABLE_MUST_CHECK=y
808# CONFIG_MAGIC_SYSRQ is not set 810# CONFIG_MAGIC_SYSRQ is not set
809# CONFIG_UNUSED_SYMBOLS is not set 811# CONFIG_UNUSED_SYMBOLS is not set
810# CONFIG_DEBUG_KERNEL is not set
811CONFIG_LOG_BUF_SHIFT=14
812# CONFIG_DEBUG_FS is not set 812# CONFIG_DEBUG_FS is not set
813# CONFIG_UNWIND_INFO is not set
814# CONFIG_HEADERS_CHECK is not set 813# CONFIG_HEADERS_CHECK is not set
814# CONFIG_DEBUG_KERNEL is not set
815# CONFIG_BOOTX_TEXT is not set 815# CONFIG_BOOTX_TEXT is not set
816# CONFIG_PPC_EARLY_DEBUG is not set 816# CONFIG_PPC_EARLY_DEBUG is not set
817 817
diff --git a/arch/powerpc/kernel/irq.c b/arch/powerpc/kernel/irq.c
index 42c8ed6ed528..c2b84c64db20 100644
--- a/arch/powerpc/kernel/irq.c
+++ b/arch/powerpc/kernel/irq.c
@@ -412,6 +412,12 @@ struct irq_map_entry irq_map[NR_IRQS];
412static unsigned int irq_virq_count = NR_IRQS; 412static unsigned int irq_virq_count = NR_IRQS;
413static struct irq_host *irq_default_host; 413static struct irq_host *irq_default_host;
414 414
415irq_hw_number_t virq_to_hw(unsigned int virq)
416{
417 return irq_map[virq].hwirq;
418}
419EXPORT_SYMBOL_GPL(virq_to_hw);
420
415struct irq_host *irq_alloc_host(unsigned int revmap_type, 421struct irq_host *irq_alloc_host(unsigned int revmap_type,
416 unsigned int revmap_arg, 422 unsigned int revmap_arg,
417 struct irq_host_ops *ops, 423 struct irq_host_ops *ops,
diff --git a/arch/powerpc/platforms/cell/cbe_cpufreq.c b/arch/powerpc/platforms/cell/cbe_cpufreq.c
index ac445998d831..ab511d5b65a4 100644
--- a/arch/powerpc/platforms/cell/cbe_cpufreq.c
+++ b/arch/powerpc/platforms/cell/cbe_cpufreq.c
@@ -74,6 +74,7 @@ static unsigned int pmi_frequency_limit = 0;
74 74
75static struct of_device *pmi_dev; 75static struct of_device *pmi_dev;
76 76
77#ifdef CONFIG_PPC_PMI
77static int set_pmode_pmi(int cpu, unsigned int pmode) 78static int set_pmode_pmi(int cpu, unsigned int pmode)
78{ 79{
79 int ret; 80 int ret;
@@ -102,7 +103,7 @@ static int set_pmode_pmi(int cpu, unsigned int pmode)
102#endif 103#endif
103 return ret; 104 return ret;
104} 105}
105 106#endif
106 107
107static int get_pmode(int cpu) 108static int get_pmode(int cpu)
108{ 109{
@@ -157,9 +158,11 @@ static int set_pmode_reg(int cpu, unsigned int pmode)
157} 158}
158 159
159static int set_pmode(int cpu, unsigned int slow_mode) { 160static int set_pmode(int cpu, unsigned int slow_mode) {
161#ifdef CONFIG_PPC_PMI
160 if (pmi_dev) 162 if (pmi_dev)
161 return set_pmode_pmi(cpu, slow_mode); 163 return set_pmode_pmi(cpu, slow_mode);
162 else 164 else
165#endif
163 return set_pmode_reg(cpu, slow_mode); 166 return set_pmode_reg(cpu, slow_mode);
164} 167}
165 168
@@ -323,26 +326,28 @@ static struct cpufreq_driver cbe_cpufreq_driver = {
323 326
324static int __init cbe_cpufreq_init(void) 327static int __init cbe_cpufreq_init(void)
325{ 328{
329#ifdef CONFIG_PPC_PMI
326 struct device_node *np; 330 struct device_node *np;
327 331#endif
328 if (!machine_is(cell)) 332 if (!machine_is(cell))
329 return -ENODEV; 333 return -ENODEV;
330 334#ifdef CONFIG_PPC_PMI
331 np = of_find_node_by_type(NULL, "ibm,pmi"); 335 np = of_find_node_by_type(NULL, "ibm,pmi");
332 336
333 pmi_dev = of_find_device_by_node(np); 337 pmi_dev = of_find_device_by_node(np);
334 338
335 if (pmi_dev) 339 if (pmi_dev)
336 pmi_register_handler(pmi_dev, &cbe_pmi_handler); 340 pmi_register_handler(pmi_dev, &cbe_pmi_handler);
337 341#endif
338 return cpufreq_register_driver(&cbe_cpufreq_driver); 342 return cpufreq_register_driver(&cbe_cpufreq_driver);
339} 343}
340 344
341static void __exit cbe_cpufreq_exit(void) 345static void __exit cbe_cpufreq_exit(void)
342{ 346{
347#ifdef CONFIG_PPC_PMI
343 if (pmi_dev) 348 if (pmi_dev)
344 pmi_unregister_handler(pmi_dev, &cbe_pmi_handler); 349 pmi_unregister_handler(pmi_dev, &cbe_pmi_handler);
345 350#endif
346 cpufreq_unregister_driver(&cbe_cpufreq_driver); 351 cpufreq_unregister_driver(&cbe_cpufreq_driver);
347} 352}
348 353
diff --git a/drivers/acpi/osl.c b/drivers/acpi/osl.c
index 58ceb18ec997..2e7ba615d760 100644
--- a/drivers/acpi/osl.c
+++ b/drivers/acpi/osl.c
@@ -999,11 +999,11 @@ static int __init acpi_osi_setup(char *str)
999 if (str == NULL || *str == '\0') { 999 if (str == NULL || *str == '\0') {
1000 printk(KERN_INFO PREFIX "_OSI method disabled\n"); 1000 printk(KERN_INFO PREFIX "_OSI method disabled\n");
1001 acpi_gbl_create_osi_method = FALSE; 1001 acpi_gbl_create_osi_method = FALSE;
1002 } else if (!strcmp("!Linux", str)) {
1003 enable_osi_linux(0);
1002 } else if (*str == '!') { 1004 } else if (*str == '!') {
1003 if (acpi_osi_invalidate(++str) == AE_OK) 1005 if (acpi_osi_invalidate(++str) == AE_OK)
1004 printk(KERN_INFO PREFIX "Deleted _OSI(%s)\n", str); 1006 printk(KERN_INFO PREFIX "Deleted _OSI(%s)\n", str);
1005 } else if (!strcmp("!Linux", str)) {
1006 enable_osi_linux(0);
1007 } else if (!strcmp("Linux", str)) { 1007 } else if (!strcmp("Linux", str)) {
1008 enable_osi_linux(1); 1008 enable_osi_linux(1);
1009 } else if (*osi_additional_string == '\0') { 1009 } else if (*osi_additional_string == '\0') {
diff --git a/drivers/ata/Kconfig b/drivers/ata/Kconfig
index b4a8d6030e48..4ad8675f5a16 100644
--- a/drivers/ata/Kconfig
+++ b/drivers/ata/Kconfig
@@ -16,6 +16,11 @@ menuconfig ATA
16 that "speaks" the ATA protocol, also called ATA controller), 16 that "speaks" the ATA protocol, also called ATA controller),
17 because you will be asked for it. 17 because you will be asked for it.
18 18
19 NOTE: ATA enables basic SCSI support; *however*,
20 'SCSI disk support', 'SCSI tape support', or
21 'SCSI CDROM support' may also be needed,
22 depending on your hardware configuration.
23
19if ATA 24if ATA
20 25
21config ATA_NONSTANDARD 26config ATA_NONSTANDARD
diff --git a/drivers/ata/ata_generic.c b/drivers/ata/ata_generic.c
index 7565f022bd69..4c6e95c95e4a 100644
--- a/drivers/ata/ata_generic.c
+++ b/drivers/ata/ata_generic.c
@@ -50,7 +50,7 @@ static int generic_set_mode(struct ata_port *ap, struct ata_device **unused)
50 50
51 /* Bits 5 and 6 indicate if DMA is active on master/slave */ 51 /* Bits 5 and 6 indicate if DMA is active on master/slave */
52 if (ap->ioaddr.bmdma_addr) 52 if (ap->ioaddr.bmdma_addr)
53 dma_enabled = ioread8(ap->ioaddr.bmdma_addr + ATA_DMA_CMD); 53 dma_enabled = ioread8(ap->ioaddr.bmdma_addr + ATA_DMA_STATUS);
54 54
55 for (i = 0; i < ATA_MAX_DEVICES; i++) { 55 for (i = 0; i < ATA_MAX_DEVICES; i++) {
56 struct ata_device *dev = &ap->device[i]; 56 struct ata_device *dev = &ap->device[i];
diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c
index bfc59a104728..981b397cb46b 100644
--- a/drivers/ata/libata-core.c
+++ b/drivers/ata/libata-core.c
@@ -3798,6 +3798,7 @@ static const struct ata_blacklist_entry ata_device_blacklist [] = {
3798 /* Drives which do spurious command completion */ 3798 /* Drives which do spurious command completion */
3799 { "HTS541680J9SA00", "SB2IC7EP", ATA_HORKAGE_NONCQ, }, 3799 { "HTS541680J9SA00", "SB2IC7EP", ATA_HORKAGE_NONCQ, },
3800 { "HTS541612J9SA00", "SBDIC7JP", ATA_HORKAGE_NONCQ, }, 3800 { "HTS541612J9SA00", "SBDIC7JP", ATA_HORKAGE_NONCQ, },
3801 { "Hitachi HTS541616J9SA00", "SB4OC70P", ATA_HORKAGE_NONCQ, },
3801 { "WDC WD740ADFD-00NLR1", NULL, ATA_HORKAGE_NONCQ, }, 3802 { "WDC WD740ADFD-00NLR1", NULL, ATA_HORKAGE_NONCQ, },
3802 3803
3803 /* Devices with NCQ limits */ 3804 /* Devices with NCQ limits */
@@ -4781,8 +4782,6 @@ static void ata_hsm_qc_complete(struct ata_queued_cmd *qc, int in_wq)
4781 } else 4782 } else
4782 ata_qc_complete(qc); 4783 ata_qc_complete(qc);
4783 } 4784 }
4784
4785 ata_altstatus(ap); /* flush */
4786} 4785}
4787 4786
4788/** 4787/**
@@ -6424,14 +6423,14 @@ int ata_host_activate(struct ata_host *host, int irq,
6424 if (rc) 6423 if (rc)
6425 return rc; 6424 return rc;
6426 6425
6426 /* Used to print device info at probe */
6427 host->irq = irq;
6428
6427 rc = ata_host_register(host, sht); 6429 rc = ata_host_register(host, sht);
6428 /* if failed, just free the IRQ and leave ports alone */ 6430 /* if failed, just free the IRQ and leave ports alone */
6429 if (rc) 6431 if (rc)
6430 devm_free_irq(host->dev, irq, host); 6432 devm_free_irq(host->dev, irq, host);
6431 6433
6432 /* Used to print device info at probe */
6433 host->irq = irq;
6434
6435 return rc; 6434 return rc;
6436} 6435}
6437 6436
diff --git a/drivers/ata/libata-sff.c b/drivers/ata/libata-sff.c
index ce84805ba5f1..fa1c22c7b38f 100644
--- a/drivers/ata/libata-sff.c
+++ b/drivers/ata/libata-sff.c
@@ -1065,10 +1065,11 @@ int ata_pci_init_one(struct pci_dev *pdev,
1065 if (rc) 1065 if (rc)
1066 goto err_out; 1066 goto err_out;
1067 1067
1068 if (!legacy_mode) 1068 if (!legacy_mode) {
1069 rc = devm_request_irq(dev, pdev->irq, pi->port_ops->irq_handler, 1069 rc = devm_request_irq(dev, pdev->irq, pi->port_ops->irq_handler,
1070 IRQF_SHARED, DRV_NAME, host); 1070 IRQF_SHARED, DRV_NAME, host);
1071 else { 1071 host->irq = pdev->irq;
1072 } else {
1072 irq_handler_t handler[2] = { host->ops->irq_handler, 1073 irq_handler_t handler[2] = { host->ops->irq_handler,
1073 host->ops->irq_handler }; 1074 host->ops->irq_handler };
1074 unsigned int irq_flags[2] = { IRQF_SHARED, IRQF_SHARED }; 1075 unsigned int irq_flags[2] = { IRQF_SHARED, IRQF_SHARED };
diff --git a/drivers/ata/pata_ali.c b/drivers/ata/pata_ali.c
index 3c55a5ff74c7..75e95bdbe02f 100644
--- a/drivers/ata/pata_ali.c
+++ b/drivers/ata/pata_ali.c
@@ -550,22 +550,22 @@ static int ali_init_one(struct pci_dev *pdev, const struct pci_device_id *id)
550 .udma_mask = 0x1f, 550 .udma_mask = 0x1f,
551 .port_ops = &ali_c2_port_ops 551 .port_ops = &ali_c2_port_ops
552 }; 552 };
553 /* Revision 0xC3 is UDMA100 */ 553 /* Revision 0xC3 is UDMA66 for now */
554 static const struct ata_port_info info_c3 = { 554 static const struct ata_port_info info_c3 = {
555 .sht = &ali_sht, 555 .sht = &ali_sht,
556 .flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_SRST | ATA_FLAG_PIO_LBA48, 556 .flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_SRST | ATA_FLAG_PIO_LBA48,
557 .pio_mask = 0x1f, 557 .pio_mask = 0x1f,
558 .mwdma_mask = 0x07, 558 .mwdma_mask = 0x07,
559 .udma_mask = 0x3f, 559 .udma_mask = 0x1f,
560 .port_ops = &ali_c2_port_ops 560 .port_ops = &ali_c2_port_ops
561 }; 561 };
562 /* Revision 0xC4 is UDMA133 */ 562 /* Revision 0xC4 is UDMA100 */
563 static const struct ata_port_info info_c4 = { 563 static const struct ata_port_info info_c4 = {
564 .sht = &ali_sht, 564 .sht = &ali_sht,
565 .flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_SRST | ATA_FLAG_PIO_LBA48, 565 .flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_SRST | ATA_FLAG_PIO_LBA48,
566 .pio_mask = 0x1f, 566 .pio_mask = 0x1f,
567 .mwdma_mask = 0x07, 567 .mwdma_mask = 0x07,
568 .udma_mask = 0x7f, 568 .udma_mask = 0x3f,
569 .port_ops = &ali_c2_port_ops 569 .port_ops = &ali_c2_port_ops
570 }; 570 };
571 /* Revision 0xC5 is UDMA133 with LBA48 DMA */ 571 /* Revision 0xC5 is UDMA133 with LBA48 DMA */
diff --git a/drivers/ata/pata_cs5520.c b/drivers/ata/pata_cs5520.c
index 1aabe15ad9d3..00cf0134079c 100644
--- a/drivers/ata/pata_cs5520.c
+++ b/drivers/ata/pata_cs5520.c
@@ -284,6 +284,11 @@ static int __devinit cs5520_init_one(struct pci_dev *pdev, const struct pci_devi
284 ata_interrupt, 0, DRV_NAME, host); 284 ata_interrupt, 0, DRV_NAME, host);
285 if (rc) 285 if (rc)
286 return rc; 286 return rc;
287
288 if (i == 0)
289 host->irq = irq[0];
290 else
291 host->irq2 = irq[1];
287 } 292 }
288 293
289 return ata_host_register(host, &cs5520_sht); 294 return ata_host_register(host, &cs5520_sht);
diff --git a/drivers/ata/pata_pcmcia.c b/drivers/ata/pata_pcmcia.c
index 4d44c7555db1..a56257c98fe5 100644
--- a/drivers/ata/pata_pcmcia.c
+++ b/drivers/ata/pata_pcmcia.c
@@ -129,7 +129,7 @@ static struct ata_port_operations pcmcia_port_ops = {
129 .irq_on = ata_irq_on, 129 .irq_on = ata_irq_on,
130 .irq_ack = ata_irq_ack, 130 .irq_ack = ata_irq_ack,
131 131
132 .port_start = ata_port_start, 132 .port_start = ata_sff_port_start,
133}; 133};
134 134
135#define CS_CHECK(fn, ret) \ 135#define CS_CHECK(fn, ret) \
diff --git a/drivers/ata/pata_pdc2027x.c b/drivers/ata/pata_pdc2027x.c
index 0d2cc49fde4b..69a5aa4949f5 100644
--- a/drivers/ata/pata_pdc2027x.c
+++ b/drivers/ata/pata_pdc2027x.c
@@ -689,10 +689,12 @@ static long pdc_detect_pll_input_clock(struct ata_host *host)
689 void __iomem *mmio_base = host->iomap[PDC_MMIO_BAR]; 689 void __iomem *mmio_base = host->iomap[PDC_MMIO_BAR];
690 u32 scr; 690 u32 scr;
691 long start_count, end_count; 691 long start_count, end_count;
692 long pll_clock; 692 struct timeval start_time, end_time;
693 long pll_clock, usec_elapsed;
693 694
694 /* Read current counter value */ 695 /* Read current counter value */
695 start_count = pdc_read_counter(host); 696 start_count = pdc_read_counter(host);
697 do_gettimeofday(&start_time);
696 698
697 /* Start the test mode */ 699 /* Start the test mode */
698 scr = readl(mmio_base + PDC_SYS_CTL); 700 scr = readl(mmio_base + PDC_SYS_CTL);
@@ -705,6 +707,7 @@ static long pdc_detect_pll_input_clock(struct ata_host *host)
705 707
706 /* Read the counter values again */ 708 /* Read the counter values again */
707 end_count = pdc_read_counter(host); 709 end_count = pdc_read_counter(host);
710 do_gettimeofday(&end_time);
708 711
709 /* Stop the test mode */ 712 /* Stop the test mode */
710 scr = readl(mmio_base + PDC_SYS_CTL); 713 scr = readl(mmio_base + PDC_SYS_CTL);
@@ -713,7 +716,11 @@ static long pdc_detect_pll_input_clock(struct ata_host *host)
713 readl(mmio_base + PDC_SYS_CTL); /* flush */ 716 readl(mmio_base + PDC_SYS_CTL); /* flush */
714 717
715 /* calculate the input clock in Hz */ 718 /* calculate the input clock in Hz */
716 pll_clock = (start_count - end_count) * 10; 719 usec_elapsed = (end_time.tv_sec - start_time.tv_sec) * 1000000 +
720 (end_time.tv_usec - start_time.tv_usec);
721
722 pll_clock = (start_count - end_count) / 100 *
723 (100000000 / usec_elapsed);
717 724
718 PDPRINTK("start[%ld] end[%ld] \n", start_count, end_count); 725 PDPRINTK("start[%ld] end[%ld] \n", start_count, end_count);
719 PDPRINTK("PLL input clock[%ld]Hz\n", pll_clock); 726 PDPRINTK("PLL input clock[%ld]Hz\n", pll_clock);
diff --git a/drivers/ata/pata_pdc202xx_old.c b/drivers/ata/pata_pdc202xx_old.c
index edbaf9d653b8..d277246b7337 100644
--- a/drivers/ata/pata_pdc202xx_old.c
+++ b/drivers/ata/pata_pdc202xx_old.c
@@ -31,8 +31,8 @@ static int pdc2026x_cable_detect(struct ata_port *ap)
31 31
32 pci_read_config_word(pdev, 0x50, &cis); 32 pci_read_config_word(pdev, 0x50, &cis);
33 if (cis & (1 << (10 + ap->port_no))) 33 if (cis & (1 << (10 + ap->port_no)))
34 return ATA_CBL_PATA80; 34 return ATA_CBL_PATA40;
35 return ATA_CBL_PATA40; 35 return ATA_CBL_PATA80;
36} 36}
37 37
38/** 38/**
diff --git a/drivers/ata/pata_sis.c b/drivers/ata/pata_sis.c
index ec3ae9375015..cfe4ec6eb3d5 100644
--- a/drivers/ata/pata_sis.c
+++ b/drivers/ata/pata_sis.c
@@ -560,6 +560,40 @@ static const struct ata_port_operations sis_133_ops = {
560 .port_start = ata_port_start, 560 .port_start = ata_port_start,
561}; 561};
562 562
563static const struct ata_port_operations sis_133_for_sata_ops = {
564 .port_disable = ata_port_disable,
565 .set_piomode = sis_133_set_piomode,
566 .set_dmamode = sis_133_set_dmamode,
567 .mode_filter = ata_pci_default_filter,
568
569 .tf_load = ata_tf_load,
570 .tf_read = ata_tf_read,
571 .check_status = ata_check_status,
572 .exec_command = ata_exec_command,
573 .dev_select = ata_std_dev_select,
574
575 .freeze = ata_bmdma_freeze,
576 .thaw = ata_bmdma_thaw,
577 .error_handler = ata_bmdma_error_handler,
578 .post_internal_cmd = ata_bmdma_post_internal_cmd,
579 .cable_detect = sis_133_cable_detect,
580
581 .bmdma_setup = ata_bmdma_setup,
582 .bmdma_start = ata_bmdma_start,
583 .bmdma_stop = ata_bmdma_stop,
584 .bmdma_status = ata_bmdma_status,
585 .qc_prep = ata_qc_prep,
586 .qc_issue = ata_qc_issue_prot,
587 .data_xfer = ata_data_xfer,
588
589 .irq_handler = ata_interrupt,
590 .irq_clear = ata_bmdma_irq_clear,
591 .irq_on = ata_irq_on,
592 .irq_ack = ata_irq_ack,
593
594 .port_start = ata_port_start,
595};
596
563static const struct ata_port_operations sis_133_early_ops = { 597static const struct ata_port_operations sis_133_early_ops = {
564 .port_disable = ata_port_disable, 598 .port_disable = ata_port_disable,
565 .set_piomode = sis_100_set_piomode, 599 .set_piomode = sis_100_set_piomode,
@@ -733,13 +767,20 @@ static const struct ata_port_info sis_info100_early = {
733 .pio_mask = 0x1f, /* pio0-4 */ 767 .pio_mask = 0x1f, /* pio0-4 */
734 .port_ops = &sis_66_ops, 768 .port_ops = &sis_66_ops,
735}; 769};
736const struct ata_port_info sis_info133 = { 770static const struct ata_port_info sis_info133 = {
737 .sht = &sis_sht, 771 .sht = &sis_sht,
738 .flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_SRST, 772 .flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_SRST,
739 .pio_mask = 0x1f, /* pio0-4 */ 773 .pio_mask = 0x1f, /* pio0-4 */
740 .udma_mask = ATA_UDMA6, 774 .udma_mask = ATA_UDMA6,
741 .port_ops = &sis_133_ops, 775 .port_ops = &sis_133_ops,
742}; 776};
777const struct ata_port_info sis_info133_for_sata = {
778 .sht = &sis_sht,
779 .flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_SRST,
780 .pio_mask = 0x1f, /* pio0-4 */
781 .udma_mask = ATA_UDMA6,
782 .port_ops = &sis_133_for_sata_ops,
783};
743static const struct ata_port_info sis_info133_early = { 784static const struct ata_port_info sis_info133_early = {
744 .sht = &sis_sht, 785 .sht = &sis_sht,
745 .flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_SRST, 786 .flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_SRST,
@@ -749,7 +790,7 @@ static const struct ata_port_info sis_info133_early = {
749}; 790};
750 791
751/* Privately shared with the SiS180 SATA driver, not for use elsewhere */ 792/* Privately shared with the SiS180 SATA driver, not for use elsewhere */
752EXPORT_SYMBOL_GPL(sis_info133); 793EXPORT_SYMBOL_GPL(sis_info133_for_sata);
753 794
754static void sis_fixup(struct pci_dev *pdev, struct sis_chipset *sis) 795static void sis_fixup(struct pci_dev *pdev, struct sis_chipset *sis)
755{ 796{
@@ -975,6 +1016,7 @@ static int sis_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)
975static const struct pci_device_id sis_pci_tbl[] = { 1016static const struct pci_device_id sis_pci_tbl[] = {
976 { PCI_VDEVICE(SI, 0x5513), }, /* SiS 5513 */ 1017 { PCI_VDEVICE(SI, 0x5513), }, /* SiS 5513 */
977 { PCI_VDEVICE(SI, 0x5518), }, /* SiS 5518 */ 1018 { PCI_VDEVICE(SI, 0x5518), }, /* SiS 5518 */
1019 { PCI_VDEVICE(SI, 0x1180), }, /* SiS 1180 */
978 1020
979 { } 1021 { }
980}; 1022};
diff --git a/drivers/ata/sata_inic162x.c b/drivers/ata/sata_inic162x.c
index 2d80c9d95e95..dc3bbce04676 100644
--- a/drivers/ata/sata_inic162x.c
+++ b/drivers/ata/sata_inic162x.c
@@ -496,6 +496,13 @@ static void inic_dev_config(struct ata_device *dev)
496 /* inic can only handle upto LBA28 max sectors */ 496 /* inic can only handle upto LBA28 max sectors */
497 if (dev->max_sectors > ATA_MAX_SECTORS) 497 if (dev->max_sectors > ATA_MAX_SECTORS)
498 dev->max_sectors = ATA_MAX_SECTORS; 498 dev->max_sectors = ATA_MAX_SECTORS;
499
500 if (dev->n_sectors >= 1 << 28) {
501 ata_dev_printk(dev, KERN_ERR,
502 "ERROR: This driver doesn't support LBA48 yet and may cause\n"
503 " data corruption on such devices. Disabling.\n");
504 ata_dev_disable(dev);
505 }
499} 506}
500 507
501static void init_port(struct ata_port *ap) 508static void init_port(struct ata_port *ap)
diff --git a/drivers/ata/sata_mv.c b/drivers/ata/sata_mv.c
index c957e6e54ba1..590f2f92b4e0 100644
--- a/drivers/ata/sata_mv.c
+++ b/drivers/ata/sata_mv.c
@@ -582,6 +582,9 @@ static const struct pci_device_id mv_pci_tbl[] = {
582 582
583 { PCI_VDEVICE(ADAPTEC2, 0x0241), chip_604x }, 583 { PCI_VDEVICE(ADAPTEC2, 0x0241), chip_604x },
584 584
585 /* Adaptec 1430SA */
586 { PCI_VDEVICE(ADAPTEC2, 0x0243), chip_7042 },
587
585 { PCI_VDEVICE(TTI, 0x2310), chip_7042 }, 588 { PCI_VDEVICE(TTI, 0x2310), chip_7042 },
586 589
587 /* add Marvell 7042 support */ 590 /* add Marvell 7042 support */
diff --git a/drivers/ata/sata_nv.c b/drivers/ata/sata_nv.c
index adfa693db53d..b2656867c647 100644
--- a/drivers/ata/sata_nv.c
+++ b/drivers/ata/sata_nv.c
@@ -325,6 +325,7 @@ static struct scsi_host_template nv_adma_sht = {
325 .name = DRV_NAME, 325 .name = DRV_NAME,
326 .ioctl = ata_scsi_ioctl, 326 .ioctl = ata_scsi_ioctl,
327 .queuecommand = ata_scsi_queuecmd, 327 .queuecommand = ata_scsi_queuecmd,
328 .change_queue_depth = ata_scsi_change_queue_depth,
328 .can_queue = NV_ADMA_MAX_CPBS, 329 .can_queue = NV_ADMA_MAX_CPBS,
329 .this_id = ATA_SHT_THIS_ID, 330 .this_id = ATA_SHT_THIS_ID,
330 .sg_tablesize = NV_ADMA_SGTBL_TOTAL_LEN, 331 .sg_tablesize = NV_ADMA_SGTBL_TOTAL_LEN,
diff --git a/drivers/ata/sata_sis.c b/drivers/ata/sata_sis.c
index 221099d1d08f..f111c984a359 100644
--- a/drivers/ata/sata_sis.c
+++ b/drivers/ata/sata_sis.c
@@ -72,8 +72,8 @@ static const struct pci_device_id sis_pci_tbl[] = {
72 { PCI_VDEVICE(SI, 0x0181), sis_180 }, /* SiS 964/180 */ 72 { PCI_VDEVICE(SI, 0x0181), sis_180 }, /* SiS 964/180 */
73 { PCI_VDEVICE(SI, 0x0182), sis_180 }, /* SiS 965/965L */ 73 { PCI_VDEVICE(SI, 0x0182), sis_180 }, /* SiS 965/965L */
74 { PCI_VDEVICE(SI, 0x0183), sis_180 }, /* SiS 965/965L */ 74 { PCI_VDEVICE(SI, 0x0183), sis_180 }, /* SiS 965/965L */
75 { PCI_VDEVICE(SI, 0x1182), sis_180 }, /* SiS 966/966L */ 75 { PCI_VDEVICE(SI, 0x1182), sis_180 }, /* SiS 966/680 */
76 { PCI_VDEVICE(SI, 0x1183), sis_180 }, /* SiS 966/966L */ 76 { PCI_VDEVICE(SI, 0x1183), sis_180 }, /* SiS 966/966L/968/680 */
77 77
78 { } /* terminate list */ 78 { } /* terminate list */
79}; 79};
@@ -161,7 +161,6 @@ static unsigned int get_scr_cfg_addr(struct ata_port *ap, unsigned int sc_reg)
161 case 0x0182: 161 case 0x0182:
162 case 0x0183: 162 case 0x0183:
163 case 0x1182: 163 case 0x1182:
164 case 0x1183:
165 addr += SIS182_SATA1_OFS; 164 addr += SIS182_SATA1_OFS;
166 break; 165 break;
167 } 166 }
@@ -183,8 +182,8 @@ static u32 sis_scr_cfg_read (struct ata_port *ap, unsigned int sc_reg)
183 182
184 pci_read_config_dword(pdev, cfg_addr, &val); 183 pci_read_config_dword(pdev, cfg_addr, &val);
185 184
186 if ((pdev->device == 0x0182) || (pdev->device == 0x0183) || (pdev->device == 0x1182) || 185 if ((pdev->device == 0x0182) || (pdev->device == 0x0183) ||
187 (pdev->device == 0x1183) || (pmr & SIS_PMR_COMBINED)) 186 (pdev->device == 0x1182) || (pmr & SIS_PMR_COMBINED))
188 pci_read_config_dword(pdev, cfg_addr+0x10, &val2); 187 pci_read_config_dword(pdev, cfg_addr+0x10, &val2);
189 188
190 return (val|val2) & 0xfffffffb; /* avoid problems with powerdowned ports */ 189 return (val|val2) & 0xfffffffb; /* avoid problems with powerdowned ports */
@@ -203,8 +202,8 @@ static void sis_scr_cfg_write (struct ata_port *ap, unsigned int sc_reg, u32 val
203 202
204 pci_write_config_dword(pdev, cfg_addr, val); 203 pci_write_config_dword(pdev, cfg_addr, val);
205 204
206 if ((pdev->device == 0x0182) || (pdev->device == 0x0183) || (pdev->device == 0x1182) || 205 if ((pdev->device == 0x0182) || (pdev->device == 0x0183) ||
207 (pdev->device == 0x1183) || (pmr & SIS_PMR_COMBINED)) 206 (pdev->device == 0x1182) || (pmr & SIS_PMR_COMBINED))
208 pci_write_config_dword(pdev, cfg_addr+0x10, val); 207 pci_write_config_dword(pdev, cfg_addr+0x10, val);
209} 208}
210 209
@@ -224,8 +223,8 @@ static u32 sis_scr_read (struct ata_port *ap, unsigned int sc_reg)
224 223
225 val = ioread32(ap->ioaddr.scr_addr + (sc_reg * 4)); 224 val = ioread32(ap->ioaddr.scr_addr + (sc_reg * 4));
226 225
227 if ((pdev->device == 0x0182) || (pdev->device == 0x0183) || (pdev->device == 0x1182) || 226 if ((pdev->device == 0x0182) || (pdev->device == 0x0183) ||
228 (pdev->device == 0x1183) || (pmr & SIS_PMR_COMBINED)) 227 (pdev->device == 0x1182) || (pmr & SIS_PMR_COMBINED))
229 val2 = ioread32(ap->ioaddr.scr_addr + (sc_reg * 4) + 0x10); 228 val2 = ioread32(ap->ioaddr.scr_addr + (sc_reg * 4) + 0x10);
230 229
231 return (val | val2) & 0xfffffffb; 230 return (val | val2) & 0xfffffffb;
@@ -245,8 +244,8 @@ static void sis_scr_write (struct ata_port *ap, unsigned int sc_reg, u32 val)
245 sis_scr_cfg_write(ap, sc_reg, val); 244 sis_scr_cfg_write(ap, sc_reg, val);
246 else { 245 else {
247 iowrite32(val, ap->ioaddr.scr_addr + (sc_reg * 4)); 246 iowrite32(val, ap->ioaddr.scr_addr + (sc_reg * 4));
248 if ((pdev->device == 0x0182) || (pdev->device == 0x0183) || (pdev->device == 0x1182) || 247 if ((pdev->device == 0x0182) || (pdev->device == 0x0183) ||
249 (pdev->device == 0x1183) || (pmr & SIS_PMR_COMBINED)) 248 (pdev->device == 0x1182) || (pmr & SIS_PMR_COMBINED))
250 iowrite32(val, ap->ioaddr.scr_addr + (sc_reg * 4)+0x10); 249 iowrite32(val, ap->ioaddr.scr_addr + (sc_reg * 4)+0x10);
251 } 250 }
252} 251}
@@ -293,11 +292,11 @@ static int sis_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)
293 /* The PATA-handling is provided by pata_sis */ 292 /* The PATA-handling is provided by pata_sis */
294 switch (pmr & 0x30) { 293 switch (pmr & 0x30) {
295 case 0x10: 294 case 0x10:
296 ppi[1] = &sis_info133; 295 ppi[1] = &sis_info133_for_sata;
297 break; 296 break;
298 297
299 case 0x30: 298 case 0x30:
300 ppi[0] = &sis_info133; 299 ppi[0] = &sis_info133_for_sata;
301 break; 300 break;
302 } 301 }
303 if ((pmr & SIS_PMR_COMBINED) == 0) { 302 if ((pmr & SIS_PMR_COMBINED) == 0) {
@@ -324,14 +323,14 @@ static int sis_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)
324 break; 323 break;
325 324
326 case 0x1182: 325 case 0x1182:
326 dev_printk(KERN_INFO, &pdev->dev, "Detected SiS 1182/966/680 SATA controller\n");
327 pi.flags |= ATA_FLAG_SLAVE_POSS;
328 break;
329
327 case 0x1183: 330 case 0x1183:
328 pci_read_config_dword(pdev, 0x64, &val); 331 dev_printk(KERN_INFO, &pdev->dev, "Detected SiS 1183/966/966L/968/680 controller in PATA mode\n");
329 if (val & 0x10000000) { 332 ppi[0] = &sis_info133_for_sata;
330 dev_printk(KERN_INFO, &pdev->dev, "Detected SiS 1182/1183/966L SATA controller\n"); 333 ppi[1] = &sis_info133_for_sata;
331 } else {
332 dev_printk(KERN_INFO, &pdev->dev, "Detected SiS 1182/1183/966 SATA controller\n");
333 pi.flags |= ATA_FLAG_SLAVE_POSS;
334 }
335 break; 334 break;
336 } 335 }
337 336
diff --git a/drivers/ata/sis.h b/drivers/ata/sis.h
index 0f2208d8d5ef..f7f3eebe666c 100644
--- a/drivers/ata/sis.h
+++ b/drivers/ata/sis.h
@@ -2,4 +2,4 @@
2struct ata_port_info; 2struct ata_port_info;
3 3
4/* pata_sis.c */ 4/* pata_sis.c */
5extern const struct ata_port_info sis_info133; 5extern const struct ata_port_info sis_info133_for_sata;
diff --git a/drivers/firewire/Kconfig b/drivers/firewire/Kconfig
index 396dade731f9..d011a76f8e7a 100644
--- a/drivers/firewire/Kconfig
+++ b/drivers/firewire/Kconfig
@@ -4,27 +4,44 @@ comment "An alternative FireWire stack is available with EXPERIMENTAL=y"
4 depends on EXPERIMENTAL=n 4 depends on EXPERIMENTAL=n
5 5
6config FIREWIRE 6config FIREWIRE
7 tristate "IEEE 1394 (FireWire) support (JUJU alternative stack, experimental)" 7 tristate "IEEE 1394 (FireWire) support - alternative stack, EXPERIMENTAL"
8 depends on EXPERIMENTAL 8 depends on EXPERIMENTAL
9 select CRC_ITU_T 9 select CRC_ITU_T
10 help 10 help
11 IEEE 1394 describes a high performance serial bus, which is also 11 This is the "Juju" FireWire stack, a new alternative implementation
12 known as FireWire(tm) or i.Link(tm) and is used for connecting all
13 sorts of devices (most notably digital video cameras) to your
14 computer.
15
16 If you have FireWire hardware and want to use it, say Y here. This
17 is the core support only, you will also need to select a driver for
18 your IEEE 1394 adapter.
19
20 To compile this driver as a module, say M here: the module will be
21 called firewire-core.
22
23 This is the "JUJU" FireWire stack, an alternative implementation
24 designed for robustness and simplicity. You can build either this 12 designed for robustness and simplicity. You can build either this
25 stack, or the classic stack (the ieee1394 driver, ohci1394 etc.) 13 stack, or the classic stack (the ieee1394 driver, ohci1394 etc.)
26 or both. 14 or both.
27 15
16 To compile this driver as a module, say M here: the module will be
17 called firewire-core. It functionally replaces ieee1394, raw1394,
18 and video1394.
19
20 NOTE:
21
22 You should only build ONE of the stacks, unless you REALLY know what
23 you are doing. If you install both, you should configure them only as
24 modules rather than link them statically, and you should blacklist one
25 of the concurrent low-level drivers in /etc/modprobe.conf. Add either
26
27 blacklist firewire-ohci
28 or
29 blacklist ohci1394
30
31 there depending on which driver you DON'T want to have auto-loaded.
32 You can optionally do the same with the other IEEE 1394/ FireWire
33 drivers.
34
35 If you have an old modprobe which doesn't implement the blacklist
36 directive, use either
37
38 install firewire-ohci /bin/true
39 or
40 install ohci1394 /bin/true
41
42 and so on, depending on which modules you DON't want to have
43 auto-loaded.
44
28config FIREWIRE_OHCI 45config FIREWIRE_OHCI
29 tristate "Support for OHCI FireWire host controllers" 46 tristate "Support for OHCI FireWire host controllers"
30 depends on PCI && FIREWIRE 47 depends on PCI && FIREWIRE
@@ -34,11 +51,13 @@ config FIREWIRE_OHCI
34 is the only chipset in use, so say Y here. 51 is the only chipset in use, so say Y here.
35 52
36 To compile this driver as a module, say M here: The module will be 53 To compile this driver as a module, say M here: The module will be
37 called firewire-ohci. 54 called firewire-ohci. It replaces ohci1394 of the classic IEEE 1394
55 stack.
56
57 NOTE:
38 58
39 If you also build ohci1394 of the classic IEEE 1394 driver stack, 59 If you also build ohci1394 of the classic stack, blacklist either
40 blacklist either ohci1394 or firewire-ohci to let hotplug load the 60 ohci1394 or firewire-ohci to let hotplug load only the desired driver.
41 desired driver.
42 61
43config FIREWIRE_SBP2 62config FIREWIRE_SBP2
44 tristate "Support for storage devices (SBP-2 protocol driver)" 63 tristate "Support for storage devices (SBP-2 protocol driver)"
@@ -50,12 +69,14 @@ config FIREWIRE_SBP2
50 like scanners. 69 like scanners.
51 70
52 To compile this driver as a module, say M here: The module will be 71 To compile this driver as a module, say M here: The module will be
53 called firewire-sbp2. 72 called firewire-sbp2. It replaces sbp2 of the classic IEEE 1394
73 stack.
54 74
55 You should also enable support for disks, CD-ROMs, etc. in the SCSI 75 You should also enable support for disks, CD-ROMs, etc. in the SCSI
56 configuration section. 76 configuration section.
57 77
58 If you also build sbp2 of the classic IEEE 1394 driver stack, 78 NOTE:
59 blacklist either sbp2 or firewire-sbp2 to let hotplug load the 79
60 desired driver. 80 If you also build sbp2 of the classic stack, blacklist either sbp2
81 or firewire-sbp2 to let hotplug load only the desired driver.
61 82
diff --git a/drivers/firewire/fw-ohci.c b/drivers/firewire/fw-ohci.c
index b72a5c1f9e69..96c8ac5b86cc 100644
--- a/drivers/firewire/fw-ohci.c
+++ b/drivers/firewire/fw-ohci.c
@@ -373,8 +373,8 @@ static void ar_context_tasklet(unsigned long data)
373 373
374 offset = offsetof(struct ar_buffer, data); 374 offset = offsetof(struct ar_buffer, data);
375 dma_unmap_single(ohci->card.device, 375 dma_unmap_single(ohci->card.device,
376 ab->descriptor.data_address - offset, 376 le32_to_cpu(ab->descriptor.data_address) - offset,
377 PAGE_SIZE, DMA_BIDIRECTIONAL); 377 PAGE_SIZE, DMA_BIDIRECTIONAL);
378 378
379 buffer = ab; 379 buffer = ab;
380 ab = ab->next; 380 ab = ab->next;
@@ -427,7 +427,7 @@ static void ar_context_run(struct ar_context *ctx)
427 size_t offset; 427 size_t offset;
428 428
429 offset = offsetof(struct ar_buffer, data); 429 offset = offsetof(struct ar_buffer, data);
430 ab_bus = ab->descriptor.data_address - offset; 430 ab_bus = le32_to_cpu(ab->descriptor.data_address) - offset;
431 431
432 reg_write(ctx->ohci, COMMAND_PTR(ctx->regs), ab_bus | 1); 432 reg_write(ctx->ohci, COMMAND_PTR(ctx->regs), ab_bus | 1);
433 reg_write(ctx->ohci, CONTROL_SET(ctx->regs), CONTEXT_RUN); 433 reg_write(ctx->ohci, CONTROL_SET(ctx->regs), CONTEXT_RUN);
diff --git a/drivers/ide/ide-probe.c b/drivers/ide/ide-probe.c
index 41bfa4d21ab6..f5ce22c38f82 100644
--- a/drivers/ide/ide-probe.c
+++ b/drivers/ide/ide-probe.c
@@ -574,11 +574,11 @@ static inline u8 probe_for_drive (ide_drive_t *drive)
574 /* look for ATAPI device */ 574 /* look for ATAPI device */
575 (void) do_probe(drive, WIN_PIDENTIFY); 575 (void) do_probe(drive, WIN_PIDENTIFY);
576 } 576 }
577 if (strstr(drive->id->model, "E X A B Y T E N E S T"))
578 enable_nest(drive);
579 if (!drive->present) 577 if (!drive->present)
580 /* drive not found */ 578 /* drive not found */
581 return 0; 579 return 0;
580 if (strstr(drive->id->model, "E X A B Y T E N E S T"))
581 enable_nest(drive);
582 582
583 /* identification failed? */ 583 /* identification failed? */
584 if (!drive->id_read) { 584 if (!drive->id_read) {
diff --git a/drivers/ide/ide-taskfile.c b/drivers/ide/ide-taskfile.c
index 30175c7688e8..aa06dafb74ac 100644
--- a/drivers/ide/ide-taskfile.c
+++ b/drivers/ide/ide-taskfile.c
@@ -238,7 +238,7 @@ EXPORT_SYMBOL(task_no_data_intr);
238static u8 wait_drive_not_busy(ide_drive_t *drive) 238static u8 wait_drive_not_busy(ide_drive_t *drive)
239{ 239{
240 ide_hwif_t *hwif = HWIF(drive); 240 ide_hwif_t *hwif = HWIF(drive);
241 int retries = 100; 241 int retries;
242 u8 stat; 242 u8 stat;
243 243
244 /* 244 /*
@@ -246,10 +246,14 @@ static u8 wait_drive_not_busy(ide_drive_t *drive)
246 * This can take up to 10 usec, but we will wait max 1 ms 246 * This can take up to 10 usec, but we will wait max 1 ms
247 * (drive_cmd_intr() waits that long). 247 * (drive_cmd_intr() waits that long).
248 */ 248 */
249 while (((stat = hwif->INB(IDE_STATUS_REG)) & BUSY_STAT) && retries--) 249 for (retries = 0; retries < 100; retries++) {
250 udelay(10); 250 if ((stat = hwif->INB(IDE_STATUS_REG)) & BUSY_STAT)
251 udelay(10);
252 else
253 break;
254 }
251 255
252 if (!retries) 256 if (stat & BUSY_STAT)
253 printk(KERN_ERR "%s: drive still BUSY!\n", drive->name); 257 printk(KERN_ERR "%s: drive still BUSY!\n", drive->name);
254 258
255 return stat; 259 return stat;
diff --git a/drivers/ide/pci/amd74xx.c b/drivers/ide/pci/amd74xx.c
index 9db1be826e80..a2be65fcf89c 100644
--- a/drivers/ide/pci/amd74xx.c
+++ b/drivers/ide/pci/amd74xx.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * Version 2.15 2 * Version 2.16
3 * 3 *
4 * AMD 755/756/766/8111 and nVidia nForce/2/2s/3/3s/CK804/MCP04 4 * AMD 755/756/766/8111 and nVidia nForce/2/2s/3/3s/CK804/MCP04
5 * IDE driver for Linux. 5 * IDE driver for Linux.
@@ -244,10 +244,8 @@ static int amd_set_drive(ide_drive_t *drive, u8 speed)
244 struct ide_timing t, p; 244 struct ide_timing t, p;
245 int T, UT; 245 int T, UT;
246 246
247 if (speed != XFER_PIO_SLOW && speed != drive->current_speed) 247 if (speed != XFER_PIO_SLOW)
248 if (ide_config_drive_speed(drive, speed)) 248 ide_config_drive_speed(drive, speed);
249 printk(KERN_WARNING "ide%d: Drive %d didn't accept speed setting. Oh, well.\n",
250 drive->dn >> 1, drive->dn & 1);
251 249
252 T = 1000000000 / amd_clock; 250 T = 1000000000 / amd_clock;
253 UT = T / min_t(int, max_t(int, amd_config->flags & AMD_UDMA, 1), 2); 251 UT = T / min_t(int, max_t(int, amd_config->flags & AMD_UDMA, 1), 2);
diff --git a/drivers/ide/pci/hpt366.c b/drivers/ide/pci/hpt366.c
index ce8a5449a574..c33d0b0f11c9 100644
--- a/drivers/ide/pci/hpt366.c
+++ b/drivers/ide/pci/hpt366.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * linux/drivers/ide/pci/hpt366.c Version 1.04 Jun 4, 2007 2 * linux/drivers/ide/pci/hpt366.c Version 1.06 Jun 27, 2007
3 * 3 *
4 * Copyright (C) 1999-2003 Andre Hedrick <andre@linux-ide.org> 4 * Copyright (C) 1999-2003 Andre Hedrick <andre@linux-ide.org>
5 * Portions Copyright (C) 2001 Sun Microsystems, Inc. 5 * Portions Copyright (C) 2001 Sun Microsystems, Inc.
@@ -182,6 +182,7 @@ static const char *bad_ata66_4[] = {
182 "IC35L040AVER07-0", 182 "IC35L040AVER07-0",
183 "IC35L060AVER07-0", 183 "IC35L060AVER07-0",
184 "WDC AC310200R", 184 "WDC AC310200R",
185 "MAXTOR STM3320620A",
185 NULL 186 NULL
186}; 187};
187 188
@@ -1513,18 +1514,28 @@ static int __devinit init_setup_hpt366(struct pci_dev *dev, ide_pci_device_t *d)
1513 goto init_single; 1514 goto init_single;
1514 1515
1515 /* 1516 /*
1516 * HPT36x chips are single channel and 1517 * HPT36x chips have one channel per function and have
1517 * do not seem to have the channel enable bit... 1518 * both channel enable bits located differently and visible
1519 * to both functions -- really stupid design decision... :-(
1520 * Bit 4 is for the primary channel, bit 5 for the secondary.
1518 */ 1521 */
1519 d->channels = 1; 1522 d->channels = 1;
1520 d->enablebits[0].reg = 0; 1523 d->enablebits[0].mask = d->enablebits[0].val = 0x10;
1521 1524
1522 if ((dev2 = pci_get_slot(dev->bus, dev->devfn + 1)) != NULL) { 1525 if ((dev2 = pci_get_slot(dev->bus, dev->devfn + 1)) != NULL) {
1523 u8 pin1 = 0, pin2 = 0; 1526 u8 mcr1 = 0, pin1 = 0, pin2 = 0;
1524 int ret; 1527 int ret;
1525 1528
1526 pci_set_drvdata(dev2, info[rev]); 1529 pci_set_drvdata(dev2, info[rev]);
1527 1530
1531 /*
1532 * Now we'll have to force both channels enabled if
1533 * at least one of them has been enabled by BIOS...
1534 */
1535 pci_read_config_byte(dev, 0x50, &mcr1);
1536 if (mcr1 & 0x30)
1537 pci_write_config_byte(dev, 0x50, mcr1 | 0x30);
1538
1528 pci_read_config_byte(dev, PCI_INTERRUPT_PIN, &pin1); 1539 pci_read_config_byte(dev, PCI_INTERRUPT_PIN, &pin1);
1529 pci_read_config_byte(dev2, PCI_INTERRUPT_PIN, &pin2); 1540 pci_read_config_byte(dev2, PCI_INTERRUPT_PIN, &pin2);
1530 if (pin1 != pin2 && dev->irq == dev2->irq) { 1541 if (pin1 != pin2 && dev->irq == dev2->irq) {
diff --git a/drivers/ide/pci/it821x.c b/drivers/ide/pci/it821x.c
index 4bd4bf02e917..3aeb7f1b7916 100644
--- a/drivers/ide/pci/it821x.c
+++ b/drivers/ide/pci/it821x.c
@@ -1,6 +1,6 @@
1 1
2/* 2/*
3 * linux/drivers/ide/pci/it821x.c Version 0.15 Jun 2 2007 3 * linux/drivers/ide/pci/it821x.c Version 0.16 Jul 3 2007
4 * 4 *
5 * Copyright (C) 2004 Red Hat <alan@redhat.com> 5 * Copyright (C) 2004 Red Hat <alan@redhat.com>
6 * Copyright (C) 2007 Bartlomiej Zolnierkiewicz 6 * Copyright (C) 2007 Bartlomiej Zolnierkiewicz
@@ -660,7 +660,6 @@ static void __devinit init_hwif_it821x(ide_hwif_t *hwif)
660 660
661 hwif->ultra_mask = 0x7f; 661 hwif->ultra_mask = 0x7f;
662 hwif->mwdma_mask = 0x07; 662 hwif->mwdma_mask = 0x07;
663 hwif->swdma_mask = 0x07;
664 663
665 hwif->ide_dma_check = &it821x_config_drive_for_dma; 664 hwif->ide_dma_check = &it821x_config_drive_for_dma;
666 if (!(hwif->udma_four)) 665 if (!(hwif->udma_four))
diff --git a/drivers/ide/pci/pdc202xx_new.c b/drivers/ide/pci/pdc202xx_new.c
index cc0bfdcf1f19..0765dce6948e 100644
--- a/drivers/ide/pci/pdc202xx_new.c
+++ b/drivers/ide/pci/pdc202xx_new.c
@@ -306,11 +306,13 @@ static long __devinit read_counter(u32 dma_base)
306 */ 306 */
307static long __devinit detect_pll_input_clock(unsigned long dma_base) 307static long __devinit detect_pll_input_clock(unsigned long dma_base)
308{ 308{
309 struct timeval start_time, end_time;
309 long start_count, end_count; 310 long start_count, end_count;
310 long pll_input; 311 long pll_input, usec_elapsed;
311 u8 scr1; 312 u8 scr1;
312 313
313 start_count = read_counter(dma_base); 314 start_count = read_counter(dma_base);
315 do_gettimeofday(&start_time);
314 316
315 /* Start the test mode */ 317 /* Start the test mode */
316 outb(0x01, dma_base + 0x01); 318 outb(0x01, dma_base + 0x01);
@@ -322,6 +324,7 @@ static long __devinit detect_pll_input_clock(unsigned long dma_base)
322 mdelay(10); 324 mdelay(10);
323 325
324 end_count = read_counter(dma_base); 326 end_count = read_counter(dma_base);
327 do_gettimeofday(&end_time);
325 328
326 /* Stop the test mode */ 329 /* Stop the test mode */
327 outb(0x01, dma_base + 0x01); 330 outb(0x01, dma_base + 0x01);
@@ -333,7 +336,10 @@ static long __devinit detect_pll_input_clock(unsigned long dma_base)
333 * Calculate the input clock in Hz 336 * Calculate the input clock in Hz
334 * (the clock counter is 30 bit wide and counts down) 337 * (the clock counter is 30 bit wide and counts down)
335 */ 338 */
336 pll_input = ((start_count - end_count) & 0x3ffffff) * 100; 339 usec_elapsed = (end_time.tv_sec - start_time.tv_sec) * 1000000 +
340 (end_time.tv_usec - start_time.tv_usec);
341 pll_input = ((start_count - end_count) & 0x3ffffff) / 10 *
342 (10000000 / usec_elapsed);
337 343
338 DBG("start[%ld] end[%ld]\n", start_count, end_count); 344 DBG("start[%ld] end[%ld]\n", start_count, end_count);
339 345
diff --git a/drivers/ide/setup-pci.c b/drivers/ide/setup-pci.c
index 67035ba4bf5e..c88d33225cf9 100644
--- a/drivers/ide/setup-pci.c
+++ b/drivers/ide/setup-pci.c
@@ -872,11 +872,15 @@ void __init ide_scan_pcibus (int scan_direction)
872 * are post init. 872 * are post init.
873 */ 873 */
874 874
875 list_for_each_safe(l, n, &ide_pci_drivers) 875 list_for_each_safe(l, n, &ide_pci_drivers) {
876 {
877 list_del(l); 876 list_del(l);
878 d = list_entry(l, struct pci_driver, node); 877 d = list_entry(l, struct pci_driver, node);
879 __pci_register_driver(d, d->driver.owner, d->driver.mod_name); 878 if (__pci_register_driver(d, d->driver.owner,
879 d->driver.mod_name)) {
880 printk(KERN_ERR "%s: failed to register driver "
881 "for %s\n", __FUNCTION__,
882 d->driver.mod_name);
883 }
880 } 884 }
881} 885}
882#endif 886#endif
diff --git a/drivers/infiniband/ulp/ipoib/ipoib_cm.c b/drivers/infiniband/ulp/ipoib/ipoib_cm.c
index 5ffc464c99aa..ea74d1eaf004 100644
--- a/drivers/infiniband/ulp/ipoib/ipoib_cm.c
+++ b/drivers/infiniband/ulp/ipoib/ipoib_cm.c
@@ -148,8 +148,8 @@ partial_error:
148 148
149 ib_dma_unmap_single(priv->ca, mapping[0], IPOIB_CM_HEAD_SIZE, DMA_FROM_DEVICE); 149 ib_dma_unmap_single(priv->ca, mapping[0], IPOIB_CM_HEAD_SIZE, DMA_FROM_DEVICE);
150 150
151 for (; i >= 0; --i) 151 for (; i > 0; --i)
152 ib_dma_unmap_single(priv->ca, mapping[i + 1], PAGE_SIZE, DMA_FROM_DEVICE); 152 ib_dma_unmap_single(priv->ca, mapping[i], PAGE_SIZE, DMA_FROM_DEVICE);
153 153
154 dev_kfree_skb_any(skb); 154 dev_kfree_skb_any(skb);
155 return NULL; 155 return NULL;
diff --git a/drivers/input/keyboard/atkbd.c b/drivers/input/keyboard/atkbd.c
index be1fe46cd308..9950fcb33650 100644
--- a/drivers/input/keyboard/atkbd.c
+++ b/drivers/input/keyboard/atkbd.c
@@ -219,7 +219,8 @@ struct atkbd {
219 unsigned long time; 219 unsigned long time;
220 unsigned long err_count; 220 unsigned long err_count;
221 221
222 struct work_struct event_work; 222 struct delayed_work event_work;
223 unsigned long event_jiffies;
223 struct mutex event_mutex; 224 struct mutex event_mutex;
224 unsigned long event_mask; 225 unsigned long event_mask;
225}; 226};
@@ -408,9 +409,10 @@ static irqreturn_t atkbd_interrupt(struct serio *serio, unsigned char data,
408 goto out; 409 goto out;
409 case ATKBD_RET_ACK: 410 case ATKBD_RET_ACK:
410 case ATKBD_RET_NAK: 411 case ATKBD_RET_NAK:
411 printk(KERN_WARNING "atkbd.c: Spurious %s on %s. " 412 if (printk_ratelimit())
412 "Some program might be trying access hardware directly.\n", 413 printk(KERN_WARNING "atkbd.c: Spurious %s on %s. "
413 data == ATKBD_RET_ACK ? "ACK" : "NAK", serio->phys); 414 "Some program might be trying access hardware directly.\n",
415 data == ATKBD_RET_ACK ? "ACK" : "NAK", serio->phys);
414 goto out; 416 goto out;
415 case ATKBD_RET_HANGEUL: 417 case ATKBD_RET_HANGEUL:
416 case ATKBD_RET_HANJA: 418 case ATKBD_RET_HANJA:
@@ -565,7 +567,7 @@ static int atkbd_set_leds(struct atkbd *atkbd)
565 567
566static void atkbd_event_work(struct work_struct *work) 568static void atkbd_event_work(struct work_struct *work)
567{ 569{
568 struct atkbd *atkbd = container_of(work, struct atkbd, event_work); 570 struct atkbd *atkbd = container_of(work, struct atkbd, event_work.work);
569 571
570 mutex_lock(&atkbd->event_mutex); 572 mutex_lock(&atkbd->event_mutex);
571 573
@@ -579,12 +581,30 @@ static void atkbd_event_work(struct work_struct *work)
579} 581}
580 582
581/* 583/*
584 * Schedule switch for execution. We need to throttle requests,
585 * otherwise keyboard may become unresponsive.
586 */
587static void atkbd_schedule_event_work(struct atkbd *atkbd, int event_bit)
588{
589 unsigned long delay = msecs_to_jiffies(50);
590
591 if (time_after(jiffies, atkbd->event_jiffies + delay))
592 delay = 0;
593
594 atkbd->event_jiffies = jiffies;
595 set_bit(event_bit, &atkbd->event_mask);
596 wmb();
597 schedule_delayed_work(&atkbd->event_work, delay);
598}
599
600/*
582 * Event callback from the input module. Events that change the state of 601 * Event callback from the input module. Events that change the state of
583 * the hardware are processed here. If action can not be performed in 602 * the hardware are processed here. If action can not be performed in
584 * interrupt context it is offloaded to atkbd_event_work. 603 * interrupt context it is offloaded to atkbd_event_work.
585 */ 604 */
586 605
587static int atkbd_event(struct input_dev *dev, unsigned int type, unsigned int code, int value) 606static int atkbd_event(struct input_dev *dev,
607 unsigned int type, unsigned int code, int value)
588{ 608{
589 struct atkbd *atkbd = input_get_drvdata(dev); 609 struct atkbd *atkbd = input_get_drvdata(dev);
590 610
@@ -594,19 +614,12 @@ static int atkbd_event(struct input_dev *dev, unsigned int type, unsigned int co
594 switch (type) { 614 switch (type) {
595 615
596 case EV_LED: 616 case EV_LED:
597 set_bit(ATKBD_LED_EVENT_BIT, &atkbd->event_mask); 617 atkbd_schedule_event_work(atkbd, ATKBD_LED_EVENT_BIT);
598 wmb();
599 schedule_work(&atkbd->event_work);
600 return 0; 618 return 0;
601 619
602 case EV_REP: 620 case EV_REP:
603 621 if (!atkbd->softrepeat)
604 if (!atkbd->softrepeat) { 622 atkbd_schedule_event_work(atkbd, ATKBD_REP_EVENT_BIT);
605 set_bit(ATKBD_REP_EVENT_BIT, &atkbd->event_mask);
606 wmb();
607 schedule_work(&atkbd->event_work);
608 }
609
610 return 0; 623 return 0;
611 } 624 }
612 625
@@ -940,7 +953,7 @@ static int atkbd_connect(struct serio *serio, struct serio_driver *drv)
940 953
941 atkbd->dev = dev; 954 atkbd->dev = dev;
942 ps2_init(&atkbd->ps2dev, serio); 955 ps2_init(&atkbd->ps2dev, serio);
943 INIT_WORK(&atkbd->event_work, atkbd_event_work); 956 INIT_DELAYED_WORK(&atkbd->event_work, atkbd_event_work);
944 mutex_init(&atkbd->event_mutex); 957 mutex_init(&atkbd->event_mutex);
945 958
946 switch (serio->id.type) { 959 switch (serio->id.type) {
diff --git a/drivers/input/serio/i8042-x86ia64io.h b/drivers/input/serio/i8042-x86ia64io.h
index f4a2517925e4..4fca1e7f2678 100644
--- a/drivers/input/serio/i8042-x86ia64io.h
+++ b/drivers/input/serio/i8042-x86ia64io.h
@@ -200,6 +200,17 @@ static struct dmi_system_id __initdata i8042_dmi_nomux_table[] = {
200 }, 200 },
201 }, 201 },
202 { 202 {
203 /*
204 * Like DV4017EA does not raise AUXERR for errors on MUX ports.
205 */
206 .ident = "HP Pavilion ZT1000",
207 .matches = {
208 DMI_MATCH(DMI_SYS_VENDOR, "Hewlett-Packard"),
209 DMI_MATCH(DMI_PRODUCT_NAME, "HP Pavilion Notebook PC"),
210 DMI_MATCH(DMI_PRODUCT_VERSION, "HP Pavilion Notebook ZT1000"),
211 },
212 },
213 {
203 .ident = "Toshiba P10", 214 .ident = "Toshiba P10",
204 .matches = { 215 .matches = {
205 DMI_MATCH(DMI_SYS_VENDOR, "TOSHIBA"), 216 DMI_MATCH(DMI_SYS_VENDOR, "TOSHIBA"),
diff --git a/drivers/input/serio/serio.c b/drivers/input/serio/serio.c
index 5895202b972c..a8f3bc1dff22 100644
--- a/drivers/input/serio/serio.c
+++ b/drivers/input/serio/serio.c
@@ -769,8 +769,10 @@ static int serio_driver_remove(struct device *dev)
769 769
770static void serio_cleanup(struct serio *serio) 770static void serio_cleanup(struct serio *serio)
771{ 771{
772 mutex_lock(&serio->drv_mutex);
772 if (serio->drv && serio->drv->cleanup) 773 if (serio->drv && serio->drv->cleanup)
773 serio->drv->cleanup(serio); 774 serio->drv->cleanup(serio);
775 mutex_unlock(&serio->drv_mutex);
774} 776}
775 777
776static void serio_shutdown(struct device *dev) 778static void serio_shutdown(struct device *dev)
diff --git a/drivers/media/dvb/cinergyT2/cinergyT2.c b/drivers/media/dvb/cinergyT2/cinergyT2.c
index 6aba5b39ed14..b40af48a2edb 100644
--- a/drivers/media/dvb/cinergyT2/cinergyT2.c
+++ b/drivers/media/dvb/cinergyT2/cinergyT2.c
@@ -118,6 +118,7 @@ struct cinergyt2 {
118 struct dvb_demux demux; 118 struct dvb_demux demux;
119 struct usb_device *udev; 119 struct usb_device *udev;
120 struct mutex sem; 120 struct mutex sem;
121 struct mutex wq_sem;
121 struct dvb_adapter adapter; 122 struct dvb_adapter adapter;
122 struct dvb_device *fedev; 123 struct dvb_device *fedev;
123 struct dmxdev dmxdev; 124 struct dmxdev dmxdev;
@@ -482,14 +483,14 @@ static int cinergyt2_open (struct inode *inode, struct file *file)
482 struct cinergyt2 *cinergyt2 = dvbdev->priv; 483 struct cinergyt2 *cinergyt2 = dvbdev->priv;
483 int err = -ERESTARTSYS; 484 int err = -ERESTARTSYS;
484 485
485 if (cinergyt2->disconnect_pending || mutex_lock_interruptible(&cinergyt2->sem)) 486 if (cinergyt2->disconnect_pending || mutex_lock_interruptible(&cinergyt2->wq_sem))
486 return -ERESTARTSYS; 487 goto out;
487 488
488 if ((err = dvb_generic_open(inode, file))) { 489 if (mutex_lock_interruptible(&cinergyt2->sem))
489 mutex_unlock(&cinergyt2->sem); 490 goto out_unlock1;
490 return err;
491 }
492 491
492 if ((err = dvb_generic_open(inode, file)))
493 goto out_unlock2;
493 494
494 if ((file->f_flags & O_ACCMODE) != O_RDONLY) { 495 if ((file->f_flags & O_ACCMODE) != O_RDONLY) {
495 cinergyt2_sleep(cinergyt2, 0); 496 cinergyt2_sleep(cinergyt2, 0);
@@ -498,8 +499,12 @@ static int cinergyt2_open (struct inode *inode, struct file *file)
498 499
499 atomic_inc(&cinergyt2->inuse); 500 atomic_inc(&cinergyt2->inuse);
500 501
502out_unlock2:
501 mutex_unlock(&cinergyt2->sem); 503 mutex_unlock(&cinergyt2->sem);
502 return 0; 504out_unlock1:
505 mutex_unlock(&cinergyt2->wq_sem);
506out:
507 return err;
503} 508}
504 509
505static void cinergyt2_unregister(struct cinergyt2 *cinergyt2) 510static void cinergyt2_unregister(struct cinergyt2 *cinergyt2)
@@ -519,15 +524,17 @@ static int cinergyt2_release (struct inode *inode, struct file *file)
519 struct dvb_device *dvbdev = file->private_data; 524 struct dvb_device *dvbdev = file->private_data;
520 struct cinergyt2 *cinergyt2 = dvbdev->priv; 525 struct cinergyt2 *cinergyt2 = dvbdev->priv;
521 526
522 mutex_lock(&cinergyt2->sem); 527 mutex_lock(&cinergyt2->wq_sem);
523 528
524 if (!cinergyt2->disconnect_pending && (file->f_flags & O_ACCMODE) != O_RDONLY) { 529 if (!cinergyt2->disconnect_pending && (file->f_flags & O_ACCMODE) != O_RDONLY) {
525 cancel_delayed_work(&cinergyt2->query_work); 530 cancel_rearming_delayed_work(&cinergyt2->query_work);
526 flush_scheduled_work(); 531
532 mutex_lock(&cinergyt2->sem);
527 cinergyt2_sleep(cinergyt2, 1); 533 cinergyt2_sleep(cinergyt2, 1);
534 mutex_unlock(&cinergyt2->sem);
528 } 535 }
529 536
530 mutex_unlock(&cinergyt2->sem); 537 mutex_unlock(&cinergyt2->wq_sem);
531 538
532 if (atomic_dec_and_test(&cinergyt2->inuse) && cinergyt2->disconnect_pending) { 539 if (atomic_dec_and_test(&cinergyt2->inuse) && cinergyt2->disconnect_pending) {
533 warn("delayed unregister in release"); 540 warn("delayed unregister in release");
@@ -838,13 +845,13 @@ static int cinergyt2_register_rc(struct cinergyt2 *cinergyt2)
838 845
839static void cinergyt2_unregister_rc(struct cinergyt2 *cinergyt2) 846static void cinergyt2_unregister_rc(struct cinergyt2 *cinergyt2)
840{ 847{
841 cancel_delayed_work(&cinergyt2->rc_query_work); 848 cancel_rearming_delayed_work(&cinergyt2->rc_query_work);
842 input_unregister_device(cinergyt2->rc_input_dev); 849 input_unregister_device(cinergyt2->rc_input_dev);
843} 850}
844 851
845static inline void cinergyt2_suspend_rc(struct cinergyt2 *cinergyt2) 852static inline void cinergyt2_suspend_rc(struct cinergyt2 *cinergyt2)
846{ 853{
847 cancel_delayed_work(&cinergyt2->rc_query_work); 854 cancel_rearming_delayed_work(&cinergyt2->rc_query_work);
848} 855}
849 856
850static inline void cinergyt2_resume_rc(struct cinergyt2 *cinergyt2) 857static inline void cinergyt2_resume_rc(struct cinergyt2 *cinergyt2)
@@ -907,6 +914,7 @@ static int cinergyt2_probe (struct usb_interface *intf,
907 usb_set_intfdata (intf, (void *) cinergyt2); 914 usb_set_intfdata (intf, (void *) cinergyt2);
908 915
909 mutex_init(&cinergyt2->sem); 916 mutex_init(&cinergyt2->sem);
917 mutex_init(&cinergyt2->wq_sem);
910 init_waitqueue_head (&cinergyt2->poll_wq); 918 init_waitqueue_head (&cinergyt2->poll_wq);
911 INIT_DELAYED_WORK(&cinergyt2->query_work, cinergyt2_query); 919 INIT_DELAYED_WORK(&cinergyt2->query_work, cinergyt2_query);
912 920
@@ -974,11 +982,8 @@ static void cinergyt2_disconnect (struct usb_interface *intf)
974{ 982{
975 struct cinergyt2 *cinergyt2 = usb_get_intfdata (intf); 983 struct cinergyt2 *cinergyt2 = usb_get_intfdata (intf);
976 984
977 flush_scheduled_work();
978
979 cinergyt2_unregister_rc(cinergyt2); 985 cinergyt2_unregister_rc(cinergyt2);
980 986 cancel_rearming_delayed_work(&cinergyt2->query_work);
981 cancel_delayed_work(&cinergyt2->query_work);
982 wake_up_interruptible(&cinergyt2->poll_wq); 987 wake_up_interruptible(&cinergyt2->poll_wq);
983 988
984 cinergyt2->demux.dmx.close(&cinergyt2->demux.dmx); 989 cinergyt2->demux.dmx.close(&cinergyt2->demux.dmx);
@@ -992,21 +997,21 @@ static int cinergyt2_suspend (struct usb_interface *intf, pm_message_t state)
992{ 997{
993 struct cinergyt2 *cinergyt2 = usb_get_intfdata (intf); 998 struct cinergyt2 *cinergyt2 = usb_get_intfdata (intf);
994 999
995 if (cinergyt2->disconnect_pending || mutex_lock_interruptible(&cinergyt2->sem)) 1000 if (cinergyt2->disconnect_pending || mutex_lock_interruptible(&cinergyt2->wq_sem))
996 return -ERESTARTSYS; 1001 return -ERESTARTSYS;
997 1002
998 if (1) { 1003 if (1) {
999 struct cinergyt2 *cinergyt2 = usb_get_intfdata (intf);
1000
1001 cinergyt2_suspend_rc(cinergyt2); 1004 cinergyt2_suspend_rc(cinergyt2);
1002 cancel_delayed_work(&cinergyt2->query_work); 1005 cancel_rearming_delayed_work(&cinergyt2->query_work);
1006
1007 mutex_lock(&cinergyt2->sem);
1003 if (cinergyt2->streaming) 1008 if (cinergyt2->streaming)
1004 cinergyt2_stop_stream_xfer(cinergyt2); 1009 cinergyt2_stop_stream_xfer(cinergyt2);
1005 flush_scheduled_work();
1006 cinergyt2_sleep(cinergyt2, 1); 1010 cinergyt2_sleep(cinergyt2, 1);
1011 mutex_unlock(&cinergyt2->sem);
1007 } 1012 }
1008 1013
1009 mutex_unlock(&cinergyt2->sem); 1014 mutex_unlock(&cinergyt2->wq_sem);
1010 return 0; 1015 return 0;
1011} 1016}
1012 1017
@@ -1014,9 +1019,15 @@ static int cinergyt2_resume (struct usb_interface *intf)
1014{ 1019{
1015 struct cinergyt2 *cinergyt2 = usb_get_intfdata (intf); 1020 struct cinergyt2 *cinergyt2 = usb_get_intfdata (intf);
1016 struct dvbt_set_parameters_msg *param = &cinergyt2->param; 1021 struct dvbt_set_parameters_msg *param = &cinergyt2->param;
1022 int err = -ERESTARTSYS;
1017 1023
1018 if (cinergyt2->disconnect_pending || mutex_lock_interruptible(&cinergyt2->sem)) 1024 if (cinergyt2->disconnect_pending || mutex_lock_interruptible(&cinergyt2->wq_sem))
1019 return -ERESTARTSYS; 1025 goto out;
1026
1027 if (mutex_lock_interruptible(&cinergyt2->sem))
1028 goto out_unlock1;
1029
1030 err = 0;
1020 1031
1021 if (!cinergyt2->sleeping) { 1032 if (!cinergyt2->sleeping) {
1022 cinergyt2_sleep(cinergyt2, 0); 1033 cinergyt2_sleep(cinergyt2, 0);
@@ -1029,7 +1040,10 @@ static int cinergyt2_resume (struct usb_interface *intf)
1029 cinergyt2_resume_rc(cinergyt2); 1040 cinergyt2_resume_rc(cinergyt2);
1030 1041
1031 mutex_unlock(&cinergyt2->sem); 1042 mutex_unlock(&cinergyt2->sem);
1032 return 0; 1043out_unlock1:
1044 mutex_unlock(&cinergyt2->wq_sem);
1045out:
1046 return err;
1033} 1047}
1034 1048
1035static const struct usb_device_id cinergyt2_table [] __devinitdata = { 1049static const struct usb_device_id cinergyt2_table [] __devinitdata = {
diff --git a/drivers/media/dvb/ttpci/budget-core.c b/drivers/media/dvb/ttpci/budget-core.c
index 2557ac9620d0..b611f2b1f8bc 100644
--- a/drivers/media/dvb/ttpci/budget-core.c
+++ b/drivers/media/dvb/ttpci/budget-core.c
@@ -529,7 +529,7 @@ int ttpci_budget_init(struct budget *budget, struct saa7146_dev *dev,
529 if (bi->type != BUDGET_FS_ACTIVY) 529 if (bi->type != BUDGET_FS_ACTIVY)
530 saa7146_setgpio(dev, 2, SAA7146_GPIO_OUTHI); 530 saa7146_setgpio(dev, 2, SAA7146_GPIO_OUTHI);
531 531
532 if (budget_register(budget) == 0) 532 if ((ret = budget_register(budget)) == 0)
533 return 0; /* Everything OK */ 533 return 0; /* Everything OK */
534 534
535 /* An error occurred, cleanup resources */ 535 /* An error occurred, cleanup resources */
diff --git a/drivers/media/video/bt8xx/bttv-driver.c b/drivers/media/video/bt8xx/bttv-driver.c
index 1c38723d3169..b1fedb0f6431 100644
--- a/drivers/media/video/bt8xx/bttv-driver.c
+++ b/drivers/media/video/bt8xx/bttv-driver.c
@@ -1331,7 +1331,7 @@ set_tvnorm(struct bttv *btv, unsigned int norm)
1331 1331
1332/* Call with btv->lock down. */ 1332/* Call with btv->lock down. */
1333static void 1333static void
1334set_input(struct bttv *btv, unsigned int input) 1334set_input(struct bttv *btv, unsigned int input, unsigned int norm)
1335{ 1335{
1336 unsigned long flags; 1336 unsigned long flags;
1337 1337
@@ -1350,7 +1350,7 @@ set_input(struct bttv *btv, unsigned int input)
1350 } 1350 }
1351 audio_input(btv,(input == bttv_tvcards[btv->c.type].tuner ? 1351 audio_input(btv,(input == bttv_tvcards[btv->c.type].tuner ?
1352 TVAUDIO_INPUT_TUNER : TVAUDIO_INPUT_EXTERN)); 1352 TVAUDIO_INPUT_TUNER : TVAUDIO_INPUT_EXTERN));
1353 set_tvnorm(btv,btv->tvnorm); 1353 set_tvnorm(btv, norm);
1354 i2c_vidiocschan(btv); 1354 i2c_vidiocschan(btv);
1355} 1355}
1356 1356
@@ -1441,7 +1441,7 @@ static void bttv_reinit_bt848(struct bttv *btv)
1441 1441
1442 init_bt848(btv); 1442 init_bt848(btv);
1443 btv->pll.pll_current = -1; 1443 btv->pll.pll_current = -1;
1444 set_input(btv,btv->input); 1444 set_input(btv, btv->input, btv->tvnorm);
1445} 1445}
1446 1446
1447static int get_control(struct bttv *btv, struct v4l2_control *c) 1447static int get_control(struct bttv *btv, struct v4l2_control *c)
@@ -2011,8 +2011,7 @@ static int bttv_common_ioctls(struct bttv *btv, unsigned int cmd, void *arg)
2011 return 0; 2011 return 0;
2012 } 2012 }
2013 2013
2014 btv->tvnorm = v->norm; 2014 set_input(btv, v->channel, v->norm);
2015 set_input(btv,v->channel);
2016 mutex_unlock(&btv->lock); 2015 mutex_unlock(&btv->lock);
2017 return 0; 2016 return 0;
2018 } 2017 }
@@ -2148,7 +2147,7 @@ static int bttv_common_ioctls(struct bttv *btv, unsigned int cmd, void *arg)
2148 if (*i > bttv_tvcards[btv->c.type].video_inputs) 2147 if (*i > bttv_tvcards[btv->c.type].video_inputs)
2149 return -EINVAL; 2148 return -EINVAL;
2150 mutex_lock(&btv->lock); 2149 mutex_lock(&btv->lock);
2151 set_input(btv,*i); 2150 set_input(btv, *i, btv->tvnorm);
2152 mutex_unlock(&btv->lock); 2151 mutex_unlock(&btv->lock);
2153 return 0; 2152 return 0;
2154 } 2153 }
@@ -4780,7 +4779,7 @@ static int __devinit bttv_probe(struct pci_dev *dev,
4780 bt848_hue(btv,32768); 4779 bt848_hue(btv,32768);
4781 bt848_sat(btv,32768); 4780 bt848_sat(btv,32768);
4782 audio_mute(btv, 1); 4781 audio_mute(btv, 1);
4783 set_input(btv,0); 4782 set_input(btv, 0, btv->tvnorm);
4784 bttv_crop_reset(&btv->crop[0], btv->tvnorm); 4783 bttv_crop_reset(&btv->crop[0], btv->tvnorm);
4785 btv->crop[1] = btv->crop[0]; /* current = default */ 4784 btv->crop[1] = btv->crop[0]; /* current = default */
4786 disclaim_vbi_lines(btv); 4785 disclaim_vbi_lines(btv);
diff --git a/drivers/media/video/cx88/cx88-blackbird.c b/drivers/media/video/cx88/cx88-blackbird.c
index b0466b88f52c..a80b1cb1abe8 100644
--- a/drivers/media/video/cx88/cx88-blackbird.c
+++ b/drivers/media/video/cx88/cx88-blackbird.c
@@ -1034,6 +1034,8 @@ static int vidioc_g_tuner (struct file *file, void *priv,
1034 1034
1035 if (unlikely(UNSET == core->tuner_type)) 1035 if (unlikely(UNSET == core->tuner_type))
1036 return -EINVAL; 1036 return -EINVAL;
1037 if (0 != t->index)
1038 return -EINVAL;
1037 1039
1038 strcpy(t->name, "Television"); 1040 strcpy(t->name, "Television");
1039 t->type = V4L2_TUNER_ANALOG_TV; 1041 t->type = V4L2_TUNER_ANALOG_TV;
diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig
index 2f2fbffafbe0..616eee9c04f1 100644
--- a/drivers/misc/Kconfig
+++ b/drivers/misc/Kconfig
@@ -187,13 +187,5 @@ config THINKPAD_ACPI_BAY
187 187
188 If you are not sure, say Y here. 188 If you are not sure, say Y here.
189 189
190config BLINK
191 tristate "Keyboard blink driver"
192 help
193 Driver that when loaded will blink the keyboard LEDs continuously.
194 This is useful for debugging and for kernels that cannot necessarily
195 output something to the screen like kexec kernels to give the user
196 a visual indication that the kernel is doing something.
197
198 190
199endmenu 191endmenu
diff --git a/drivers/misc/Makefile b/drivers/misc/Makefile
index 5b6d46de005c..8abbf2f07a65 100644
--- a/drivers/misc/Makefile
+++ b/drivers/misc/Makefile
@@ -7,7 +7,6 @@ obj-$(CONFIG_IBM_ASM) += ibmasm/
7obj-$(CONFIG_HDPU_FEATURES) += hdpuftrs/ 7obj-$(CONFIG_HDPU_FEATURES) += hdpuftrs/
8obj-$(CONFIG_MSI_LAPTOP) += msi-laptop.o 8obj-$(CONFIG_MSI_LAPTOP) += msi-laptop.o
9obj-$(CONFIG_ASUS_LAPTOP) += asus-laptop.o 9obj-$(CONFIG_ASUS_LAPTOP) += asus-laptop.o
10obj-$(CONFIG_BLINK) += blink.o
11obj-$(CONFIG_LKDTM) += lkdtm.o 10obj-$(CONFIG_LKDTM) += lkdtm.o
12obj-$(CONFIG_TIFM_CORE) += tifm_core.o 11obj-$(CONFIG_TIFM_CORE) += tifm_core.o
13obj-$(CONFIG_TIFM_7XX1) += tifm_7xx1.o 12obj-$(CONFIG_TIFM_7XX1) += tifm_7xx1.o
diff --git a/drivers/misc/blink.c b/drivers/misc/blink.c
deleted file mode 100644
index 97f7253ce2d3..000000000000
--- a/drivers/misc/blink.c
+++ /dev/null
@@ -1,45 +0,0 @@
1#include <linux/kernel.h>
2#include <linux/module.h>
3#include <linux/timer.h>
4#include <linux/jiffies.h>
5
6static void do_blink(unsigned long data);
7
8static DEFINE_TIMER(blink_timer, do_blink, 0 ,0);
9
10static void do_blink(unsigned long data)
11{
12 static long count;
13 if (panic_blink)
14 panic_blink(count++);
15 blink_timer.expires = jiffies + msecs_to_jiffies(1);
16 add_timer(&blink_timer);
17}
18
19static int blink_panic_event(struct notifier_block *blk,
20 unsigned long event, void *arg)
21{
22 do_blink(0);
23 return 0;
24}
25
26static struct notifier_block blink_notify = {
27 .notifier_call = blink_panic_event,
28};
29
30static __init int blink_init(void)
31{
32 printk(KERN_INFO "Enabling keyboard blinking\n");
33 atomic_notifier_chain_register(&panic_notifier_list, &blink_notify);
34 return 0;
35}
36
37static __exit void blink_remove(void)
38{
39 del_timer_sync(&blink_timer);
40 atomic_notifier_chain_unregister(&panic_notifier_list, &blink_notify);
41}
42
43module_init(blink_init);
44module_exit(blink_remove);
45
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 7d57f4a25dc1..b49375abb5f4 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -1187,7 +1187,7 @@ config IBMVETH
1187 1187
1188config IBM_EMAC 1188config IBM_EMAC
1189 tristate "PowerPC 4xx on-chip Ethernet support" 1189 tristate "PowerPC 4xx on-chip Ethernet support"
1190 depends on 4xx 1190 depends on 4xx && !PPC_MERGE
1191 help 1191 help
1192 This driver supports the PowerPC 4xx EMAC family of on-chip 1192 This driver supports the PowerPC 4xx EMAC family of on-chip
1193 Ethernet controllers. 1193 Ethernet controllers.
diff --git a/drivers/net/gianfar.c b/drivers/net/gianfar.c
index 6822bf14267b..1b854bf07b09 100644
--- a/drivers/net/gianfar.c
+++ b/drivers/net/gianfar.c
@@ -944,7 +944,7 @@ static inline void gfar_tx_checksum(struct sk_buff *skb, struct txfcb *fcb)
944 flags |= TXFCB_UDP; 944 flags |= TXFCB_UDP;
945 fcb->phcs = udp_hdr(skb)->check; 945 fcb->phcs = udp_hdr(skb)->check;
946 } else 946 } else
947 fcb->phcs = udp_hdr(skb)->check; 947 fcb->phcs = tcp_hdr(skb)->check;
948 948
949 /* l3os is the distance between the start of the 949 /* l3os is the distance between the start of the
950 * frame (skb->data) and the start of the IP hdr. 950 * frame (skb->data) and the start of the IP hdr.
diff --git a/drivers/net/mlx4/main.c b/drivers/net/mlx4/main.c
index 41eafebf5823..c3da2a2f5431 100644
--- a/drivers/net/mlx4/main.c
+++ b/drivers/net/mlx4/main.c
@@ -911,6 +911,8 @@ static struct pci_device_id mlx4_pci_table[] = {
911 { PCI_VDEVICE(MELLANOX, 0x6340) }, /* MT25408 "Hermon" SDR */ 911 { PCI_VDEVICE(MELLANOX, 0x6340) }, /* MT25408 "Hermon" SDR */
912 { PCI_VDEVICE(MELLANOX, 0x634a) }, /* MT25408 "Hermon" DDR */ 912 { PCI_VDEVICE(MELLANOX, 0x634a) }, /* MT25408 "Hermon" DDR */
913 { PCI_VDEVICE(MELLANOX, 0x6354) }, /* MT25408 "Hermon" QDR */ 913 { PCI_VDEVICE(MELLANOX, 0x6354) }, /* MT25408 "Hermon" QDR */
914 { PCI_VDEVICE(MELLANOX, 0x6732) }, /* MT25408 "Hermon" DDR PCIe gen2 */
915 { PCI_VDEVICE(MELLANOX, 0x673c) }, /* MT25408 "Hermon" QDR PCIe gen2 */
914 { 0, } 916 { 0, }
915}; 917};
916 918
diff --git a/drivers/net/myri10ge/myri10ge.c b/drivers/net/myri10ge/myri10ge.c
index 0f9904fe3a5a..d0cc122fa3f0 100644
--- a/drivers/net/myri10ge/myri10ge.c
+++ b/drivers/net/myri10ge/myri10ge.c
@@ -2854,6 +2854,8 @@ static int myri10ge_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
2854 return -ENOMEM; 2854 return -ENOMEM;
2855 } 2855 }
2856 2856
2857 SET_NETDEV_DEV(netdev, &pdev->dev);
2858
2857 mgp = netdev_priv(netdev); 2859 mgp = netdev_priv(netdev);
2858 memset(mgp, 0, sizeof(*mgp)); 2860 memset(mgp, 0, sizeof(*mgp));
2859 mgp->dev = netdev; 2861 mgp->dev = netdev;
diff --git a/drivers/net/netxen/netxen_nic.h b/drivers/net/netxen/netxen_nic.h
index 91f25e0a638e..619503742b7d 100644
--- a/drivers/net/netxen/netxen_nic.h
+++ b/drivers/net/netxen/netxen_nic.h
@@ -937,6 +937,7 @@ struct netxen_adapter {
937 struct netxen_ring_ctx *ctx_desc; 937 struct netxen_ring_ctx *ctx_desc;
938 struct pci_dev *ctx_desc_pdev; 938 struct pci_dev *ctx_desc_pdev;
939 dma_addr_t ctx_desc_phys_addr; 939 dma_addr_t ctx_desc_phys_addr;
940 int intr_scheme;
940 int (*enable_phy_interrupts) (struct netxen_adapter *); 941 int (*enable_phy_interrupts) (struct netxen_adapter *);
941 int (*disable_phy_interrupts) (struct netxen_adapter *); 942 int (*disable_phy_interrupts) (struct netxen_adapter *);
942 void (*handle_phy_intr) (struct netxen_adapter *); 943 void (*handle_phy_intr) (struct netxen_adapter *);
@@ -951,6 +952,24 @@ struct netxen_adapter {
951 int (*stop_port) (struct netxen_adapter *); 952 int (*stop_port) (struct netxen_adapter *);
952}; /* netxen_adapter structure */ 953}; /* netxen_adapter structure */
953 954
955/*
956 * NetXen dma watchdog control structure
957 *
958 * Bit 0 : enabled => R/O: 1 watchdog active, 0 inactive
959 * Bit 1 : disable_request => 1 req disable dma watchdog
960 * Bit 2 : enable_request => 1 req enable dma watchdog
961 * Bit 3-31 : unused
962 */
963
964#define netxen_set_dma_watchdog_disable_req(config_word) \
965 _netxen_set_bits(config_word, 1, 1, 1)
966#define netxen_set_dma_watchdog_enable_req(config_word) \
967 _netxen_set_bits(config_word, 2, 1, 1)
968#define netxen_get_dma_watchdog_enabled(config_word) \
969 ((config_word) & 0x1)
970#define netxen_get_dma_watchdog_disabled(config_word) \
971 (((config_word) >> 1) & 0x1)
972
954/* Max number of xmit producer threads that can run simultaneously */ 973/* Max number of xmit producer threads that can run simultaneously */
955#define MAX_XMIT_PRODUCERS 16 974#define MAX_XMIT_PRODUCERS 16
956 975
@@ -1030,8 +1049,8 @@ int netxen_nic_erase_pxe(struct netxen_adapter *adapter);
1030/* Functions from netxen_nic_init.c */ 1049/* Functions from netxen_nic_init.c */
1031void netxen_free_adapter_offload(struct netxen_adapter *adapter); 1050void netxen_free_adapter_offload(struct netxen_adapter *adapter);
1032int netxen_initialize_adapter_offload(struct netxen_adapter *adapter); 1051int netxen_initialize_adapter_offload(struct netxen_adapter *adapter);
1033void netxen_phantom_init(struct netxen_adapter *adapter, int pegtune_val); 1052int netxen_phantom_init(struct netxen_adapter *adapter, int pegtune_val);
1034void netxen_load_firmware(struct netxen_adapter *adapter); 1053int netxen_load_firmware(struct netxen_adapter *adapter);
1035int netxen_pinit_from_rom(struct netxen_adapter *adapter, int verbose); 1054int netxen_pinit_from_rom(struct netxen_adapter *adapter, int verbose);
1036int netxen_rom_fast_read(struct netxen_adapter *adapter, int addr, int *valp); 1055int netxen_rom_fast_read(struct netxen_adapter *adapter, int addr, int *valp);
1037int netxen_rom_fast_read_words(struct netxen_adapter *adapter, int addr, 1056int netxen_rom_fast_read_words(struct netxen_adapter *adapter, int addr,
@@ -1080,37 +1099,106 @@ struct net_device_stats *netxen_nic_get_stats(struct net_device *netdev);
1080 1099
1081static inline void netxen_nic_disable_int(struct netxen_adapter *adapter) 1100static inline void netxen_nic_disable_int(struct netxen_adapter *adapter)
1082{ 1101{
1083 /* 1102 uint32_t mask = 0x7ff;
1084 * ISR_INT_MASK: Can be read from window 0 or 1. 1103 int retries = 32;
1085 */ 1104
1086 writel(0x7ff, PCI_OFFSET_SECOND_RANGE(adapter, ISR_INT_MASK)); 1105 DPRINTK(1, INFO, "Entered ISR Disable \n");
1106
1107 switch (adapter->portnum) {
1108 case 0:
1109 writel(0x0, NETXEN_CRB_NORMALIZE(adapter, CRB_SW_INT_MASK_0));
1110 break;
1111 case 1:
1112 writel(0x0, NETXEN_CRB_NORMALIZE(adapter, CRB_SW_INT_MASK_1));
1113 break;
1114 case 2:
1115 writel(0x0, NETXEN_CRB_NORMALIZE(adapter, CRB_SW_INT_MASK_2));
1116 break;
1117 case 3:
1118 writel(0x0, NETXEN_CRB_NORMALIZE(adapter, CRB_SW_INT_MASK_3));
1119 break;
1120 }
1087 1121
1122 if (adapter->intr_scheme != -1 &&
1123 adapter->intr_scheme != INTR_SCHEME_PERPORT) {
1124 writel(mask,
1125 (void *)(PCI_OFFSET_SECOND_RANGE(adapter, ISR_INT_MASK)));
1126 }
1127
1128 /* Window = 0 or 1 */
1129 if (!(adapter->flags & NETXEN_NIC_MSI_ENABLED)) {
1130 do {
1131 writel(0xffffffff, (void *)
1132 (PCI_OFFSET_SECOND_RANGE(adapter, ISR_INT_TARGET_STATUS)));
1133 mask = readl((void *)
1134 (pci_base_offset(adapter, ISR_INT_VECTOR)));
1135 if (!(mask & 0x80))
1136 break;
1137 udelay(10);
1138 } while (--retries);
1139
1140 if (!retries) {
1141 printk(KERN_NOTICE "%s: Failed to disable interrupt completely\n",
1142 netxen_nic_driver_name);
1143 }
1144 }
1145
1146 DPRINTK(1, INFO, "Done with Disable Int\n");
1147
1148 return;
1088} 1149}
1089 1150
1090static inline void netxen_nic_enable_int(struct netxen_adapter *adapter) 1151static inline void netxen_nic_enable_int(struct netxen_adapter *adapter)
1091{ 1152{
1092 u32 mask; 1153 u32 mask;
1093 1154
1094 switch (adapter->ahw.board_type) { 1155 DPRINTK(1, INFO, "Entered ISR Enable \n");
1095 case NETXEN_NIC_GBE: 1156
1096 mask = 0x77b; 1157 if (adapter->intr_scheme != -1 &&
1158 adapter->intr_scheme != INTR_SCHEME_PERPORT) {
1159 switch (adapter->ahw.board_type) {
1160 case NETXEN_NIC_GBE:
1161 mask = 0x77b;
1162 break;
1163 case NETXEN_NIC_XGBE:
1164 mask = 0x77f;
1165 break;
1166 default:
1167 mask = 0x7ff;
1168 break;
1169 }
1170
1171 writel(mask,
1172 (void *)(PCI_OFFSET_SECOND_RANGE(adapter, ISR_INT_MASK)));
1173 }
1174 switch (adapter->portnum) {
1175 case 0:
1176 writel(0x1, NETXEN_CRB_NORMALIZE(adapter, CRB_SW_INT_MASK_0));
1177 break;
1178 case 1:
1179 writel(0x1, NETXEN_CRB_NORMALIZE(adapter, CRB_SW_INT_MASK_1));
1097 break; 1180 break;
1098 case NETXEN_NIC_XGBE: 1181 case 2:
1099 mask = 0x77f; 1182 writel(0x1, NETXEN_CRB_NORMALIZE(adapter, CRB_SW_INT_MASK_2));
1100 break; 1183 break;
1101 default: 1184 case 3:
1102 mask = 0x7ff; 1185 writel(0x1, NETXEN_CRB_NORMALIZE(adapter, CRB_SW_INT_MASK_3));
1103 break; 1186 break;
1104 } 1187 }
1105 1188
1106 writel(mask, PCI_OFFSET_SECOND_RANGE(adapter, ISR_INT_MASK));
1107
1108 if (!(adapter->flags & NETXEN_NIC_MSI_ENABLED)) { 1189 if (!(adapter->flags & NETXEN_NIC_MSI_ENABLED)) {
1109 mask = 0xbff; 1190 mask = 0xbff;
1110 writel(0X0, NETXEN_CRB_NORMALIZE(adapter, CRB_INT_VECTOR)); 1191 if (adapter->intr_scheme != -1 &&
1111 writel(mask, PCI_OFFSET_SECOND_RANGE(adapter, 1192 adapter->intr_scheme != INTR_SCHEME_PERPORT) {
1112 ISR_INT_TARGET_MASK)); 1193 writel(0X0, NETXEN_CRB_NORMALIZE(adapter, CRB_INT_VECTOR));
1194 }
1195 writel(mask,
1196 (void *)(PCI_OFFSET_SECOND_RANGE(adapter, ISR_INT_TARGET_MASK)));
1113 } 1197 }
1198
1199 DPRINTK(1, INFO, "Done with enable Int\n");
1200
1201 return;
1114} 1202}
1115 1203
1116/* 1204/*
@@ -1164,6 +1252,62 @@ static inline void get_brd_name_by_type(u32 type, char *name)
1164 name = "Unknown"; 1252 name = "Unknown";
1165} 1253}
1166 1254
1255static inline int
1256dma_watchdog_shutdown_request(struct netxen_adapter *adapter)
1257{
1258 u32 ctrl;
1259
1260 /* check if already inactive */
1261 if (netxen_nic_hw_read_wx(adapter,
1262 NETXEN_CAM_RAM(NETXEN_CAM_RAM_DMA_WATCHDOG_CTRL), &ctrl, 4))
1263 printk(KERN_ERR "failed to read dma watchdog status\n");
1264
1265 if (netxen_get_dma_watchdog_enabled(ctrl) == 0)
1266 return 1;
1267
1268 /* Send the disable request */
1269 netxen_set_dma_watchdog_disable_req(ctrl);
1270 netxen_crb_writelit_adapter(adapter,
1271 NETXEN_CAM_RAM(NETXEN_CAM_RAM_DMA_WATCHDOG_CTRL), ctrl);
1272
1273 return 0;
1274}
1275
1276static inline int
1277dma_watchdog_shutdown_poll_result(struct netxen_adapter *adapter)
1278{
1279 u32 ctrl;
1280
1281 if (netxen_nic_hw_read_wx(adapter,
1282 NETXEN_CAM_RAM(NETXEN_CAM_RAM_DMA_WATCHDOG_CTRL), &ctrl, 4))
1283 printk(KERN_ERR "failed to read dma watchdog status\n");
1284
1285 return ((netxen_get_dma_watchdog_enabled(ctrl) == 0) &&
1286 (netxen_get_dma_watchdog_disabled(ctrl) == 0));
1287}
1288
1289static inline int
1290dma_watchdog_wakeup(struct netxen_adapter *adapter)
1291{
1292 u32 ctrl;
1293
1294 if (netxen_nic_hw_read_wx(adapter,
1295 NETXEN_CAM_RAM(NETXEN_CAM_RAM_DMA_WATCHDOG_CTRL), &ctrl, 4))
1296 printk(KERN_ERR "failed to read dma watchdog status\n");
1297
1298 if (netxen_get_dma_watchdog_enabled(ctrl))
1299 return 1;
1300
1301 /* send the wakeup request */
1302 netxen_set_dma_watchdog_enable_req(ctrl);
1303
1304 netxen_crb_writelit_adapter(adapter,
1305 NETXEN_CAM_RAM(NETXEN_CAM_RAM_DMA_WATCHDOG_CTRL), ctrl);
1306
1307 return 0;
1308}
1309
1310
1167int netxen_is_flash_supported(struct netxen_adapter *adapter); 1311int netxen_is_flash_supported(struct netxen_adapter *adapter);
1168int netxen_get_flash_mac_addr(struct netxen_adapter *adapter, u64 mac[]); 1312int netxen_get_flash_mac_addr(struct netxen_adapter *adapter, u64 mac[]);
1169extern void netxen_change_ringparam(struct netxen_adapter *adapter); 1313extern void netxen_change_ringparam(struct netxen_adapter *adapter);
diff --git a/drivers/net/netxen/netxen_nic_hdr.h b/drivers/net/netxen/netxen_nic_hdr.h
index 608e37b349b4..3276866b17e2 100644
--- a/drivers/net/netxen/netxen_nic_hdr.h
+++ b/drivers/net/netxen/netxen_nic_hdr.h
@@ -687,4 +687,6 @@ enum {
687 687
688#define PCIE_MAX_MASTER_SPLIT (0x14048) 688#define PCIE_MAX_MASTER_SPLIT (0x14048)
689 689
690#define NETXEN_CAM_RAM_DMA_WATCHDOG_CTRL (0x14)
691
690#endif /* __NETXEN_NIC_HDR_H_ */ 692#endif /* __NETXEN_NIC_HDR_H_ */
diff --git a/drivers/net/netxen/netxen_nic_hw.c b/drivers/net/netxen/netxen_nic_hw.c
index c012764d1145..aac15421bd1e 100644
--- a/drivers/net/netxen/netxen_nic_hw.c
+++ b/drivers/net/netxen/netxen_nic_hw.c
@@ -377,7 +377,7 @@ int netxen_nic_hw_resources(struct netxen_adapter *adapter)
377 recv_crb_registers[ctx]. 377 recv_crb_registers[ctx].
378 crb_rcvpeg_state)); 378 crb_rcvpeg_state));
379 while (state != PHAN_PEG_RCV_INITIALIZED && loops < 20) { 379 while (state != PHAN_PEG_RCV_INITIALIZED && loops < 20) {
380 udelay(100); 380 msleep(1);
381 /* Window 1 call */ 381 /* Window 1 call */
382 state = readl(NETXEN_CRB_NORMALIZE(adapter, 382 state = readl(NETXEN_CRB_NORMALIZE(adapter,
383 recv_crb_registers 383 recv_crb_registers
@@ -392,7 +392,11 @@ int netxen_nic_hw_resources(struct netxen_adapter *adapter)
392 return err; 392 return err;
393 } 393 }
394 } 394 }
395 DPRINTK(INFO, "Recieve Peg ready too. starting stuff\n"); 395 adapter->intr_scheme = readl(
396 NETXEN_CRB_NORMALIZE(adapter, CRB_NIC_CAPABILITIES_FW));
397 printk(KERN_NOTICE "%s: FW capabilities:0x%x\n", netxen_nic_driver_name,
398 adapter->intr_scheme);
399 DPRINTK(INFO, "Receive Peg ready too. starting stuff\n");
396 400
397 addr = netxen_alloc(adapter->ahw.pdev, 401 addr = netxen_alloc(adapter->ahw.pdev,
398 sizeof(struct netxen_ring_ctx) + 402 sizeof(struct netxen_ring_ctx) +
@@ -697,7 +701,7 @@ void netxen_nic_pci_change_crbwindow(struct netxen_adapter *adapter, u32 wndw)
697 adapter->curr_window = 0; 701 adapter->curr_window = 0;
698} 702}
699 703
700void netxen_load_firmware(struct netxen_adapter *adapter) 704int netxen_load_firmware(struct netxen_adapter *adapter)
701{ 705{
702 int i; 706 int i;
703 u32 data, size = 0; 707 u32 data, size = 0;
@@ -709,15 +713,24 @@ void netxen_load_firmware(struct netxen_adapter *adapter)
709 writel(1, NETXEN_CRB_NORMALIZE(adapter, NETXEN_ROMUSB_GLB_CAS_RST)); 713 writel(1, NETXEN_CRB_NORMALIZE(adapter, NETXEN_ROMUSB_GLB_CAS_RST));
710 714
711 for (i = 0; i < size; i++) { 715 for (i = 0; i < size; i++) {
712 if (netxen_rom_fast_read(adapter, flashaddr, (int *)&data) != 0) { 716 int retries = 10;
713 DPRINTK(ERR, 717 if (netxen_rom_fast_read(adapter, flashaddr, (int *)&data) != 0)
714 "Error in netxen_rom_fast_read(). Will skip" 718 return -EIO;
715 "loading flash image\n"); 719
716 return;
717 }
718 off = netxen_nic_pci_set_window(adapter, memaddr); 720 off = netxen_nic_pci_set_window(adapter, memaddr);
719 addr = pci_base_offset(adapter, off); 721 addr = pci_base_offset(adapter, off);
720 writel(data, addr); 722 writel(data, addr);
723 do {
724 if (readl(addr) == data)
725 break;
726 msleep(100);
727 writel(data, addr);
728 } while (--retries);
729 if (!retries) {
730 printk(KERN_ERR "%s: firmware load aborted, write failed at 0x%x\n",
731 netxen_nic_driver_name, memaddr);
732 return -EIO;
733 }
721 flashaddr += 4; 734 flashaddr += 4;
722 memaddr += 4; 735 memaddr += 4;
723 } 736 }
@@ -727,7 +740,7 @@ void netxen_load_firmware(struct netxen_adapter *adapter)
727 NETXEN_CRB_NORMALIZE(adapter, NETXEN_ROMUSB_GLB_CHIP_CLK_CTRL)); 740 NETXEN_CRB_NORMALIZE(adapter, NETXEN_ROMUSB_GLB_CHIP_CLK_CTRL));
728 writel(0, NETXEN_CRB_NORMALIZE(adapter, NETXEN_ROMUSB_GLB_CAS_RST)); 741 writel(0, NETXEN_CRB_NORMALIZE(adapter, NETXEN_ROMUSB_GLB_CAS_RST));
729 742
730 udelay(100); 743 return 0;
731} 744}
732 745
733int 746int
diff --git a/drivers/net/netxen/netxen_nic_init.c b/drivers/net/netxen/netxen_nic_init.c
index bb23f4c360db..1811bcb8c380 100644
--- a/drivers/net/netxen/netxen_nic_init.c
+++ b/drivers/net/netxen/netxen_nic_init.c
@@ -139,6 +139,8 @@ int netxen_init_firmware(struct netxen_adapter *adapter)
139 return err; 139 return err;
140 } 140 }
141 /* Window 1 call */ 141 /* Window 1 call */
142 writel(INTR_SCHEME_PERPORT,
143 NETXEN_CRB_NORMALIZE(adapter, CRB_NIC_CAPABILITIES_HOST));
142 writel(MPORT_MULTI_FUNCTION_MODE, 144 writel(MPORT_MULTI_FUNCTION_MODE,
143 NETXEN_CRB_NORMALIZE(adapter, CRB_MPORT_MODE)); 145 NETXEN_CRB_NORMALIZE(adapter, CRB_MPORT_MODE));
144 writel(PHAN_INITIALIZE_ACK, 146 writel(PHAN_INITIALIZE_ACK,
@@ -405,10 +407,7 @@ static inline int do_rom_fast_write(struct netxen_adapter *adapter, int addr,
405static inline int 407static inline int
406do_rom_fast_read(struct netxen_adapter *adapter, int addr, int *valp) 408do_rom_fast_read(struct netxen_adapter *adapter, int addr, int *valp)
407{ 409{
408 if (jiffies > (last_schedule_time + (8 * HZ))) { 410 cond_resched();
409 last_schedule_time = jiffies;
410 schedule();
411 }
412 411
413 netxen_nic_reg_write(adapter, NETXEN_ROMUSB_ROM_ADDRESS, addr); 412 netxen_nic_reg_write(adapter, NETXEN_ROMUSB_ROM_ADDRESS, addr);
414 netxen_nic_reg_write(adapter, NETXEN_ROMUSB_ROM_ABYTE_CNT, 3); 413 netxen_nic_reg_write(adapter, NETXEN_ROMUSB_ROM_ABYTE_CNT, 3);
@@ -854,10 +853,10 @@ int netxen_pinit_from_rom(struct netxen_adapter *adapter, int verbose)
854 netxen_nic_pci_change_crbwindow(adapter, 1); 853 netxen_nic_pci_change_crbwindow(adapter, 1);
855 } 854 }
856 if (init_delay == 1) { 855 if (init_delay == 1) {
857 ssleep(1); 856 msleep(2000);
858 init_delay = 0; 857 init_delay = 0;
859 } 858 }
860 msleep(1); 859 msleep(20);
861 } 860 }
862 kfree(buf); 861 kfree(buf);
863 862
@@ -933,10 +932,6 @@ int netxen_initialize_adapter_offload(struct netxen_adapter *adapter)
933void netxen_free_adapter_offload(struct netxen_adapter *adapter) 932void netxen_free_adapter_offload(struct netxen_adapter *adapter)
934{ 933{
935 if (adapter->dummy_dma.addr) { 934 if (adapter->dummy_dma.addr) {
936 writel(0, NETXEN_CRB_NORMALIZE(adapter,
937 CRB_HOST_DUMMY_BUF_ADDR_HI));
938 writel(0, NETXEN_CRB_NORMALIZE(adapter,
939 CRB_HOST_DUMMY_BUF_ADDR_LO));
940 pci_free_consistent(adapter->ahw.pdev, 935 pci_free_consistent(adapter->ahw.pdev,
941 NETXEN_HOST_DUMMY_DMA_SIZE, 936 NETXEN_HOST_DUMMY_DMA_SIZE,
942 adapter->dummy_dma.addr, 937 adapter->dummy_dma.addr,
@@ -945,25 +940,32 @@ void netxen_free_adapter_offload(struct netxen_adapter *adapter)
945 } 940 }
946} 941}
947 942
948void netxen_phantom_init(struct netxen_adapter *adapter, int pegtune_val) 943int netxen_phantom_init(struct netxen_adapter *adapter, int pegtune_val)
949{ 944{
950 u32 val = 0; 945 u32 val = 0;
951 int loops = 0; 946 int retries = 30;
952 947
953 if (!pegtune_val) { 948 if (!pegtune_val) {
954 val = readl(NETXEN_CRB_NORMALIZE(adapter, CRB_CMDPEG_STATE)); 949 do {
955 while (val != PHAN_INITIALIZE_COMPLETE && 950 val = readl(NETXEN_CRB_NORMALIZE
956 val != PHAN_INITIALIZE_ACK && loops < 200000) {
957 udelay(100);
958 schedule();
959 val =
960 readl(NETXEN_CRB_NORMALIZE
961 (adapter, CRB_CMDPEG_STATE)); 951 (adapter, CRB_CMDPEG_STATE));
962 loops++; 952 pegtune_val = readl(NETXEN_CRB_NORMALIZE
953 (adapter, NETXEN_ROMUSB_GLB_PEGTUNE_DONE));
954
955 if (val == PHAN_INITIALIZE_COMPLETE ||
956 val == PHAN_INITIALIZE_ACK)
957 return 0;
958
959 msleep(1000);
960 } while (--retries);
961 if (!retries) {
962 printk(KERN_WARNING "netxen_phantom_init: init failed, "
963 "pegtune_val=%x\n", pegtune_val);
964 return -1;
963 } 965 }
964 if (val != PHAN_INITIALIZE_COMPLETE)
965 printk("WARNING: Initial boot wait loop failed...\n");
966 } 966 }
967
968 return 0;
967} 969}
968 970
969int netxen_nic_rx_has_work(struct netxen_adapter *adapter) 971int netxen_nic_rx_has_work(struct netxen_adapter *adapter)
@@ -1120,6 +1122,7 @@ netxen_process_rcv(struct netxen_adapter *adapter, int ctxid,
1120 adapter->stats.csummed++; 1122 adapter->stats.csummed++;
1121 skb->ip_summed = CHECKSUM_UNNECESSARY; 1123 skb->ip_summed = CHECKSUM_UNNECESSARY;
1122 } 1124 }
1125 skb->dev = netdev;
1123 if (desc_ctx == RCV_DESC_LRO_CTXID) { 1126 if (desc_ctx == RCV_DESC_LRO_CTXID) {
1124 /* True length was only available on the last pkt */ 1127 /* True length was only available on the last pkt */
1125 skb_put(skb, buffer->lro_length); 1128 skb_put(skb, buffer->lro_length);
@@ -1224,6 +1227,7 @@ u32 netxen_process_rcv_ring(struct netxen_adapter *adapter, int ctxid, int max)
1224 NETXEN_CRB_NORMALIZE(adapter, 1227 NETXEN_CRB_NORMALIZE(adapter,
1225 recv_crb_registers[adapter->portnum]. 1228 recv_crb_registers[adapter->portnum].
1226 crb_rcv_status_consumer)); 1229 crb_rcv_status_consumer));
1230 wmb();
1227 } 1231 }
1228 1232
1229 return count; 1233 return count;
@@ -1276,11 +1280,13 @@ int netxen_process_cmd_ring(unsigned long data)
1276 if (skb && (cmpxchg(&buffer->skb, skb, 0) == skb)) { 1280 if (skb && (cmpxchg(&buffer->skb, skb, 0) == skb)) {
1277 pci_unmap_single(pdev, frag->dma, frag->length, 1281 pci_unmap_single(pdev, frag->dma, frag->length,
1278 PCI_DMA_TODEVICE); 1282 PCI_DMA_TODEVICE);
1283 frag->dma = 0ULL;
1279 for (i = 1; i < buffer->frag_count; i++) { 1284 for (i = 1; i < buffer->frag_count; i++) {
1280 DPRINTK(INFO, "getting fragment no %d\n", i); 1285 DPRINTK(INFO, "getting fragment no %d\n", i);
1281 frag++; /* Get the next frag */ 1286 frag++; /* Get the next frag */
1282 pci_unmap_page(pdev, frag->dma, frag->length, 1287 pci_unmap_page(pdev, frag->dma, frag->length,
1283 PCI_DMA_TODEVICE); 1288 PCI_DMA_TODEVICE);
1289 frag->dma = 0ULL;
1284 } 1290 }
1285 1291
1286 adapter->stats.skbfreed++; 1292 adapter->stats.skbfreed++;
@@ -1446,6 +1452,7 @@ void netxen_post_rx_buffers(struct netxen_adapter *adapter, u32 ctx, u32 ringid)
1446 writel(msg, 1452 writel(msg,
1447 DB_NORMALIZE(adapter, 1453 DB_NORMALIZE(adapter,
1448 NETXEN_RCV_PRODUCER_OFFSET)); 1454 NETXEN_RCV_PRODUCER_OFFSET));
1455 wmb();
1449 } 1456 }
1450 } 1457 }
1451} 1458}
diff --git a/drivers/net/netxen/netxen_nic_main.c b/drivers/net/netxen/netxen_nic_main.c
index 6167b58d2731..a66ff58366cf 100644
--- a/drivers/net/netxen/netxen_nic_main.c
+++ b/drivers/net/netxen/netxen_nic_main.c
@@ -308,7 +308,13 @@ netxen_nic_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
308 308
309 adapter->netdev = netdev; 309 adapter->netdev = netdev;
310 adapter->pdev = pdev; 310 adapter->pdev = pdev;
311
312 /* this will be read from FW later */
313 adapter->intr_scheme = -1;
314
315 /* This will be reset for mezz cards */
311 adapter->portnum = pci_func_id; 316 adapter->portnum = pci_func_id;
317 adapter->status &= ~NETXEN_NETDEV_STATUS;
312 318
313 netdev->open = netxen_nic_open; 319 netdev->open = netxen_nic_open;
314 netdev->stop = netxen_nic_close; 320 netdev->stop = netxen_nic_close;
@@ -336,11 +342,9 @@ netxen_nic_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
336 if (pci_using_dac) 342 if (pci_using_dac)
337 netdev->features |= NETIF_F_HIGHDMA; 343 netdev->features |= NETIF_F_HIGHDMA;
338 344
339 if (pci_enable_msi(pdev)) { 345 if (pci_enable_msi(pdev))
340 adapter->flags &= ~NETXEN_NIC_MSI_ENABLED; 346 adapter->flags &= ~NETXEN_NIC_MSI_ENABLED;
341 printk(KERN_WARNING "%s: unable to allocate MSI interrupt" 347 else
342 " error\n", netxen_nic_driver_name);
343 } else
344 adapter->flags |= NETXEN_NIC_MSI_ENABLED; 348 adapter->flags |= NETXEN_NIC_MSI_ENABLED;
345 349
346 netdev->irq = pdev->irq; 350 netdev->irq = pdev->irq;
@@ -355,13 +359,6 @@ netxen_nic_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
355 /* initialize the adapter */ 359 /* initialize the adapter */
356 netxen_initialize_adapter_hw(adapter); 360 netxen_initialize_adapter_hw(adapter);
357 361
358#ifdef CONFIG_PPC
359 if ((adapter->ahw.boardcfg.board_type ==
360 NETXEN_BRDTYPE_P2_SB31_10G_IMEZ) &&
361 (pci_func_id == 2))
362 goto err_out_free_adapter;
363#endif /* CONFIG_PPC */
364
365 /* 362 /*
366 * Adapter in our case is quad port so initialize it before 363 * Adapter in our case is quad port so initialize it before
367 * initializing the ports 364 * initializing the ports
@@ -509,22 +506,30 @@ netxen_nic_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
509 NETXEN_CAM_RAM(0x1fc))); 506 NETXEN_CAM_RAM(0x1fc)));
510 if (val == 0x55555555) { 507 if (val == 0x55555555) {
511 /* This is the first boot after power up */ 508 /* This is the first boot after power up */
509 netxen_nic_read_w0(adapter, NETXEN_PCIE_REG(0x4), &val);
510 if (!(val & 0x4)) {
511 val |= 0x4;
512 netxen_nic_write_w0(adapter, NETXEN_PCIE_REG(0x4), val);
513 netxen_nic_read_w0(adapter, NETXEN_PCIE_REG(0x4), &val);
514 if (!(val & 0x4))
515 printk(KERN_ERR "%s: failed to set MSI bit in PCI-e reg\n",
516 netxen_nic_driver_name);
517 }
512 val = readl(NETXEN_CRB_NORMALIZE(adapter, 518 val = readl(NETXEN_CRB_NORMALIZE(adapter,
513 NETXEN_ROMUSB_GLB_SW_RESET)); 519 NETXEN_ROMUSB_GLB_SW_RESET));
514 printk(KERN_INFO"NetXen: read 0x%08x for reset reg.\n",val); 520 printk(KERN_INFO"NetXen: read 0x%08x for reset reg.\n",val);
515 if (val != 0x80000f) { 521 if (val != 0x80000f) {
516 /* clear the register for future unloads/loads */ 522 /* clear the register for future unloads/loads */
517 writel(0, NETXEN_CRB_NORMALIZE(adapter, 523 writel(0, NETXEN_CRB_NORMALIZE(adapter,
518 NETXEN_CAM_RAM(0x1fc))); 524 NETXEN_CAM_RAM(0x1fc)));
519 printk(KERN_ERR "ERROR in NetXen HW init sequence.\n"); 525 printk(KERN_ERR "ERROR in NetXen HW init sequence.\n");
520 err = -ENODEV; 526 err = -ENODEV;
521 goto err_out_free_dev; 527 goto err_out_free_dev;
522 } 528 }
523
524 /* clear the register for future unloads/loads */
525 writel(0, NETXEN_CRB_NORMALIZE(adapter,
526 NETXEN_CAM_RAM(0x1fc)));
527 } 529 }
530
531 /* clear the register for future unloads/loads */
532 writel(0, NETXEN_CRB_NORMALIZE(adapter, NETXEN_CAM_RAM(0x1fc)));
528 printk(KERN_INFO "State: 0x%0x\n", 533 printk(KERN_INFO "State: 0x%0x\n",
529 readl(NETXEN_CRB_NORMALIZE(adapter, CRB_CMDPEG_STATE))); 534 readl(NETXEN_CRB_NORMALIZE(adapter, CRB_CMDPEG_STATE)));
530 535
@@ -542,13 +547,6 @@ netxen_nic_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
542 NETXEN_ROMUSB_GLB_PEGTUNE_DONE)); 547 NETXEN_ROMUSB_GLB_PEGTUNE_DONE));
543 /* Handshake with the card before we register the devices. */ 548 /* Handshake with the card before we register the devices. */
544 netxen_phantom_init(adapter, NETXEN_NIC_PEG_TUNE); 549 netxen_phantom_init(adapter, NETXEN_NIC_PEG_TUNE);
545
546 /* leave the hw in the same state as reboot */
547 writel(0, NETXEN_CRB_NORMALIZE(adapter, CRB_CMDPEG_STATE));
548 netxen_pinit_from_rom(adapter, 0);
549 udelay(500);
550 netxen_load_firmware(adapter);
551 netxen_phantom_init(adapter, NETXEN_NIC_PEG_TUNE);
552 } 550 }
553 551
554 /* 552 /*
@@ -639,8 +637,8 @@ static void __devexit netxen_nic_remove(struct pci_dev *pdev)
639 struct netxen_rx_buffer *buffer; 637 struct netxen_rx_buffer *buffer;
640 struct netxen_recv_context *recv_ctx; 638 struct netxen_recv_context *recv_ctx;
641 struct netxen_rcv_desc_ctx *rcv_desc; 639 struct netxen_rcv_desc_ctx *rcv_desc;
642 int i; 640 int i, ctxid, ring;
643 int ctxid, ring; 641 static int init_firmware_done = 0;
644 642
645 adapter = pci_get_drvdata(pdev); 643 adapter = pci_get_drvdata(pdev);
646 if (adapter == NULL) 644 if (adapter == NULL)
@@ -648,30 +646,20 @@ static void __devexit netxen_nic_remove(struct pci_dev *pdev)
648 646
649 netdev = adapter->netdev; 647 netdev = adapter->netdev;
650 648
651 netxen_nic_disable_int(adapter); 649 unregister_netdev(netdev);
652 if (adapter->irq) 650
653 free_irq(adapter->irq, adapter);
654
655 if (adapter->stop_port) 651 if (adapter->stop_port)
656 adapter->stop_port(adapter); 652 adapter->stop_port(adapter);
657 653
658 if ((adapter->flags & NETXEN_NIC_MSI_ENABLED)) 654 netxen_nic_disable_int(adapter);
659 pci_disable_msi(pdev);
660
661 if (adapter->portnum == 0)
662 netxen_free_adapter_offload(adapter);
663 655
664 if(adapter->portnum == 0) { 656 if (adapter->irq)
665 /* leave the hw in the same state as reboot */ 657 free_irq(adapter->irq, adapter);
666 writel(0, NETXEN_CRB_NORMALIZE(adapter, CRB_CMDPEG_STATE));
667 netxen_pinit_from_rom(adapter, 0);
668 udelay(500);
669 netxen_load_firmware(adapter);
670 netxen_phantom_init(adapter, NETXEN_NIC_PEG_TUNE);
671 }
672 658
673 if (adapter->is_up == NETXEN_ADAPTER_UP_MAGIC) 659 if (adapter->is_up == NETXEN_ADAPTER_UP_MAGIC) {
660 init_firmware_done++;
674 netxen_free_hw_resources(adapter); 661 netxen_free_hw_resources(adapter);
662 }
675 663
676 for (ctxid = 0; ctxid < MAX_RCV_CTX; ++ctxid) { 664 for (ctxid = 0; ctxid < MAX_RCV_CTX; ++ctxid) {
677 recv_ctx = &adapter->recv_ctx[ctxid]; 665 recv_ctx = &adapter->recv_ctx[ctxid];
@@ -691,17 +679,73 @@ static void __devexit netxen_nic_remove(struct pci_dev *pdev)
691 } 679 }
692 } 680 }
693 681
694 unregister_netdev(netdev); 682 if (adapter->flags & NETXEN_NIC_MSI_ENABLED)
683 pci_disable_msi(pdev);
695 684
696 vfree(adapter->cmd_buf_arr); 685 vfree(adapter->cmd_buf_arr);
697 686
687 pci_disable_device(pdev);
688
689 if (adapter->portnum == 0) {
690 if (init_firmware_done) {
691 dma_watchdog_shutdown_request(adapter);
692 msleep(100);
693 i = 100;
694 while ((dma_watchdog_shutdown_poll_result(adapter) != 1) && i) {
695 printk(KERN_INFO "dma_watchdog_shutdown_poll still in progress\n");
696 msleep(100);
697 i--;
698 }
699
700 if (i == 0) {
701 printk(KERN_ERR "dma_watchdog_shutdown_request failed\n");
702 return;
703 }
704
705 /* clear the register for future unloads/loads */
706 writel(0, NETXEN_CRB_NORMALIZE(adapter, NETXEN_CAM_RAM(0x1fc)));
707 printk(KERN_INFO "State: 0x%0x\n",
708 readl(NETXEN_CRB_NORMALIZE(adapter, CRB_CMDPEG_STATE)));
709
710 /* leave the hw in the same state as reboot */
711 writel(0, NETXEN_CRB_NORMALIZE(adapter, CRB_CMDPEG_STATE));
712 if (netxen_pinit_from_rom(adapter, 0))
713 return;
714 msleep(1);
715 if (netxen_load_firmware(adapter))
716 return;
717 netxen_phantom_init(adapter, NETXEN_NIC_PEG_TUNE);
718 }
719
720 /* clear the register for future unloads/loads */
721 writel(0, NETXEN_CRB_NORMALIZE(adapter, NETXEN_CAM_RAM(0x1fc)));
722 printk(KERN_INFO "State: 0x%0x\n",
723 readl(NETXEN_CRB_NORMALIZE(adapter, CRB_CMDPEG_STATE)));
724
725 dma_watchdog_shutdown_request(adapter);
726 msleep(100);
727 i = 100;
728 while ((dma_watchdog_shutdown_poll_result(adapter) != 1) && i) {
729 printk(KERN_INFO "dma_watchdog_shutdown_poll still in progress\n");
730 msleep(100);
731 i--;
732 }
733
734 if (i) {
735 netxen_free_adapter_offload(adapter);
736 } else {
737 printk(KERN_ERR "failed to dma shutdown\n");
738 return;
739 }
740
741 }
742
698 iounmap(adapter->ahw.db_base); 743 iounmap(adapter->ahw.db_base);
699 iounmap(adapter->ahw.pci_base0); 744 iounmap(adapter->ahw.pci_base0);
700 iounmap(adapter->ahw.pci_base1); 745 iounmap(adapter->ahw.pci_base1);
701 iounmap(adapter->ahw.pci_base2); 746 iounmap(adapter->ahw.pci_base2);
702 747
703 pci_release_regions(pdev); 748 pci_release_regions(pdev);
704 pci_disable_device(pdev);
705 pci_set_drvdata(pdev, NULL); 749 pci_set_drvdata(pdev, NULL);
706 750
707 free_netdev(netdev); 751 free_netdev(netdev);
@@ -798,7 +842,7 @@ static int netxen_nic_close(struct net_device *netdev)
798 if (buffrag->dma) { 842 if (buffrag->dma) {
799 pci_unmap_single(adapter->pdev, buffrag->dma, 843 pci_unmap_single(adapter->pdev, buffrag->dma,
800 buffrag->length, PCI_DMA_TODEVICE); 844 buffrag->length, PCI_DMA_TODEVICE);
801 buffrag->dma = (u64) NULL; 845 buffrag->dma = 0ULL;
802 } 846 }
803 for (j = 0; j < cmd_buff->frag_count; j++) { 847 for (j = 0; j < cmd_buff->frag_count; j++) {
804 buffrag++; 848 buffrag++;
@@ -806,7 +850,7 @@ static int netxen_nic_close(struct net_device *netdev)
806 pci_unmap_page(adapter->pdev, buffrag->dma, 850 pci_unmap_page(adapter->pdev, buffrag->dma,
807 buffrag->length, 851 buffrag->length,
808 PCI_DMA_TODEVICE); 852 PCI_DMA_TODEVICE);
809 buffrag->dma = (u64) NULL; 853 buffrag->dma = 0ULL;
810 } 854 }
811 } 855 }
812 /* Free the skb we received in netxen_nic_xmit_frame */ 856 /* Free the skb we received in netxen_nic_xmit_frame */
@@ -816,8 +860,10 @@ static int netxen_nic_close(struct net_device *netdev)
816 } 860 }
817 cmd_buff++; 861 cmd_buff++;
818 } 862 }
819 FLUSH_SCHEDULED_WORK(); 863 if (adapter->is_up == NETXEN_ADAPTER_UP_MAGIC) {
820 del_timer_sync(&adapter->watchdog_timer); 864 FLUSH_SCHEDULED_WORK();
865 del_timer_sync(&adapter->watchdog_timer);
866 }
821 867
822 return 0; 868 return 0;
823} 869}
@@ -1103,28 +1149,26 @@ static int
1103netxen_handle_int(struct netxen_adapter *adapter, struct net_device *netdev) 1149netxen_handle_int(struct netxen_adapter *adapter, struct net_device *netdev)
1104{ 1150{
1105 u32 ret = 0; 1151 u32 ret = 0;
1152 u32 our_int = 0;
1106 1153
1107 DPRINTK(INFO, "Entered handle ISR\n"); 1154 DPRINTK(INFO, "Entered handle ISR\n");
1108 adapter->stats.ints++; 1155 adapter->stats.ints++;
1109 1156
1110 if (!(adapter->flags & NETXEN_NIC_MSI_ENABLED)) { 1157 if (!(adapter->flags & NETXEN_NIC_MSI_ENABLED)) {
1111 int count = 0;
1112 u32 mask;
1113 u32 our_int = 0;
1114 our_int = readl(NETXEN_CRB_NORMALIZE(adapter, CRB_INT_VECTOR)); 1158 our_int = readl(NETXEN_CRB_NORMALIZE(adapter, CRB_INT_VECTOR));
1115 /* not our interrupt */ 1159 /* not our interrupt */
1116 if ((our_int & (0x80 << adapter->portnum)) == 0) 1160 if ((our_int & (0x80 << adapter->portnum)) == 0)
1117 return ret; 1161 return ret;
1118 netxen_nic_disable_int(adapter); 1162 }
1119 /* Window = 0 or 1 */
1120 do {
1121 writel(0xffffffff, PCI_OFFSET_SECOND_RANGE(adapter,
1122 ISR_INT_TARGET_STATUS));
1123 mask = readl(pci_base_offset(adapter, ISR_INT_VECTOR));
1124 } while (((mask & 0x80) != 0) && (++count < 32));
1125 if ((mask & 0x80) != 0)
1126 printk("Could not disable interrupt completely\n");
1127 1163
1164 netxen_nic_disable_int(adapter);
1165
1166 if (adapter->intr_scheme == INTR_SCHEME_PERPORT) {
1167 /* claim interrupt */
1168 if (!(adapter->flags & NETXEN_NIC_MSI_ENABLED)) {
1169 writel(our_int & ~((u32)(0x80 << adapter->portnum)),
1170 NETXEN_CRB_NORMALIZE(adapter, CRB_INT_VECTOR));
1171 }
1128 } 1172 }
1129 1173
1130 if (netxen_nic_rx_has_work(adapter) || netxen_nic_tx_has_work(adapter)) { 1174 if (netxen_nic_rx_has_work(adapter) || netxen_nic_tx_has_work(adapter)) {
@@ -1136,7 +1180,7 @@ netxen_handle_int(struct netxen_adapter *adapter, struct net_device *netdev)
1136 } else { 1180 } else {
1137 static unsigned int intcount = 0; 1181 static unsigned int intcount = 0;
1138 if ((++intcount & 0xfff) == 0xfff) 1182 if ((++intcount & 0xfff) == 0xfff)
1139 printk(KERN_ERR 1183 DPRINTK(KERN_ERR
1140 "%s: %s interrupt %d while in poll\n", 1184 "%s: %s interrupt %d while in poll\n",
1141 netxen_nic_driver_name, netdev->name, 1185 netxen_nic_driver_name, netdev->name,
1142 intcount); 1186 intcount);
@@ -1258,6 +1302,7 @@ static void __exit netxen_exit_module(void)
1258 /* 1302 /*
1259 * Wait for some time to allow the dma to drain, if any. 1303 * Wait for some time to allow the dma to drain, if any.
1260 */ 1304 */
1305 msleep(100);
1261 pci_unregister_driver(&netxen_driver); 1306 pci_unregister_driver(&netxen_driver);
1262 destroy_workqueue(netxen_workq); 1307 destroy_workqueue(netxen_workq);
1263} 1308}
diff --git a/drivers/net/netxen/netxen_nic_phan_reg.h b/drivers/net/netxen/netxen_nic_phan_reg.h
index 9457fc7249c8..10fe6fafa6f6 100644
--- a/drivers/net/netxen/netxen_nic_phan_reg.h
+++ b/drivers/net/netxen/netxen_nic_phan_reg.h
@@ -114,6 +114,20 @@
114#define CRB_V2P_3 NETXEN_NIC_REG(0x29c) 114#define CRB_V2P_3 NETXEN_NIC_REG(0x29c)
115#define CRB_V2P(port) (CRB_V2P_0+((port)*4)) 115#define CRB_V2P(port) (CRB_V2P_0+((port)*4))
116#define CRB_DRIVER_VERSION NETXEN_NIC_REG(0x2a0) 116#define CRB_DRIVER_VERSION NETXEN_NIC_REG(0x2a0)
117/* sw int status/mask registers */
118#define CRB_SW_INT_MASK_0 NETXEN_NIC_REG(0x1d8)
119#define CRB_SW_INT_MASK_1 NETXEN_NIC_REG(0x1e0)
120#define CRB_SW_INT_MASK_2 NETXEN_NIC_REG(0x1e4)
121#define CRB_SW_INT_MASK_3 NETXEN_NIC_REG(0x1e8)
122
123/*
124 * capabilities register, can be used to selectively enable/disable features
125 * for backward compability
126 */
127#define CRB_NIC_CAPABILITIES_HOST NETXEN_NIC_REG(0x1a8)
128#define CRB_NIC_CAPABILITIES_FW NETXEN_NIC_REG(0x1dc)
129
130#define INTR_SCHEME_PERPORT 0x1
117 131
118/* used for ethtool tests */ 132/* used for ethtool tests */
119#define CRB_SCRATCHPAD_TEST NETXEN_NIC_REG(0x280) 133#define CRB_SCRATCHPAD_TEST NETXEN_NIC_REG(0x280)
diff --git a/drivers/net/ns83820.c b/drivers/net/ns83820.c
index 717d8e9b9833..104aab3c957f 100644
--- a/drivers/net/ns83820.c
+++ b/drivers/net/ns83820.c
@@ -1831,11 +1831,13 @@ static int __devinit ns83820_init_one(struct pci_dev *pci_dev, const struct pci_
1831 1831
1832 ndev = alloc_etherdev(sizeof(struct ns83820)); 1832 ndev = alloc_etherdev(sizeof(struct ns83820));
1833 dev = PRIV(ndev); 1833 dev = PRIV(ndev);
1834 dev->ndev = ndev; 1834
1835 err = -ENOMEM; 1835 err = -ENOMEM;
1836 if (!dev) 1836 if (!dev)
1837 goto out; 1837 goto out;
1838 1838
1839 dev->ndev = ndev;
1840
1839 spin_lock_init(&dev->rx_info.lock); 1841 spin_lock_init(&dev->rx_info.lock);
1840 spin_lock_init(&dev->tx_lock); 1842 spin_lock_init(&dev->tx_lock);
1841 spin_lock_init(&dev->misc_lock); 1843 spin_lock_init(&dev->misc_lock);
diff --git a/drivers/net/pcmcia/3c589_cs.c b/drivers/net/pcmcia/3c589_cs.c
index 143ae2ff309e..503f2685fb73 100644
--- a/drivers/net/pcmcia/3c589_cs.c
+++ b/drivers/net/pcmcia/3c589_cs.c
@@ -629,9 +629,9 @@ static int el3_start_xmit(struct sk_buff *skb, struct net_device *dev)
629 outw(SetTxThreshold + 1536, ioaddr + EL3_CMD); 629 outw(SetTxThreshold + 1536, ioaddr + EL3_CMD);
630 } 630 }
631 631
632 dev_kfree_skb(skb);
633 pop_tx_status(dev); 632 pop_tx_status(dev);
634 spin_unlock_irqrestore(&priv->lock, flags); 633 spin_unlock_irqrestore(&priv->lock, flags);
634 dev_kfree_skb(skb);
635 635
636 return 0; 636 return 0;
637} 637}
diff --git a/drivers/net/starfire.c b/drivers/net/starfire.c
index 9d6e454a8f98..786d4b9c07ec 100644
--- a/drivers/net/starfire.c
+++ b/drivers/net/starfire.c
@@ -152,7 +152,7 @@ static int full_duplex[MAX_UNITS] = {0, };
152 * This SUCKS. 152 * This SUCKS.
153 * We need a much better method to determine if dma_addr_t is 64-bit. 153 * We need a much better method to determine if dma_addr_t is 64-bit.
154 */ 154 */
155#if (defined(__i386__) && defined(CONFIG_HIGHMEM64G)) || defined(__x86_64__) || defined (__ia64__) || defined(__mips64__) || (defined(__mips__) && defined(CONFIG_HIGHMEM) && defined(CONFIG_64BIT_PHYS_ADDR)) 155#if (defined(__i386__) && defined(CONFIG_HIGHMEM64G)) || defined(__x86_64__) || defined (__ia64__) || defined(__alpha__) || defined(__mips64__) || (defined(__mips__) && defined(CONFIG_HIGHMEM) && defined(CONFIG_64BIT_PHYS_ADDR))
156/* 64-bit dma_addr_t */ 156/* 64-bit dma_addr_t */
157#define ADDR_64BITS /* This chip uses 64 bit addresses. */ 157#define ADDR_64BITS /* This chip uses 64 bit addresses. */
158#define netdrv_addr_t u64 158#define netdrv_addr_t u64
diff --git a/drivers/net/usb/cdc_ether.c b/drivers/net/usb/cdc_ether.c
index 675ac99a79c6..a42acc3cc609 100644
--- a/drivers/net/usb/cdc_ether.c
+++ b/drivers/net/usb/cdc_ether.c
@@ -144,14 +144,14 @@ int usbnet_generic_cdc_bind(struct usbnet *dev, struct usb_interface *intf)
144 * modem interface from an RNDIS non-modem. 144 * modem interface from an RNDIS non-modem.
145 */ 145 */
146 if (rndis) { 146 if (rndis) {
147 struct usb_cdc_acm_descriptor *d; 147 struct usb_cdc_acm_descriptor *acm;
148 148
149 d = (void *) buf; 149 acm = (void *) buf;
150 if (d->bmCapabilities) { 150 if (acm->bmCapabilities) {
151 dev_dbg(&intf->dev, 151 dev_dbg(&intf->dev,
152 "ACM capabilities %02x, " 152 "ACM capabilities %02x, "
153 "not really RNDIS?\n", 153 "not really RNDIS?\n",
154 d->bmCapabilities); 154 acm->bmCapabilities);
155 goto bad_desc; 155 goto bad_desc;
156 } 156 }
157 } 157 }
diff --git a/drivers/net/usb/dm9601.c b/drivers/net/usb/dm9601.c
index a67638601477..16c7a0e87850 100644
--- a/drivers/net/usb/dm9601.c
+++ b/drivers/net/usb/dm9601.c
@@ -414,18 +414,16 @@ static int dm9601_bind(struct usbnet *dev, struct usb_interface *intf)
414 dev->mii.reg_num_mask = 0x1f; 414 dev->mii.reg_num_mask = 0x1f;
415 415
416 /* reset */ 416 /* reset */
417 ret = dm_write_reg(dev, DM_NET_CTRL, 1); 417 dm_write_reg(dev, DM_NET_CTRL, 1);
418 udelay(20); 418 udelay(20);
419 419
420 /* read MAC */ 420 /* read MAC */
421 ret = dm_read(dev, DM_PHY_ADDR, ETH_ALEN, dev->net->dev_addr); 421 if (dm_read(dev, DM_PHY_ADDR, ETH_ALEN, dev->net->dev_addr) < 0) {
422 if (ret < 0) {
423 printk(KERN_ERR "Error reading MAC address\n"); 422 printk(KERN_ERR "Error reading MAC address\n");
424 ret = -ENODEV; 423 ret = -ENODEV;
425 goto out; 424 goto out;
426 } 425 }
427 426
428
429 /* power up phy */ 427 /* power up phy */
430 dm_write_reg(dev, DM_GPR_CTRL, 1); 428 dm_write_reg(dev, DM_GPR_CTRL, 1);
431 dm_write_reg(dev, DM_GPR_DATA, 0); 429 dm_write_reg(dev, DM_GPR_DATA, 0);
@@ -489,6 +487,8 @@ static struct sk_buff *dm9601_tx_fixup(struct usbnet *dev, struct sk_buff *skb,
489 b3..n: packet data 487 b3..n: packet data
490 */ 488 */
491 489
490 len = skb->len;
491
492 if (skb_headroom(skb) < DM_TX_OVERHEAD) { 492 if (skb_headroom(skb) < DM_TX_OVERHEAD) {
493 struct sk_buff *skb2; 493 struct sk_buff *skb2;
494 494
@@ -501,10 +501,9 @@ static struct sk_buff *dm9601_tx_fixup(struct usbnet *dev, struct sk_buff *skb,
501 501
502 __skb_push(skb, DM_TX_OVERHEAD); 502 __skb_push(skb, DM_TX_OVERHEAD);
503 503
504 len = skb->len;
505 /* usbnet adds padding if length is a multiple of packet size 504 /* usbnet adds padding if length is a multiple of packet size
506 if so, adjust length value in header */ 505 if so, adjust length value in header */
507 if ((len % dev->maxpacket) == 0) 506 if ((skb->len % dev->maxpacket) == 0)
508 len++; 507 len++;
509 508
510 skb->data[0] = len; 509 skb->data[0] = len;
diff --git a/drivers/net/usb/usbnet.c b/drivers/net/usb/usbnet.c
index 5b16d9a1269a..a12f576391cf 100644
--- a/drivers/net/usb/usbnet.c
+++ b/drivers/net/usb/usbnet.c
@@ -953,11 +953,14 @@ static int usbnet_start_xmit (struct sk_buff *skb, struct net_device *net)
953 /* don't assume the hardware handles USB_ZERO_PACKET 953 /* don't assume the hardware handles USB_ZERO_PACKET
954 * NOTE: strictly conforming cdc-ether devices should expect 954 * NOTE: strictly conforming cdc-ether devices should expect
955 * the ZLP here, but ignore the one-byte packet. 955 * the ZLP here, but ignore the one-byte packet.
956 *
957 * FIXME zero that byte, if it doesn't require a new skb.
958 */ 956 */
959 if ((length % dev->maxpacket) == 0) 957 if ((length % dev->maxpacket) == 0) {
960 urb->transfer_buffer_length++; 958 urb->transfer_buffer_length++;
959 if (skb_tailroom(skb)) {
960 skb->data[skb->len] = 0;
961 __skb_put(skb, 1);
962 }
963 }
961 964
962 spin_lock_irqsave (&dev->txq.lock, flags); 965 spin_lock_irqsave (&dev->txq.lock, flags);
963 966
diff --git a/drivers/net/wireless/libertas/Makefile b/drivers/net/wireless/libertas/Makefile
index a1097f59fd46..32ed4136b0d4 100644
--- a/drivers/net/wireless/libertas/Makefile
+++ b/drivers/net/wireless/libertas/Makefile
@@ -2,7 +2,7 @@ libertas-objs := main.o fw.o wext.o \
2 rx.o tx.o cmd.o \ 2 rx.o tx.o cmd.o \
3 cmdresp.o scan.o \ 3 cmdresp.o scan.o \
4 join.o 11d.o \ 4 join.o 11d.o \
5 ioctl.o debugfs.o \ 5 debugfs.o \
6 ethtool.o assoc.o 6 ethtool.o assoc.o
7 7
8usb8xxx-objs += if_bootcmd.o 8usb8xxx-objs += if_bootcmd.o
diff --git a/drivers/net/wireless/libertas/README b/drivers/net/wireless/libertas/README
index 1f92f50b643c..0b133ce63805 100644
--- a/drivers/net/wireless/libertas/README
+++ b/drivers/net/wireless/libertas/README
@@ -28,281 +28,6 @@ DRIVER LOADING
28 28
29 insmod usb8388.ko [fw_name=usb8388.bin] 29 insmod usb8388.ko [fw_name=usb8388.bin]
30 30
31=====================
32IWPRIV COMMAND
33=====================
34
35NAME
36 This manual describes the usage of private commands used in Marvell WLAN
37 Linux Driver. All the commands available in Wlanconfig will not be available
38 in the iwpriv.
39
40SYNOPSIS
41 iwpriv <ethX> <command> [sub-command] ...
42
43 iwpriv ethX setregioncode <n>
44 iwpriv ethX getregioncode
45
46Version 5 Command:
47 iwpriv ethX ledgpio <n>
48
49BT Commands:
50 The blinding table (BT) contains a list of mac addresses that will be,
51 by default, ignored by the firmware. It is also possible to invert this
52 behavior so that we will ignore all traffic except for the portion
53 coming from mac addresess in the list. It is primarily used for
54 debugging and testing networks. It can be edited and inspected with
55 the following commands:
56
57 iwpriv ethX bt_reset
58 iwpriv ethX bt_add <mac_address>
59 iwpriv ethX bt_del <mac_address>
60 iwpriv ethX bt_list <id>
61 iwpriv ethX bt_get_invert <n>
62 iwpriv ethX bt_set_invert <n>
63
64FWT Commands:
65 The forwarding table (FWT) is a feature used to manage mesh network
66 routing in the firmware. The FWT is essentially a routing table that
67 associates a destination mac address (da) with a next hop receiver
68 address (ra). The FWT can be inspected and edited with the following
69 iwpriv commands, which are described in greater detail below.
70 Eventually, the table will be automatically maintained by a custom
71 routing protocol.
72
73 NOTE: FWT commands replace the previous DFT commands. What were the DFT
74 commands?, you might ask. They were an earlier API to the firmware that
75 implemented a simple MAC-layer forwarding mechanism. In the unlikely
76 event that you were using these commands, you must migrate to the new
77 FWT commands which can be used to achieve the same functionality.
78
79 iwpriv ethX fwt_add [parameters]
80 iwpriv ethX fwt_del [parameters]
81 iwpriv ethX fwt_lookup [parameters]
82 iwpriv ethX fwt_list [parameters]
83 iwpriv ethX fwt_list_route [parameters]
84 iwpriv ethX fwt_list_neigh [parameters]
85 iwpriv ethX fwt_reset [parameters]
86 iwpriv ethX fwt_cleanup
87 iwpriv ethX fwt_time
88
89MESH Commands:
90
91 The MESH commands are used to configure various features of the mesh
92 routing protocol. The following commands are supported:
93
94 iwpriv ethX mesh_get_ttl
95 iwpriv ethX mesh_set_ttl ttl
96
97DESCRIPTION
98 Those commands are used to send additional commands to the Marvell WLAN
99 card via the Linux device driver.
100
101 The ethX parameter specifies the network device that is to be used to
102 perform this command on. it could be eth0, eth1 etc.
103
104setregioncode
105 This command is used to set the region code in the station.
106 where value is 'region code' for various regions like
107 USA FCC, Canada IC, Spain, France, Europe ETSI, Japan ...
108
109 Usage:
110 iwpriv ethX setregioncode 0x10: set region code to USA (0x10).
111
112getregioncode
113 This command is used to get the region code information set in the
114 station.
115
116ledgpio
117 This command is used to set/get LEDs.
118
119 iwpriv ethX ledgpio <LEDs>
120 will set the corresponding LED for the GPIO Line.
121
122 iwpriv ethX ledgpio
123 will give u which LEDs are Enabled.
124
125 Usage:
126 iwpriv eth1 ledgpio 1 0 2 1 3 4
127 will enable
128 LED 1 -> GPIO 0
129 LED 2 -> GPIO 1
130 LED 3 -> GPIO 4
131
132 iwpriv eth1 ledgpio
133 shows LED information in the format as mentioned above.
134
135 Note: LED0 is invalid
136 Note: Maximum Number of LEDs are 16.
137
138fwt_add
139 This command is used to insert an entry into the FWT table. The list of
140 parameters must follow the following structure:
141
142 iwpriv ethX fwt_add da ra [metric dir rate ssn dsn hopcount ttl expiration sleepmode snr]
143
144 The parameters between brackets are optional, but they must appear in
145 the order specified. For example, if you want to specify the metric,
146 you must also specify the dir, ssn, and dsn but you need not specify the
147 hopcount, expiration, sleepmode, or snr. Any unspecified parameters
148 will be assigned the defaults specified below.
149
150 The different parameters are:-
151 da -- DA MAC address in the form 00:11:22:33:44:55
152 ra -- RA MAC address in the form 00:11:22:33:44:55
153 metric -- route metric (cost: smaller-metric routes are
154 preferred, default is 0)
155 dir -- direction (1 for direct, 0 for reverse,
156 default is 1)
157 rate -- data rate used for transmission to the RA,
158 as specified for the rateadapt command,
159 default is 3 (11Mbps)
160 ssn -- Source Sequence Number (time at the RA for
161 reverse routes. Default is 0)
162 dsn -- Destination Sequence Number (time at the DA
163 for direct routes. Default is 0)
164 hopcount -- hop count (currently unused, default is 0)
165 ttl -- TTL (Only used in reverse entries)
166 expiration -- entry expiration (in ticks, where a tick is
167 1024us, or ~ 1ms. Use 0 for an indefinite
168 entry, default is 0)
169 sleepmode -- RA's sleep mode (currently unused, default is
170 0)
171 snr -- SNR in the link to RA (currently unused,
172 default is 0)
173
174 The command does not return anything.
175
176fwt_del
177 This command is used to remove an entry to the FWT table. The list of
178 parameters must follow the following structure:
179
180 iwpriv ethX fwt_del da ra [dir]
181
182 where the different parameters are:-
183 da -- DA MAC address (in the form "00:11:22:33:44:55")
184 ra -- RA MAC address (in the form "00:11:22:33:44:55")
185 dir -- direction (1 for direct, 0 for reverse,
186 default is 1)
187
188 The command does not return anything.
189
190fwt_lookup
191 This command is used to get the best route in the FWT table to a given
192 host. The only parameter is the MAC address of the host that is being
193 looked for.
194
195 iwpriv ethX fwt_lookup da
196
197 where:-
198 da -- DA MAC address (in the form "00:11:22:33:44:55")
199
200 The command returns an output string identical to the one returned by
201 fwt_list described below.
202
203
204fwt_list
205 This command is used to list a route from the FWT table. The only
206 parameter is the index into the table. If you want to list all the
207 routes in a table, start with index=0, and keep listing until you get a
208 "(null)" string. Note that the indicies may change as the fwt is
209 updated. It is expected that most users will not use fwt_list directly,
210 but that a utility similar to the traditional route command will be used
211 to invoke fwt_list over and over.
212
213 iwpriv ethX fwt_list index
214
215 The output is a string of the following form:
216
217 da ra valid metric dir rate ssn dsn hopcount ttl expiration
218 sleepmode snr precursor
219
220 where the different fields are:-
221 da -- DA MAC address (in the form "00:11:22:33:44:55")
222 ra -- RA MAC address (in the form "00:11:22:33:44:55")
223 valid -- whether the route is valid (0 if not valid)
224 metric -- route metric (cost: smaller-metric routes are preferred)
225 dir -- direction (1 for direct, 0 for reverse)
226 rate -- data rate used for transmission to the RA,
227 as specified for the rateadapt command
228 ssn -- Source Sequence Number (time at the RA for reverse routes)
229 dsn -- Destination Sequence Number (time at the DA for direct routes)
230 hopcount -- hop count (currently unused)
231 ttl -- TTL (only used in reverse entries)
232 expiration -- entry expiration (in ticks, where a tick is 1024us, or ~ 1ms. Use 0 for an indefinite entry)
233 sleepmode -- RA's sleep mode (currently unused)
234 snr -- SNR in the link to RA (currently unused)
235 precursor -- predecessor in direct routes
236
237fwt_list_route
238 This command is equivalent to fwt_list.
239
240fwt_list_neigh
241 This command is used to list a neighbor from the FWT table. The only
242 parameter is the neighbor ID. If you want to list all the neighbors in a
243 table, start with nid=0, and keep incrementing nid until you get a
244 "(null)" string. Note that the nid from a fwt_list_route command can be
245 used as an input to this command. Also note that this command is meant
246 mostly for debugging. It is expected that users will use fwt_lookup.
247 One important reason for this is that the neighbor id may change as the
248 neighbor table is altered.
249
250 iwpriv ethX fwt_list_neigh nid
251
252 The output is a string of the following form:
253
254 ra sleepmode snr references
255
256 where the different fields are:-
257 ra -- RA MAC address (in the form "00:11:22:33:44:55")
258 sleepmode -- RA's sleep mode (currently unused)
259 snr -- SNR in the link to RA (currently unused)
260 references -- RA's reference counter
261
262fwt_reset
263 This command is used to reset the FWT table, getting rid of all the
264 entries. There are no input parameters.
265
266 iwpriv ethX fwt_reset
267
268 The command does not return anything.
269
270fwt_cleanup
271 This command is used to perform user-based garbage recollection. The
272 FWT table is checked, and all the entries that are expired or invalid
273 are cleaned. Note that this is exported to the driver for debugging
274 purposes, as garbage collection is also fired by the firmware when in
275 space problems. There are no input parameters.
276
277 iwpriv ethX fwt_cleanup
278
279 The command does returns the number of invalid/expired routes deleted.
280
281fwt_time
282 This command returns a card's internal time representation. It is this
283 time that is used to represent the expiration times of FWT entries. The
284 number is not consistent from card to card; it is simply a timer count.
285 The fwt_time command is used to inspect the timer so that expiration
286 times reported by fwt_list can be properly interpreted.
287
288 iwpriv ethX fwt_time
289
290mesh_get_ttl
291
292 The mesh ttl is the number of hops a mesh packet can traverse before it
293 is dropped. This parameter is used to prevent infinite loops in the
294 mesh network. The value returned by this function is the ttl assigned
295 to all mesh packets. Currently there is no way to control the ttl on a
296 per packet or per socket basis.
297
298 iwpriv ethX mesh_get_ttl
299
300mesh_set_ttl ttl
301
302 Set the ttl. The argument must be between 0 and 255.
303
304 iwpriv ethX mesh_set_ttl <ttl>
305
306========================= 31=========================
307ETHTOOL 32ETHTOOL
308========================= 33=========================
diff --git a/drivers/net/wireless/libertas/assoc.c b/drivers/net/wireless/libertas/assoc.c
index f67efa0815fe..afd5617dd92b 100644
--- a/drivers/net/wireless/libertas/assoc.c
+++ b/drivers/net/wireless/libertas/assoc.c
@@ -323,6 +323,8 @@ static int assoc_helper_secinfo(wlan_private *priv,
323{ 323{
324 wlan_adapter *adapter = priv->adapter; 324 wlan_adapter *adapter = priv->adapter;
325 int ret = 0; 325 int ret = 0;
326 u32 do_wpa;
327 u32 rsn = 0;
326 328
327 lbs_deb_enter(LBS_DEB_ASSOC); 329 lbs_deb_enter(LBS_DEB_ASSOC);
328 330
@@ -333,12 +335,34 @@ static int assoc_helper_secinfo(wlan_private *priv,
333 if (ret) 335 if (ret)
334 goto out; 336 goto out;
335 337
336 /* enable/disable RSN */ 338 /* If RSN is already enabled, don't try to enable it again, since
339 * ENABLE_RSN resets internal state machines and will clobber the
340 * 4-way WPA handshake.
341 */
342
343 /* Get RSN enabled/disabled */
337 ret = libertas_prepare_and_send_command(priv, 344 ret = libertas_prepare_and_send_command(priv,
338 cmd_802_11_enable_rsn, 345 cmd_802_11_enable_rsn,
339 cmd_act_set, 346 cmd_act_set,
340 cmd_option_waitforrsp, 347 cmd_option_waitforrsp,
341 0, assoc_req); 348 0, &rsn);
349 if (ret) {
350 lbs_deb_assoc("Failed to get RSN status: %d", ret);
351 goto out;
352 }
353
354 /* Don't re-enable RSN if it's already enabled */
355 do_wpa = (assoc_req->secinfo.WPAenabled || assoc_req->secinfo.WPA2enabled);
356 if (do_wpa == rsn)
357 goto out;
358
359 /* Set RSN enabled/disabled */
360 rsn = do_wpa;
361 ret = libertas_prepare_and_send_command(priv,
362 cmd_802_11_enable_rsn,
363 cmd_act_set,
364 cmd_option_waitforrsp,
365 0, &rsn);
342 366
343out: 367out:
344 lbs_deb_leave_args(LBS_DEB_ASSOC, "ret %d", ret); 368 lbs_deb_leave_args(LBS_DEB_ASSOC, "ret %d", ret);
diff --git a/drivers/net/wireless/libertas/cmd.c b/drivers/net/wireless/libertas/cmd.c
index 124e029f1bf4..13f6528abb00 100644
--- a/drivers/net/wireless/libertas/cmd.c
+++ b/drivers/net/wireless/libertas/cmd.c
@@ -228,17 +228,19 @@ static int wlan_cmd_802_11_enable_rsn(wlan_private * priv,
228 void * pdata_buf) 228 void * pdata_buf)
229{ 229{
230 struct cmd_ds_802_11_enable_rsn *penableRSN = &cmd->params.enbrsn; 230 struct cmd_ds_802_11_enable_rsn *penableRSN = &cmd->params.enbrsn;
231 struct assoc_request * assoc_req = pdata_buf; 231 u32 * enable = pdata_buf;
232 232
233 lbs_deb_enter(LBS_DEB_CMD); 233 lbs_deb_enter(LBS_DEB_CMD);
234 234
235 cmd->command = cpu_to_le16(cmd_802_11_enable_rsn); 235 cmd->command = cpu_to_le16(cmd_802_11_enable_rsn);
236 cmd->size = cpu_to_le16(sizeof(*penableRSN) + S_DS_GEN); 236 cmd->size = cpu_to_le16(sizeof(*penableRSN) + S_DS_GEN);
237 penableRSN->action = cpu_to_le16(cmd_action); 237 penableRSN->action = cpu_to_le16(cmd_action);
238 if (assoc_req->secinfo.WPAenabled || assoc_req->secinfo.WPA2enabled) { 238
239 penableRSN->enable = cpu_to_le16(cmd_enable_rsn); 239 if (cmd_action == cmd_act_set) {
240 } else { 240 if (*enable)
241 penableRSN->enable = cpu_to_le16(cmd_disable_rsn); 241 penableRSN->enable = cpu_to_le16(cmd_enable_rsn);
242 else
243 penableRSN->enable = cpu_to_le16(cmd_enable_rsn);
242 } 244 }
243 245
244 lbs_deb_leave(LBS_DEB_CMD); 246 lbs_deb_leave(LBS_DEB_CMD);
diff --git a/drivers/net/wireless/libertas/cmdresp.c b/drivers/net/wireless/libertas/cmdresp.c
index 0c3b9a583d83..6ac0d4752fa4 100644
--- a/drivers/net/wireless/libertas/cmdresp.c
+++ b/drivers/net/wireless/libertas/cmdresp.c
@@ -537,6 +537,24 @@ static int wlan_ret_get_log(wlan_private * priv,
537 return 0; 537 return 0;
538} 538}
539 539
540static int libertas_ret_802_11_enable_rsn(wlan_private * priv,
541 struct cmd_ds_command *resp)
542{
543 struct cmd_ds_802_11_enable_rsn *enable_rsn = &resp->params.enbrsn;
544 wlan_adapter *adapter = priv->adapter;
545 u32 * pdata_buf = adapter->cur_cmd->pdata_buf;
546
547 lbs_deb_enter(LBS_DEB_CMD);
548
549 if (enable_rsn->action == cpu_to_le16(cmd_act_get)) {
550 if (pdata_buf)
551 *pdata_buf = (u32) le16_to_cpu(enable_rsn->enable);
552 }
553
554 lbs_deb_enter(LBS_DEB_CMD);
555 return 0;
556}
557
540static inline int handle_cmd_response(u16 respcmd, 558static inline int handle_cmd_response(u16 respcmd,
541 struct cmd_ds_command *resp, 559 struct cmd_ds_command *resp,
542 wlan_private *priv) 560 wlan_private *priv)
@@ -610,7 +628,10 @@ static inline int handle_cmd_response(u16 respcmd,
610 case cmd_ret_802_11_authenticate: 628 case cmd_ret_802_11_authenticate:
611 case cmd_ret_802_11_radio_control: 629 case cmd_ret_802_11_radio_control:
612 case cmd_ret_802_11_beacon_stop: 630 case cmd_ret_802_11_beacon_stop:
631 break;
632
613 case cmd_ret_802_11_enable_rsn: 633 case cmd_ret_802_11_enable_rsn:
634 ret = libertas_ret_802_11_enable_rsn(priv, resp);
614 break; 635 break;
615 636
616 case cmd_ret_802_11_data_rate: 637 case cmd_ret_802_11_data_rate:
diff --git a/drivers/net/wireless/libertas/hostcmd.h b/drivers/net/wireless/libertas/hostcmd.h
index 3acf93988125..09b898f6719c 100644
--- a/drivers/net/wireless/libertas/hostcmd.h
+++ b/drivers/net/wireless/libertas/hostcmd.h
@@ -503,7 +503,7 @@ struct cmd_ds_802_11_ad_hoc_join {
503struct cmd_ds_802_11_enable_rsn { 503struct cmd_ds_802_11_enable_rsn {
504 __le16 action; 504 __le16 action;
505 __le16 enable; 505 __le16 enable;
506}; 506} __attribute__ ((packed));
507 507
508struct MrvlIEtype_keyParamSet { 508struct MrvlIEtype_keyParamSet {
509 /* type ID */ 509 /* type ID */
diff --git a/drivers/net/wireless/libertas/ioctl.c b/drivers/net/wireless/libertas/ioctl.c
deleted file mode 100644
index f41081585564..000000000000
--- a/drivers/net/wireless/libertas/ioctl.c
+++ /dev/null
@@ -1,1081 +0,0 @@
1/**
2 * This file contains ioctl functions
3 */
4
5#include <linux/ctype.h>
6#include <linux/delay.h>
7#include <linux/if.h>
8#include <linux/if_arp.h>
9#include <linux/wireless.h>
10
11#include <net/iw_handler.h>
12#include <net/ieee80211.h>
13
14#include "host.h"
15#include "radiotap.h"
16#include "decl.h"
17#include "defs.h"
18#include "dev.h"
19#include "join.h"
20#include "wext.h"
21
22#define MAX_SCAN_CELL_SIZE (IW_EV_ADDR_LEN + \
23 IW_ESSID_MAX_SIZE + \
24 IW_EV_UINT_LEN + IW_EV_FREQ_LEN + \
25 IW_EV_QUAL_LEN + IW_ESSID_MAX_SIZE + \
26 IW_EV_PARAM_LEN + 40) /* 40 for WPAIE */
27
28#define WAIT_FOR_SCAN_RRESULT_MAX_TIME (10 * HZ)
29
30static int wlan_set_region(wlan_private * priv, u16 region_code)
31{
32 int i;
33 int ret = 0;
34
35 for (i = 0; i < MRVDRV_MAX_REGION_CODE; i++) {
36 // use the region code to search for the index
37 if (region_code == libertas_region_code_to_index[i]) {
38 priv->adapter->regiontableindex = (u16) i;
39 priv->adapter->regioncode = region_code;
40 break;
41 }
42 }
43
44 // if it's unidentified region code
45 if (i >= MRVDRV_MAX_REGION_CODE) {
46 lbs_deb_ioctl("region Code not identified\n");
47 ret = -1;
48 goto done;
49 }
50
51 if (libertas_set_regiontable(priv, priv->adapter->regioncode, 0)) {
52 ret = -EINVAL;
53 }
54
55done:
56 lbs_deb_leave_args(LBS_DEB_IOCTL, "ret %d", ret);
57 return ret;
58}
59
60static inline int hex2int(char c)
61{
62 if (c >= '0' && c <= '9')
63 return (c - '0');
64 if (c >= 'a' && c <= 'f')
65 return (c - 'a' + 10);
66 if (c >= 'A' && c <= 'F')
67 return (c - 'A' + 10);
68 return -1;
69}
70
71/* Convert a string representation of a MAC address ("xx:xx:xx:xx:xx:xx")
72 into binary format (6 bytes).
73
74 This function expects that each byte is represented with 2 characters
75 (e.g., 11:2:11:11:11:11 is invalid)
76
77 */
78static char *eth_str2addr(char *ethstr, u8 * addr)
79{
80 int i, val, val2;
81 char *pos = ethstr;
82
83 /* get rid of initial blanks */
84 while (*pos == ' ' || *pos == '\t')
85 ++pos;
86
87 for (i = 0; i < 6; i++) {
88 val = hex2int(*pos++);
89 if (val < 0)
90 return NULL;
91 val2 = hex2int(*pos++);
92 if (val2 < 0)
93 return NULL;
94 addr[i] = (val * 16 + val2) & 0xff;
95
96 if (i < 5 && *pos++ != ':')
97 return NULL;
98 }
99 return pos;
100}
101
102/* this writes xx:xx:xx:xx:xx:xx into ethstr
103 (ethstr must have space for 18 chars) */
104static int eth_addr2str(u8 * addr, char *ethstr)
105{
106 int i;
107 char *pos = ethstr;
108
109 for (i = 0; i < 6; i++) {
110 sprintf(pos, "%02x", addr[i] & 0xff);
111 pos += 2;
112 if (i < 5)
113 *pos++ = ':';
114 }
115 return 17;
116}
117
118/**
119 * @brief Add an entry to the BT table
120 * @param priv A pointer to wlan_private structure
121 * @param req A pointer to ifreq structure
122 * @return 0 --success, otherwise fail
123 */
124static int wlan_bt_add_ioctl(wlan_private * priv, struct ifreq *req)
125{
126 struct iwreq *wrq = (struct iwreq *)req;
127 char ethaddrs_str[18];
128 char *pos;
129 u8 ethaddr[ETH_ALEN];
130 int ret;
131
132 lbs_deb_enter(LBS_DEB_IOCTL);
133
134 if (copy_from_user(ethaddrs_str, wrq->u.data.pointer,
135 sizeof(ethaddrs_str)))
136 return -EFAULT;
137
138 if ((pos = eth_str2addr(ethaddrs_str, ethaddr)) == NULL) {
139 lbs_pr_info("BT_ADD: Invalid MAC address\n");
140 return -EINVAL;
141 }
142
143 lbs_deb_ioctl("BT: adding %s\n", ethaddrs_str);
144 ret = libertas_prepare_and_send_command(priv, cmd_bt_access,
145 cmd_act_bt_access_add,
146 cmd_option_waitforrsp, 0, ethaddr);
147 lbs_deb_leave_args(LBS_DEB_IOCTL, "ret %d", ret);
148 return ret;
149}
150
151/**
152 * @brief Delete an entry from the BT table
153 * @param priv A pointer to wlan_private structure
154 * @param req A pointer to ifreq structure
155 * @return 0 --success, otherwise fail
156 */
157static int wlan_bt_del_ioctl(wlan_private * priv, struct ifreq *req)
158{
159 struct iwreq *wrq = (struct iwreq *)req;
160 char ethaddrs_str[18];
161 u8 ethaddr[ETH_ALEN];
162 char *pos;
163
164 lbs_deb_enter(LBS_DEB_IOCTL);
165
166 if (copy_from_user(ethaddrs_str, wrq->u.data.pointer,
167 sizeof(ethaddrs_str)))
168 return -EFAULT;
169
170 if ((pos = eth_str2addr(ethaddrs_str, ethaddr)) == NULL) {
171 lbs_pr_info("Invalid MAC address\n");
172 return -EINVAL;
173 }
174
175 lbs_deb_ioctl("BT: deleting %s\n", ethaddrs_str);
176
177 return (libertas_prepare_and_send_command(priv,
178 cmd_bt_access,
179 cmd_act_bt_access_del,
180 cmd_option_waitforrsp, 0, ethaddr));
181
182 lbs_deb_leave(LBS_DEB_IOCTL);
183 return 0;
184}
185
186/**
187 * @brief Reset all entries from the BT table
188 * @param priv A pointer to wlan_private structure
189 * @return 0 --success, otherwise fail
190 */
191static int wlan_bt_reset_ioctl(wlan_private * priv)
192{
193 lbs_deb_enter(LBS_DEB_IOCTL);
194
195 lbs_pr_alert( "BT: resetting\n");
196
197 return (libertas_prepare_and_send_command(priv,
198 cmd_bt_access,
199 cmd_act_bt_access_reset,
200 cmd_option_waitforrsp, 0, NULL));
201
202 lbs_deb_leave(LBS_DEB_IOCTL);
203 return 0;
204}
205
206/**
207 * @brief List an entry from the BT table
208 * @param priv A pointer to wlan_private structure
209 * @param req A pointer to ifreq structure
210 * @return 0 --success, otherwise fail
211 */
212static int wlan_bt_list_ioctl(wlan_private * priv, struct ifreq *req)
213{
214 int pos;
215 char *addr1;
216 struct iwreq *wrq = (struct iwreq *)req;
217 /* used to pass id and store the bt entry returned by the FW */
218 union {
219 u32 id;
220 char addr1addr2[2 * ETH_ALEN];
221 } param;
222 static char outstr[64];
223 char *pbuf = outstr;
224 int ret;
225
226 lbs_deb_enter(LBS_DEB_IOCTL);
227
228 if (copy_from_user(outstr, wrq->u.data.pointer, sizeof(outstr))) {
229 lbs_deb_ioctl("Copy from user failed\n");
230 return -1;
231 }
232 param.id = simple_strtoul(outstr, NULL, 10);
233 pos = sprintf(pbuf, "%d: ", param.id);
234 pbuf += pos;
235
236 ret = libertas_prepare_and_send_command(priv, cmd_bt_access,
237 cmd_act_bt_access_list,
238 cmd_option_waitforrsp, 0,
239 (char *)&param);
240
241 if (ret == 0) {
242 addr1 = param.addr1addr2;
243
244 pos = sprintf(pbuf, "BT includes node ");
245 pbuf += pos;
246 pos = eth_addr2str(addr1, pbuf);
247 pbuf += pos;
248 } else {
249 sprintf(pbuf, "(null)");
250 pbuf += pos;
251 }
252
253 wrq->u.data.length = strlen(outstr);
254 if (copy_to_user(wrq->u.data.pointer, (char *)outstr,
255 wrq->u.data.length)) {
256 lbs_deb_ioctl("BT_LIST: Copy to user failed!\n");
257 return -EFAULT;
258 }
259
260 lbs_deb_leave(LBS_DEB_IOCTL);
261 return 0 ;
262}
263
264/**
265 * @brief Sets inverted state of blacklist (non-zero if inverted)
266 * @param priv A pointer to wlan_private structure
267 * @param req A pointer to ifreq structure
268 * @return 0 --success, otherwise fail
269 */
270static int wlan_bt_set_invert_ioctl(wlan_private * priv, struct ifreq *req)
271{
272 int ret;
273 struct iwreq *wrq = (struct iwreq *)req;
274 union {
275 u32 id;
276 char addr1addr2[2 * ETH_ALEN];
277 } param;
278
279 lbs_deb_enter(LBS_DEB_IOCTL);
280
281 param.id = SUBCMD_DATA(wrq) ;
282 ret = libertas_prepare_and_send_command(priv, cmd_bt_access,
283 cmd_act_bt_access_set_invert,
284 cmd_option_waitforrsp, 0,
285 (char *)&param);
286 if (ret != 0)
287 return -EFAULT;
288 lbs_deb_leave(LBS_DEB_IOCTL);
289 return 0;
290}
291
292/**
293 * @brief Gets inverted state of blacklist (non-zero if inverted)
294 * @param priv A pointer to wlan_private structure
295 * @param req A pointer to ifreq structure
296 * @return 0 --success, otherwise fail
297 */
298static int wlan_bt_get_invert_ioctl(wlan_private * priv, struct ifreq *req)
299{
300 struct iwreq *wrq = (struct iwreq *)req;
301 int ret;
302 union {
303 u32 id;
304 char addr1addr2[2 * ETH_ALEN];
305 } param;
306
307 lbs_deb_enter(LBS_DEB_IOCTL);
308
309 ret = libertas_prepare_and_send_command(priv, cmd_bt_access,
310 cmd_act_bt_access_get_invert,
311 cmd_option_waitforrsp, 0,
312 (char *)&param);
313
314 if (ret == 0)
315 wrq->u.param.value = le32_to_cpu(param.id);
316 else
317 return -EFAULT;
318
319 lbs_deb_leave(LBS_DEB_IOCTL);
320 return 0;
321}
322
323/**
324 * @brief Find the next parameter in an input string
325 * @param ptr A pointer to the input parameter string
326 * @return A pointer to the next parameter, or 0 if no parameters left.
327 */
328static char * next_param(char * ptr)
329{
330 if (!ptr) return NULL;
331 while (*ptr == ' ' || *ptr == '\t') ++ptr;
332 return (*ptr == '\0') ? NULL : ptr;
333}
334
335/**
336 * @brief Add an entry to the FWT table
337 * @param priv A pointer to wlan_private structure
338 * @param req A pointer to ifreq structure
339 * @return 0 --success, otherwise fail
340 */
341static int wlan_fwt_add_ioctl(wlan_private * priv, struct ifreq *req)
342{
343 struct iwreq *wrq = (struct iwreq *)req;
344 char in_str[128];
345 static struct cmd_ds_fwt_access fwt_access;
346 char *ptr;
347 int ret;
348
349 lbs_deb_enter(LBS_DEB_IOCTL);
350
351 if (copy_from_user(in_str, wrq->u.data.pointer, sizeof(in_str)))
352 return -EFAULT;
353
354 if ((ptr = eth_str2addr(in_str, fwt_access.da)) == NULL) {
355 lbs_pr_alert( "FWT_ADD: Invalid MAC address 1\n");
356 return -EINVAL;
357 }
358
359 if ((ptr = eth_str2addr(ptr, fwt_access.ra)) == NULL) {
360 lbs_pr_alert( "FWT_ADD: Invalid MAC address 2\n");
361 return -EINVAL;
362 }
363
364 if ((ptr = next_param(ptr)))
365 fwt_access.metric =
366 cpu_to_le32(simple_strtoul(ptr, &ptr, 10));
367 else
368 fwt_access.metric = cpu_to_le32(FWT_DEFAULT_METRIC);
369
370 if ((ptr = next_param(ptr)))
371 fwt_access.dir = (u8)simple_strtoul(ptr, &ptr, 10);
372 else
373 fwt_access.dir = FWT_DEFAULT_DIR;
374
375 if ((ptr = next_param(ptr)))
376 fwt_access.rate = (u8) simple_strtoul(ptr, &ptr, 10);
377 else
378 fwt_access.rate = FWT_DEFAULT_RATE;
379
380 if ((ptr = next_param(ptr)))
381 fwt_access.ssn =
382 cpu_to_le32(simple_strtoul(ptr, &ptr, 10));
383 else
384 fwt_access.ssn = cpu_to_le32(FWT_DEFAULT_SSN);
385
386 if ((ptr = next_param(ptr)))
387 fwt_access.dsn =
388 cpu_to_le32(simple_strtoul(ptr, &ptr, 10));
389 else
390 fwt_access.dsn = cpu_to_le32(FWT_DEFAULT_DSN);
391
392 if ((ptr = next_param(ptr)))
393 fwt_access.hopcount = simple_strtoul(ptr, &ptr, 10);
394 else
395 fwt_access.hopcount = FWT_DEFAULT_HOPCOUNT;
396
397 if ((ptr = next_param(ptr)))
398 fwt_access.ttl = simple_strtoul(ptr, &ptr, 10);
399 else
400 fwt_access.ttl = FWT_DEFAULT_TTL;
401
402 if ((ptr = next_param(ptr)))
403 fwt_access.expiration =
404 cpu_to_le32(simple_strtoul(ptr, &ptr, 10));
405 else
406 fwt_access.expiration = cpu_to_le32(FWT_DEFAULT_EXPIRATION);
407
408 if ((ptr = next_param(ptr)))
409 fwt_access.sleepmode = (u8)simple_strtoul(ptr, &ptr, 10);
410 else
411 fwt_access.sleepmode = FWT_DEFAULT_SLEEPMODE;
412
413 if ((ptr = next_param(ptr)))
414 fwt_access.snr =
415 cpu_to_le32(simple_strtoul(ptr, &ptr, 10));
416 else
417 fwt_access.snr = cpu_to_le32(FWT_DEFAULT_SNR);
418
419#ifdef DEBUG
420 {
421 char ethaddr1_str[18], ethaddr2_str[18];
422 eth_addr2str(fwt_access.da, ethaddr1_str);
423 eth_addr2str(fwt_access.ra, ethaddr2_str);
424 lbs_deb_ioctl("FWT_ADD: adding (da:%s,%i,ra:%s)\n", ethaddr1_str,
425 fwt_access.dir, ethaddr2_str);
426 lbs_deb_ioctl("FWT_ADD: ssn:%u dsn:%u met:%u hop:%u ttl:%u exp:%u slp:%u snr:%u\n",
427 fwt_access.ssn, fwt_access.dsn, fwt_access.metric,
428 fwt_access.hopcount, fwt_access.ttl, fwt_access.expiration,
429 fwt_access.sleepmode, fwt_access.snr);
430 }
431#endif
432
433 ret = libertas_prepare_and_send_command(priv, cmd_fwt_access,
434 cmd_act_fwt_access_add,
435 cmd_option_waitforrsp, 0,
436 (void *)&fwt_access);
437
438 lbs_deb_leave_args(LBS_DEB_IOCTL, "ret %d", ret);
439 return ret;
440}
441
442/**
443 * @brief Delete an entry from the FWT table
444 * @param priv A pointer to wlan_private structure
445 * @param req A pointer to ifreq structure
446 * @return 0 --success, otherwise fail
447 */
448static int wlan_fwt_del_ioctl(wlan_private * priv, struct ifreq *req)
449{
450 struct iwreq *wrq = (struct iwreq *)req;
451 char in_str[64];
452 static struct cmd_ds_fwt_access fwt_access;
453 char *ptr;
454 int ret;
455
456 lbs_deb_enter(LBS_DEB_IOCTL);
457
458 if (copy_from_user(in_str, wrq->u.data.pointer, sizeof(in_str)))
459 return -EFAULT;
460
461 if ((ptr = eth_str2addr(in_str, fwt_access.da)) == NULL) {
462 lbs_pr_alert( "FWT_DEL: Invalid MAC address 1\n");
463 return -EINVAL;
464 }
465
466 if ((ptr = eth_str2addr(ptr, fwt_access.ra)) == NULL) {
467 lbs_pr_alert( "FWT_DEL: Invalid MAC address 2\n");
468 return -EINVAL;
469 }
470
471 if ((ptr = next_param(ptr)))
472 fwt_access.dir = (u8)simple_strtoul(ptr, &ptr, 10);
473 else
474 fwt_access.dir = FWT_DEFAULT_DIR;
475
476#ifdef DEBUG
477 {
478 char ethaddr1_str[18], ethaddr2_str[18];
479 lbs_deb_ioctl("FWT_DEL: line is %s\n", in_str);
480 eth_addr2str(fwt_access.da, ethaddr1_str);
481 eth_addr2str(fwt_access.ra, ethaddr2_str);
482 lbs_deb_ioctl("FWT_DEL: removing (da:%s,ra:%s,dir:%d)\n", ethaddr1_str,
483 ethaddr2_str, fwt_access.dir);
484 }
485#endif
486
487 ret = libertas_prepare_and_send_command(priv,
488 cmd_fwt_access,
489 cmd_act_fwt_access_del,
490 cmd_option_waitforrsp, 0,
491 (void *)&fwt_access);
492 lbs_deb_leave_args(LBS_DEB_IOCTL, "ret %d", ret);
493 return ret;
494}
495
496
497/**
498 * @brief Print route parameters
499 * @param fwt_access struct cmd_ds_fwt_access with route info
500 * @param buf destination buffer for route info
501 */
502static void print_route(struct cmd_ds_fwt_access fwt_access, char *buf)
503{
504 buf += sprintf(buf, " ");
505 buf += eth_addr2str(fwt_access.da, buf);
506 buf += sprintf(buf, " ");
507 buf += eth_addr2str(fwt_access.ra, buf);
508 buf += sprintf(buf, " %u", fwt_access.valid);
509 buf += sprintf(buf, " %u", le32_to_cpu(fwt_access.metric));
510 buf += sprintf(buf, " %u", fwt_access.dir);
511 buf += sprintf(buf, " %u", fwt_access.rate);
512 buf += sprintf(buf, " %u", le32_to_cpu(fwt_access.ssn));
513 buf += sprintf(buf, " %u", le32_to_cpu(fwt_access.dsn));
514 buf += sprintf(buf, " %u", fwt_access.hopcount);
515 buf += sprintf(buf, " %u", fwt_access.ttl);
516 buf += sprintf(buf, " %u", le32_to_cpu(fwt_access.expiration));
517 buf += sprintf(buf, " %u", fwt_access.sleepmode);
518 buf += sprintf(buf, " %u ", le32_to_cpu(fwt_access.snr));
519 buf += eth_addr2str(fwt_access.prec, buf);
520}
521
522/**
523 * @brief Lookup an entry in the FWT table
524 * @param priv A pointer to wlan_private structure
525 * @param req A pointer to ifreq structure
526 * @return 0 --success, otherwise fail
527 */
528static int wlan_fwt_lookup_ioctl(wlan_private * priv, struct ifreq *req)
529{
530 struct iwreq *wrq = (struct iwreq *)req;
531 char in_str[64];
532 char *ptr;
533 static struct cmd_ds_fwt_access fwt_access;
534 static char out_str[128];
535 int ret;
536
537 lbs_deb_enter(LBS_DEB_IOCTL);
538
539 if (copy_from_user(in_str, wrq->u.data.pointer, sizeof(in_str)))
540 return -EFAULT;
541
542 if ((ptr = eth_str2addr(in_str, fwt_access.da)) == NULL) {
543 lbs_pr_alert( "FWT_LOOKUP: Invalid MAC address\n");
544 return -EINVAL;
545 }
546
547#ifdef DEBUG
548 {
549 char ethaddr1_str[18];
550 lbs_deb_ioctl("FWT_LOOKUP: line is %s\n", in_str);
551 eth_addr2str(fwt_access.da, ethaddr1_str);
552 lbs_deb_ioctl("FWT_LOOKUP: looking for (da:%s)\n", ethaddr1_str);
553 }
554#endif
555
556 ret = libertas_prepare_and_send_command(priv,
557 cmd_fwt_access,
558 cmd_act_fwt_access_lookup,
559 cmd_option_waitforrsp, 0,
560 (void *)&fwt_access);
561
562 if (ret == 0)
563 print_route(fwt_access, out_str);
564 else
565 sprintf(out_str, "(null)");
566
567 wrq->u.data.length = strlen(out_str);
568 if (copy_to_user(wrq->u.data.pointer, (char *)out_str,
569 wrq->u.data.length)) {
570 lbs_deb_ioctl("FWT_LOOKUP: Copy to user failed!\n");
571 return -EFAULT;
572 }
573
574 lbs_deb_leave(LBS_DEB_IOCTL);
575 return 0;
576}
577
578/**
579 * @brief Reset all entries from the FWT table
580 * @param priv A pointer to wlan_private structure
581 * @return 0 --success, otherwise fail
582 */
583static int wlan_fwt_reset_ioctl(wlan_private * priv)
584{
585 lbs_deb_ioctl("FWT: resetting\n");
586
587 return (libertas_prepare_and_send_command(priv,
588 cmd_fwt_access,
589 cmd_act_fwt_access_reset,
590 cmd_option_waitforrsp, 0, NULL));
591}
592
593/**
594 * @brief List an entry from the FWT table
595 * @param priv A pointer to wlan_private structure
596 * @param req A pointer to ifreq structure
597 * @return 0 --success, otherwise fail
598 */
599static int wlan_fwt_list_ioctl(wlan_private * priv, struct ifreq *req)
600{
601 struct iwreq *wrq = (struct iwreq *)req;
602 char in_str[8];
603 static struct cmd_ds_fwt_access fwt_access;
604 char *ptr = in_str;
605 static char out_str[128];
606 char *pbuf = out_str;
607 int ret = 0;
608
609 lbs_deb_enter(LBS_DEB_IOCTL);
610
611 if (copy_from_user(in_str, wrq->u.data.pointer, sizeof(in_str))) {
612 ret = -EFAULT;
613 goto out;
614 }
615
616 fwt_access.id = cpu_to_le32(simple_strtoul(ptr, &ptr, 10));
617
618#ifdef DEBUG
619 {
620 lbs_deb_ioctl("FWT_LIST: line is %s\n", in_str);
621 lbs_deb_ioctl("FWT_LIST: listing id:%i\n", le32_to_cpu(fwt_access.id));
622 }
623#endif
624
625 ret = libertas_prepare_and_send_command(priv, cmd_fwt_access,
626 cmd_act_fwt_access_list,
627 cmd_option_waitforrsp, 0, (void *)&fwt_access);
628
629 if (ret == 0)
630 print_route(fwt_access, pbuf);
631 else
632 pbuf += sprintf(pbuf, " (null)");
633
634 wrq->u.data.length = strlen(out_str);
635 if (copy_to_user(wrq->u.data.pointer, (char *)out_str,
636 wrq->u.data.length)) {
637 lbs_deb_ioctl("FWT_LIST: Copy to user failed!\n");
638 ret = -EFAULT;
639 goto out;
640 }
641
642 ret = 0;
643
644out:
645 lbs_deb_leave(LBS_DEB_IOCTL);
646 return ret;
647}
648
649/**
650 * @brief List an entry from the FRT table
651 * @param priv A pointer to wlan_private structure
652 * @param req A pointer to ifreq structure
653 * @return 0 --success, otherwise fail
654 */
655static int wlan_fwt_list_route_ioctl(wlan_private * priv, struct ifreq *req)
656{
657 struct iwreq *wrq = (struct iwreq *)req;
658 char in_str[64];
659 static struct cmd_ds_fwt_access fwt_access;
660 char *ptr = in_str;
661 static char out_str[128];
662 char *pbuf = out_str;
663 int ret;
664
665 lbs_deb_enter(LBS_DEB_IOCTL);
666
667 if (copy_from_user(in_str, wrq->u.data.pointer, sizeof(in_str)))
668 return -EFAULT;
669
670 fwt_access.id = cpu_to_le32(simple_strtoul(ptr, &ptr, 10));
671
672#ifdef DEBUG
673 {
674 lbs_deb_ioctl("FWT_LIST_ROUTE: line is %s\n", in_str);
675 lbs_deb_ioctl("FWT_LIST_ROUTE: listing id:%i\n", le32_to_cpu(fwt_access.id));
676 }
677#endif
678
679 ret = libertas_prepare_and_send_command(priv, cmd_fwt_access,
680 cmd_act_fwt_access_list_route,
681 cmd_option_waitforrsp, 0, (void *)&fwt_access);
682
683 if (ret == 0) {
684 print_route(fwt_access, pbuf);
685 } else
686 pbuf += sprintf(pbuf, " (null)");
687
688 wrq->u.data.length = strlen(out_str);
689 if (copy_to_user(wrq->u.data.pointer, (char *)out_str,
690 wrq->u.data.length)) {
691 lbs_deb_ioctl("FWT_LIST_ROUTE: Copy to user failed!\n");
692 return -EFAULT;
693 }
694
695 lbs_deb_leave(LBS_DEB_IOCTL);
696 return 0;
697}
698
699/**
700 * @brief List an entry from the FNT table
701 * @param priv A pointer to wlan_private structure
702 * @param req A pointer to ifreq structure
703 * @return 0 --success, otherwise fail
704 */
705static int wlan_fwt_list_neighbor_ioctl(wlan_private * priv, struct ifreq *req)
706{
707 struct iwreq *wrq = (struct iwreq *)req;
708 char in_str[8];
709 static struct cmd_ds_fwt_access fwt_access;
710 char *ptr = in_str;
711 static char out_str[128];
712 char *pbuf = out_str;
713 int ret;
714
715 lbs_deb_enter(LBS_DEB_IOCTL);
716
717 if (copy_from_user(in_str, wrq->u.data.pointer, sizeof(in_str)))
718 return -EFAULT;
719
720 memset(&fwt_access, 0, sizeof(fwt_access));
721 fwt_access.id = cpu_to_le32(simple_strtoul(ptr, &ptr, 10));
722
723#ifdef DEBUG
724 {
725 lbs_deb_ioctl("FWT_LIST_NEIGHBOR: line is %s\n", in_str);
726 lbs_deb_ioctl("FWT_LIST_NEIGHBOR: listing id:%i\n", le32_to_cpu(fwt_access.id));
727 }
728#endif
729
730 ret = libertas_prepare_and_send_command(priv, cmd_fwt_access,
731 cmd_act_fwt_access_list_neighbor,
732 cmd_option_waitforrsp, 0,
733 (void *)&fwt_access);
734
735 if (ret == 0) {
736 pbuf += sprintf(pbuf, " ra ");
737 pbuf += eth_addr2str(fwt_access.ra, pbuf);
738 pbuf += sprintf(pbuf, " slp %u", fwt_access.sleepmode);
739 pbuf += sprintf(pbuf, " snr %u", le32_to_cpu(fwt_access.snr));
740 pbuf += sprintf(pbuf, " ref %u", le32_to_cpu(fwt_access.references));
741 } else
742 pbuf += sprintf(pbuf, " (null)");
743
744 wrq->u.data.length = strlen(out_str);
745 if (copy_to_user(wrq->u.data.pointer, (char *)out_str,
746 wrq->u.data.length)) {
747 lbs_deb_ioctl("FWT_LIST_NEIGHBOR: Copy to user failed!\n");
748 return -EFAULT;
749 }
750
751 lbs_deb_leave(LBS_DEB_IOCTL);
752 return 0;
753}
754
755/**
756 * @brief Cleans up the route (FRT) and neighbor (FNT) tables
757 * (Garbage Collection)
758 * @param priv A pointer to wlan_private structure
759 * @param req A pointer to ifreq structure
760 * @return 0 --success, otherwise fail
761 */
762static int wlan_fwt_cleanup_ioctl(wlan_private * priv, struct ifreq *req)
763{
764 struct iwreq *wrq = (struct iwreq *)req;
765 static struct cmd_ds_fwt_access fwt_access;
766 int ret;
767
768 lbs_deb_enter(LBS_DEB_IOCTL);
769
770 lbs_deb_ioctl("FWT: cleaning up\n");
771
772 memset(&fwt_access, 0, sizeof(fwt_access));
773
774 ret = libertas_prepare_and_send_command(priv, cmd_fwt_access,
775 cmd_act_fwt_access_cleanup,
776 cmd_option_waitforrsp, 0,
777 (void *)&fwt_access);
778
779 if (ret == 0)
780 wrq->u.param.value = le32_to_cpu(fwt_access.references);
781 else
782 return -EFAULT;
783
784 lbs_deb_leave(LBS_DEB_IOCTL);
785 return 0;
786}
787
788/**
789 * @brief Gets firmware internal time (debug purposes)
790 * @param priv A pointer to wlan_private structure
791 * @param req A pointer to ifreq structure
792 * @return 0 --success, otherwise fail
793 */
794static int wlan_fwt_time_ioctl(wlan_private * priv, struct ifreq *req)
795{
796 struct iwreq *wrq = (struct iwreq *)req;
797 static struct cmd_ds_fwt_access fwt_access;
798 int ret;
799
800 lbs_deb_enter(LBS_DEB_IOCTL);
801
802 lbs_deb_ioctl("FWT: getting time\n");
803
804 memset(&fwt_access, 0, sizeof(fwt_access));
805
806 ret = libertas_prepare_and_send_command(priv, cmd_fwt_access,
807 cmd_act_fwt_access_time,
808 cmd_option_waitforrsp, 0,
809 (void *)&fwt_access);
810
811 if (ret == 0)
812 wrq->u.param.value = le32_to_cpu(fwt_access.references);
813 else
814 return -EFAULT;
815
816 lbs_deb_leave(LBS_DEB_IOCTL);
817 return 0;
818}
819
820/**
821 * @brief Gets mesh ttl from firmware
822 * @param priv A pointer to wlan_private structure
823 * @param req A pointer to ifreq structure
824 * @return 0 --success, otherwise fail
825 */
826static int wlan_mesh_get_ttl_ioctl(wlan_private * priv, struct ifreq *req)
827{
828 struct iwreq *wrq = (struct iwreq *)req;
829 struct cmd_ds_mesh_access mesh_access;
830 int ret;
831
832 lbs_deb_enter(LBS_DEB_IOCTL);
833
834 memset(&mesh_access, 0, sizeof(mesh_access));
835
836 ret = libertas_prepare_and_send_command(priv, cmd_mesh_access,
837 cmd_act_mesh_get_ttl,
838 cmd_option_waitforrsp, 0,
839 (void *)&mesh_access);
840
841 if (ret == 0)
842 wrq->u.param.value = le32_to_cpu(mesh_access.data[0]);
843 else
844 return -EFAULT;
845
846 lbs_deb_leave(LBS_DEB_IOCTL);
847 return 0;
848}
849
850/**
851 * @brief Gets mesh ttl from firmware
852 * @param priv A pointer to wlan_private structure
853 * @param ttl New ttl value
854 * @return 0 --success, otherwise fail
855 */
856static int wlan_mesh_set_ttl_ioctl(wlan_private * priv, int ttl)
857{
858 struct cmd_ds_mesh_access mesh_access;
859 int ret;
860
861 lbs_deb_enter(LBS_DEB_IOCTL);
862
863 if( (ttl > 0xff) || (ttl < 0) )
864 return -EINVAL;
865
866 memset(&mesh_access, 0, sizeof(mesh_access));
867 mesh_access.data[0] = cpu_to_le32(ttl);
868
869 ret = libertas_prepare_and_send_command(priv, cmd_mesh_access,
870 cmd_act_mesh_set_ttl,
871 cmd_option_waitforrsp, 0,
872 (void *)&mesh_access);
873
874 if (ret != 0)
875 ret = -EFAULT;
876
877 lbs_deb_leave(LBS_DEB_IOCTL);
878 return ret;
879}
880
881/**
882 * @brief ioctl function - entry point
883 *
884 * @param dev A pointer to net_device structure
885 * @param req A pointer to ifreq structure
886 * @param cmd command
887 * @return 0--success, otherwise fail
888 */
889int libertas_do_ioctl(struct net_device *dev, struct ifreq *req, int cmd)
890{
891 int subcmd = 0;
892 int idata = 0;
893 int *pdata;
894 int ret = 0;
895 wlan_private *priv = dev->priv;
896 wlan_adapter *adapter = priv->adapter;
897 struct iwreq *wrq = (struct iwreq *)req;
898
899 lbs_deb_enter(LBS_DEB_IOCTL);
900
901 lbs_deb_ioctl("libertas_do_ioctl: ioctl cmd = 0x%x\n", cmd);
902 switch (cmd) {
903 case WLAN_SETNONE_GETNONE: /* set WPA mode on/off ioctl #20 */
904 switch (wrq->u.data.flags) {
905 case WLAN_SUBCMD_BT_RESET: /* bt_reset */
906 wlan_bt_reset_ioctl(priv);
907 break;
908 case WLAN_SUBCMD_FWT_RESET: /* fwt_reset */
909 wlan_fwt_reset_ioctl(priv);
910 break;
911 } /* End of switch */
912 break;
913
914 case WLAN_SETONEINT_GETNONE:
915 /* The first 4 bytes of req->ifr_data is sub-ioctl number
916 * after 4 bytes sits the payload.
917 */
918 subcmd = wrq->u.data.flags;
919 if (!subcmd)
920 subcmd = (int)wrq->u.param.value;
921
922 switch (subcmd) {
923 case WLANSETREGION:
924 idata = SUBCMD_DATA(wrq);
925 ret = wlan_set_region(priv, (u16) idata);
926 break;
927 case WLAN_SUBCMD_MESH_SET_TTL:
928 idata = SUBCMD_DATA(wrq);
929 ret = wlan_mesh_set_ttl_ioctl(priv, idata);
930 break;
931
932 case WLAN_SUBCMD_BT_SET_INVERT:
933 ret = wlan_bt_set_invert_ioctl(priv, req);
934 break ;
935
936 default:
937 ret = -EOPNOTSUPP;
938 break;
939 }
940
941 break;
942
943 case WLAN_SET128CHAR_GET128CHAR:
944 switch ((int)wrq->u.data.flags) {
945 case WLAN_SUBCMD_BT_ADD:
946 ret = wlan_bt_add_ioctl(priv, req);
947 break;
948 case WLAN_SUBCMD_BT_DEL:
949 ret = wlan_bt_del_ioctl(priv, req);
950 break;
951 case WLAN_SUBCMD_BT_LIST:
952 ret = wlan_bt_list_ioctl(priv, req);
953 break;
954 case WLAN_SUBCMD_FWT_ADD:
955 ret = wlan_fwt_add_ioctl(priv, req);
956 break;
957 case WLAN_SUBCMD_FWT_DEL:
958 ret = wlan_fwt_del_ioctl(priv, req);
959 break;
960 case WLAN_SUBCMD_FWT_LOOKUP:
961 ret = wlan_fwt_lookup_ioctl(priv, req);
962 break;
963 case WLAN_SUBCMD_FWT_LIST_NEIGHBOR:
964 ret = wlan_fwt_list_neighbor_ioctl(priv, req);
965 break;
966 case WLAN_SUBCMD_FWT_LIST:
967 ret = wlan_fwt_list_ioctl(priv, req);
968 break;
969 case WLAN_SUBCMD_FWT_LIST_ROUTE:
970 ret = wlan_fwt_list_route_ioctl(priv, req);
971 break;
972 }
973 break;
974
975 case WLAN_SETNONE_GETONEINT:
976 switch (wrq->u.param.value) {
977 case WLANGETREGION:
978 pdata = (int *)wrq->u.name;
979 *pdata = (int)adapter->regioncode;
980 break;
981 case WLAN_SUBCMD_FWT_CLEANUP: /* fwt_cleanup */
982 ret = wlan_fwt_cleanup_ioctl(priv, req);
983 break;
984
985 case WLAN_SUBCMD_FWT_TIME: /* fwt_time */
986 ret = wlan_fwt_time_ioctl(priv, req);
987 break;
988
989 case WLAN_SUBCMD_MESH_GET_TTL:
990 ret = wlan_mesh_get_ttl_ioctl(priv, req);
991 break;
992
993 case WLAN_SUBCMD_BT_GET_INVERT:
994 ret = wlan_bt_get_invert_ioctl(priv, req);
995 break ;
996
997 default:
998 ret = -EOPNOTSUPP;
999
1000 }
1001
1002 break;
1003
1004 case WLAN_SET_GET_SIXTEEN_INT:
1005 switch ((int)wrq->u.data.flags) {
1006 case WLAN_LED_GPIO_CTRL:
1007 {
1008 int i;
1009 int data[16];
1010
1011 struct cmd_ds_802_11_led_ctrl ctrl;
1012 struct mrvlietypes_ledgpio *gpio =
1013 (struct mrvlietypes_ledgpio *) ctrl.data;
1014
1015 memset(&ctrl, 0, sizeof(ctrl));
1016 if (wrq->u.data.length > MAX_LEDS * 2)
1017 return -ENOTSUPP;
1018 if ((wrq->u.data.length % 2) != 0)
1019 return -ENOTSUPP;
1020 if (wrq->u.data.length == 0) {
1021 ctrl.action =
1022 cpu_to_le16
1023 (cmd_act_get);
1024 } else {
1025 if (copy_from_user
1026 (data, wrq->u.data.pointer,
1027 sizeof(int) *
1028 wrq->u.data.length)) {
1029 lbs_deb_ioctl(
1030 "Copy from user failed\n");
1031 return -EFAULT;
1032 }
1033
1034 ctrl.action =
1035 cpu_to_le16
1036 (cmd_act_set);
1037 ctrl.numled = cpu_to_le16(0);
1038 gpio->header.type =
1039 cpu_to_le16(TLV_TYPE_LED_GPIO);
1040 gpio->header.len = wrq->u.data.length;
1041 for (i = 0; i < wrq->u.data.length;
1042 i += 2) {
1043 gpio->ledpin[i / 2].led =
1044 data[i];
1045 gpio->ledpin[i / 2].pin =
1046 data[i + 1];
1047 }
1048 }
1049 ret =
1050 libertas_prepare_and_send_command(priv,
1051 cmd_802_11_led_gpio_ctrl,
1052 0,
1053 cmd_option_waitforrsp,
1054 0, (void *)&ctrl);
1055 for (i = 0; i < gpio->header.len; i += 2) {
1056 data[i] = gpio->ledpin[i / 2].led;
1057 data[i + 1] = gpio->ledpin[i / 2].pin;
1058 }
1059 if (copy_to_user(wrq->u.data.pointer, data,
1060 sizeof(int) *
1061 gpio->header.len)) {
1062 lbs_deb_ioctl("Copy to user failed\n");
1063 return -EFAULT;
1064 }
1065
1066 wrq->u.data.length = gpio->header.len;
1067 }
1068 break;
1069 }
1070 break;
1071
1072 default:
1073 ret = -EINVAL;
1074 break;
1075 }
1076
1077 lbs_deb_leave_args(LBS_DEB_IOCTL, "ret %d", ret);
1078 return ret;
1079}
1080
1081
diff --git a/drivers/net/wireless/libertas/main.c b/drivers/net/wireless/libertas/main.c
index 623ab4b16973..4a59306a3f05 100644
--- a/drivers/net/wireless/libertas/main.c
+++ b/drivers/net/wireless/libertas/main.c
@@ -181,7 +181,8 @@ u16 libertas_region_code_to_index[MRVDRV_MAX_REGION_CODE] =
181 * @brief Get function for sysfs attribute anycast_mask 181 * @brief Get function for sysfs attribute anycast_mask
182 */ 182 */
183static ssize_t libertas_anycast_get(struct device * dev, 183static ssize_t libertas_anycast_get(struct device * dev,
184 struct device_attribute *attr, char * buf) { 184 struct device_attribute *attr, char * buf)
185{
185 struct cmd_ds_mesh_access mesh_access; 186 struct cmd_ds_mesh_access mesh_access;
186 187
187 memset(&mesh_access, 0, sizeof(mesh_access)); 188 memset(&mesh_access, 0, sizeof(mesh_access));
@@ -197,7 +198,8 @@ static ssize_t libertas_anycast_get(struct device * dev,
197 * @brief Set function for sysfs attribute anycast_mask 198 * @brief Set function for sysfs attribute anycast_mask
198 */ 199 */
199static ssize_t libertas_anycast_set(struct device * dev, 200static ssize_t libertas_anycast_set(struct device * dev,
200 struct device_attribute *attr, const char * buf, size_t count) { 201 struct device_attribute *attr, const char * buf, size_t count)
202{
201 struct cmd_ds_mesh_access mesh_access; 203 struct cmd_ds_mesh_access mesh_access;
202 uint32_t datum; 204 uint32_t datum;
203 205
@@ -799,7 +801,6 @@ wlan_private *libertas_add_card(void *card, struct device *dmdev)
799 dev->open = wlan_open; 801 dev->open = wlan_open;
800 dev->hard_start_xmit = wlan_pre_start_xmit; 802 dev->hard_start_xmit = wlan_pre_start_xmit;
801 dev->stop = wlan_close; 803 dev->stop = wlan_close;
802 dev->do_ioctl = libertas_do_ioctl;
803 dev->set_mac_address = wlan_set_mac_address; 804 dev->set_mac_address = wlan_set_mac_address;
804 dev->tx_timeout = wlan_tx_timeout; 805 dev->tx_timeout = wlan_tx_timeout;
805 dev->get_stats = wlan_get_stats; 806 dev->get_stats = wlan_get_stats;
@@ -918,7 +919,6 @@ int libertas_add_mesh(wlan_private *priv, struct device *dev)
918 mesh_dev->open = mesh_open; 919 mesh_dev->open = mesh_open;
919 mesh_dev->hard_start_xmit = mesh_pre_start_xmit; 920 mesh_dev->hard_start_xmit = mesh_pre_start_xmit;
920 mesh_dev->stop = mesh_close; 921 mesh_dev->stop = mesh_close;
921 mesh_dev->do_ioctl = libertas_do_ioctl;
922 mesh_dev->get_stats = wlan_get_stats; 922 mesh_dev->get_stats = wlan_get_stats;
923 mesh_dev->set_mac_address = wlan_set_mac_address; 923 mesh_dev->set_mac_address = wlan_set_mac_address;
924 mesh_dev->ethtool_ops = &libertas_ethtool_ops; 924 mesh_dev->ethtool_ops = &libertas_ethtool_ops;
diff --git a/drivers/net/wireless/libertas/scan.c b/drivers/net/wireless/libertas/scan.c
index 606af50fa09b..c3043dcb541e 100644
--- a/drivers/net/wireless/libertas/scan.c
+++ b/drivers/net/wireless/libertas/scan.c
@@ -215,38 +215,6 @@ done:
215} 215}
216 216
217/** 217/**
218 * @brief Post process the scan table after a new scan command has completed
219 *
220 * Inspect each entry of the scan table and try to find an entry that
221 * matches our current associated/joined network from the scan. If
222 * one is found, update the stored copy of the bssdescriptor for our
223 * current network.
224 *
225 * Debug dump the current scan table contents if compiled accordingly.
226 *
227 * @param priv A pointer to wlan_private structure
228 *
229 * @return void
230 */
231static void wlan_scan_process_results(wlan_private * priv)
232{
233 wlan_adapter *adapter = priv->adapter;
234 struct bss_descriptor * iter_bss;
235 int i = 0;
236
237 if (adapter->connect_status == libertas_connected)
238 return;
239
240 mutex_lock(&adapter->lock);
241 list_for_each_entry (iter_bss, &adapter->network_list, list) {
242 lbs_deb_scan("Scan:(%02d) " MAC_FMT ", RSSI[%03d], SSID[%s]\n",
243 i++, MAC_ARG(iter_bss->bssid), (s32) iter_bss->rssi,
244 escape_essid(iter_bss->ssid, iter_bss->ssid_len));
245 }
246 mutex_unlock(&adapter->lock);
247}
248
249/**
250 * @brief Create a channel list for the driver to scan based on region info 218 * @brief Create a channel list for the driver to scan based on region info
251 * 219 *
252 * Use the driver region/band information to construct a comprehensive list 220 * Use the driver region/band information to construct a comprehensive list
@@ -791,6 +759,10 @@ int wlan_scan_networks(wlan_private * priv,
791 u8 scancurrentchanonly; 759 u8 scancurrentchanonly;
792 int maxchanperscan; 760 int maxchanperscan;
793 int ret; 761 int ret;
762#ifdef CONFIG_LIBERTAS_DEBUG
763 struct bss_descriptor * iter_bss;
764 int i = 0;
765#endif
794 766
795 lbs_deb_enter(LBS_DEB_ASSOC); 767 lbs_deb_enter(LBS_DEB_ASSOC);
796 768
@@ -832,11 +804,16 @@ int wlan_scan_networks(wlan_private * priv,
832 puserscanin, 804 puserscanin,
833 full_scan); 805 full_scan);
834 806
835 /* Process the resulting scan table: 807#ifdef CONFIG_LIBERTAS_DEBUG
836 * - Remove any bad ssids 808 /* Dump the scan table */
837 * - Update our current BSS information from scan data 809 mutex_lock(&adapter->lock);
838 */ 810 list_for_each_entry (iter_bss, &adapter->network_list, list) {
839 wlan_scan_process_results(priv); 811 lbs_deb_scan("Scan:(%02d) " MAC_FMT ", RSSI[%03d], SSID[%s]\n",
812 i++, MAC_ARG(iter_bss->bssid), (s32) iter_bss->rssi,
813 escape_essid(iter_bss->ssid, iter_bss->ssid_len));
814 }
815 mutex_unlock(&adapter->lock);
816#endif
840 817
841 if (priv->adapter->connect_status == libertas_connected) { 818 if (priv->adapter->connect_status == libertas_connected) {
842 netif_carrier_on(priv->dev); 819 netif_carrier_on(priv->dev);
diff --git a/drivers/net/wireless/libertas/wext.c b/drivers/net/wireless/libertas/wext.c
index 8939251a2f4c..f42b796b5e47 100644
--- a/drivers/net/wireless/libertas/wext.c
+++ b/drivers/net/wireless/libertas/wext.c
@@ -913,148 +913,6 @@ out:
913 return 0; 913 return 0;
914} 914}
915 915
916/*
917 * iwpriv settable callbacks
918 */
919
920static const iw_handler wlan_private_handler[] = {
921 NULL, /* SIOCIWFIRSTPRIV */
922};
923
924static const struct iw_priv_args wlan_private_args[] = {
925 /*
926 * { cmd, set_args, get_args, name }
927 */
928 /* Using iwpriv sub-command feature */
929 {
930 WLAN_SETONEINT_GETNONE, /* IOCTL: 24 */
931 IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1,
932 IW_PRIV_TYPE_NONE,
933 ""},
934 {
935 WLANSETREGION,
936 IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1,
937 IW_PRIV_TYPE_NONE,
938 "setregioncode"},
939 {
940 WLAN_SUBCMD_MESH_SET_TTL,
941 IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1,
942 IW_PRIV_TYPE_NONE,
943 "mesh_set_ttl"},
944 {
945 WLAN_SETNONE_GETONEINT,
946 IW_PRIV_TYPE_NONE,
947 IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1,
948 ""},
949 {
950 WLANGETREGION,
951 IW_PRIV_TYPE_NONE,
952 IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1,
953 "getregioncode"},
954 {
955 WLAN_SUBCMD_FWT_CLEANUP,
956 IW_PRIV_TYPE_NONE,
957 IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1,
958 "fwt_cleanup"},
959 {
960 WLAN_SUBCMD_FWT_TIME,
961 IW_PRIV_TYPE_NONE,
962 IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1,
963 "fwt_time"},
964 {
965 WLAN_SUBCMD_MESH_GET_TTL,
966 IW_PRIV_TYPE_NONE,
967 IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1,
968 "mesh_get_ttl"},
969 {
970 WLAN_SETNONE_GETNONE,
971 IW_PRIV_TYPE_NONE,
972 IW_PRIV_TYPE_NONE,
973 ""},
974 {
975 WLAN_SUBCMD_FWT_RESET,
976 IW_PRIV_TYPE_NONE,
977 IW_PRIV_TYPE_NONE,
978 "fwt_reset"},
979 {
980 WLAN_SUBCMD_BT_RESET,
981 IW_PRIV_TYPE_NONE,
982 IW_PRIV_TYPE_NONE,
983 "bt_reset"},
984 {
985 WLAN_SET128CHAR_GET128CHAR,
986 IW_PRIV_TYPE_CHAR | 128,
987 IW_PRIV_TYPE_CHAR | 128,
988 ""},
989 /* BT Management */
990 {
991 WLAN_SUBCMD_BT_ADD,
992 IW_PRIV_TYPE_CHAR | 128,
993 IW_PRIV_TYPE_CHAR | 128,
994 "bt_add"},
995 {
996 WLAN_SUBCMD_BT_DEL,
997 IW_PRIV_TYPE_CHAR | 128,
998 IW_PRIV_TYPE_CHAR | 128,
999 "bt_del"},
1000 {
1001 WLAN_SUBCMD_BT_LIST,
1002 IW_PRIV_TYPE_CHAR | 128,
1003 IW_PRIV_TYPE_CHAR | 128,
1004 "bt_list"},
1005 {
1006 WLAN_SUBCMD_BT_SET_INVERT,
1007 IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1,
1008 IW_PRIV_TYPE_NONE,
1009 "bt_set_invert"},
1010 {
1011 WLAN_SUBCMD_BT_GET_INVERT,
1012 IW_PRIV_TYPE_NONE,
1013 IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1,
1014 "bt_get_invert"},
1015 /* FWT Management */
1016 {
1017 WLAN_SUBCMD_FWT_ADD,
1018 IW_PRIV_TYPE_CHAR | 128,
1019 IW_PRIV_TYPE_CHAR | 128,
1020 "fwt_add"},
1021 {
1022 WLAN_SUBCMD_FWT_DEL,
1023 IW_PRIV_TYPE_CHAR | 128,
1024 IW_PRIV_TYPE_CHAR | 128,
1025 "fwt_del"},
1026 {
1027 WLAN_SUBCMD_FWT_LOOKUP,
1028 IW_PRIV_TYPE_CHAR | 128,
1029 IW_PRIV_TYPE_CHAR | 128,
1030 "fwt_lookup"},
1031 {
1032 WLAN_SUBCMD_FWT_LIST_NEIGHBOR,
1033 IW_PRIV_TYPE_CHAR | 128,
1034 IW_PRIV_TYPE_CHAR | 128,
1035 "fwt_list_neigh"},
1036 {
1037 WLAN_SUBCMD_FWT_LIST,
1038 IW_PRIV_TYPE_CHAR | 128,
1039 IW_PRIV_TYPE_CHAR | 128,
1040 "fwt_list"},
1041 {
1042 WLAN_SUBCMD_FWT_LIST_ROUTE,
1043 IW_PRIV_TYPE_CHAR | 128,
1044 IW_PRIV_TYPE_CHAR | 128,
1045 "fwt_list_route"},
1046 {
1047 WLAN_SET_GET_SIXTEEN_INT,
1048 IW_PRIV_TYPE_INT | 16,
1049 IW_PRIV_TYPE_INT | 16,
1050 ""},
1051 {
1052 WLAN_LED_GPIO_CTRL,
1053 IW_PRIV_TYPE_INT | 16,
1054 IW_PRIV_TYPE_INT | 16,
1055 "ledgpio"},
1056};
1057
1058static struct iw_statistics *wlan_get_wireless_stats(struct net_device *dev) 916static struct iw_statistics *wlan_get_wireless_stats(struct net_device *dev)
1059{ 917{
1060 enum { 918 enum {
@@ -2444,22 +2302,12 @@ static const iw_handler mesh_wlan_handler[] = {
2444}; 2302};
2445struct iw_handler_def libertas_handler_def = { 2303struct iw_handler_def libertas_handler_def = {
2446 .num_standard = sizeof(wlan_handler) / sizeof(iw_handler), 2304 .num_standard = sizeof(wlan_handler) / sizeof(iw_handler),
2447 .num_private = sizeof(wlan_private_handler) / sizeof(iw_handler),
2448 .num_private_args = sizeof(wlan_private_args) /
2449 sizeof(struct iw_priv_args),
2450 .standard = (iw_handler *) wlan_handler, 2305 .standard = (iw_handler *) wlan_handler,
2451 .private = (iw_handler *) wlan_private_handler,
2452 .private_args = (struct iw_priv_args *)wlan_private_args,
2453 .get_wireless_stats = wlan_get_wireless_stats, 2306 .get_wireless_stats = wlan_get_wireless_stats,
2454}; 2307};
2455 2308
2456struct iw_handler_def mesh_handler_def = { 2309struct iw_handler_def mesh_handler_def = {
2457 .num_standard = sizeof(mesh_wlan_handler) / sizeof(iw_handler), 2310 .num_standard = sizeof(mesh_wlan_handler) / sizeof(iw_handler),
2458 .num_private = sizeof(wlan_private_handler) / sizeof(iw_handler),
2459 .num_private_args = sizeof(wlan_private_args) /
2460 sizeof(struct iw_priv_args),
2461 .standard = (iw_handler *) mesh_wlan_handler, 2311 .standard = (iw_handler *) mesh_wlan_handler,
2462 .private = (iw_handler *) wlan_private_handler,
2463 .private_args = (struct iw_priv_args *)wlan_private_args,
2464 .get_wireless_stats = wlan_get_wireless_stats, 2312 .get_wireless_stats = wlan_get_wireless_stats,
2465}; 2313};
diff --git a/drivers/net/wireless/libertas/wext.h b/drivers/net/wireless/libertas/wext.h
index d555056b25b7..3d5196c9553a 100644
--- a/drivers/net/wireless/libertas/wext.h
+++ b/drivers/net/wireless/libertas/wext.h
@@ -7,45 +7,6 @@
7#define SUBCMD_OFFSET 4 7#define SUBCMD_OFFSET 4
8#define SUBCMD_DATA(x) *((int *)(x->u.name + SUBCMD_OFFSET)) 8#define SUBCMD_DATA(x) *((int *)(x->u.name + SUBCMD_OFFSET))
9 9
10/** PRIVATE CMD ID */
11#define WLANIOCTL SIOCIWFIRSTPRIV
12
13#define WLAN_SETNONE_GETNONE (WLANIOCTL + 8)
14#define WLAN_SUBCMD_BT_RESET 13
15#define WLAN_SUBCMD_FWT_RESET 14
16
17#define WLAN_SETNONE_GETONEINT (WLANIOCTL + 15)
18#define WLANGETREGION 1
19
20#define WLAN_SUBCMD_FWT_CLEANUP 15
21#define WLAN_SUBCMD_FWT_TIME 16
22#define WLAN_SUBCMD_MESH_GET_TTL 17
23#define WLAN_SUBCMD_BT_GET_INVERT 18
24
25#define WLAN_SETONEINT_GETNONE (WLANIOCTL + 24)
26#define WLANSETREGION 8
27#define WLAN_SUBCMD_MESH_SET_TTL 18
28#define WLAN_SUBCMD_BT_SET_INVERT 19
29
30#define WLAN_SET128CHAR_GET128CHAR (WLANIOCTL + 25)
31#define WLAN_SUBCMD_BT_ADD 18
32#define WLAN_SUBCMD_BT_DEL 19
33#define WLAN_SUBCMD_BT_LIST 20
34#define WLAN_SUBCMD_FWT_ADD 21
35#define WLAN_SUBCMD_FWT_DEL 22
36#define WLAN_SUBCMD_FWT_LOOKUP 23
37#define WLAN_SUBCMD_FWT_LIST_NEIGHBOR 24
38#define WLAN_SUBCMD_FWT_LIST 25
39#define WLAN_SUBCMD_FWT_LIST_ROUTE 26
40
41#define WLAN_SET_GET_SIXTEEN_INT (WLANIOCTL + 29)
42#define WLAN_LED_GPIO_CTRL 5
43
44#define WLAN_LINKMODE_802_3 0
45#define WLAN_LINKMODE_802_11 2
46#define WLAN_RADIOMODE_NONE 0
47#define WLAN_RADIOMODE_RADIOTAP 2
48
49/** wlan_ioctl_regrdwr */ 10/** wlan_ioctl_regrdwr */
50struct wlan_ioctl_regrdwr { 11struct wlan_ioctl_regrdwr {
51 /** Which register to access */ 12 /** Which register to access */
@@ -57,9 +18,13 @@ struct wlan_ioctl_regrdwr {
57 u32 value; 18 u32 value;
58}; 19};
59 20
21#define WLAN_LINKMODE_802_3 0
22#define WLAN_LINKMODE_802_11 2
23#define WLAN_RADIOMODE_NONE 0
24#define WLAN_RADIOMODE_RADIOTAP 2
25
60extern struct iw_handler_def libertas_handler_def; 26extern struct iw_handler_def libertas_handler_def;
61extern struct iw_handler_def mesh_handler_def; 27extern struct iw_handler_def mesh_handler_def;
62int libertas_do_ioctl(struct net_device *dev, struct ifreq *req, int i);
63int wlan_radio_ioctl(wlan_private * priv, u8 option); 28int wlan_radio_ioctl(wlan_private * priv, u8 option);
64 29
65#endif /* _WLAN_WEXT_H_ */ 30#endif /* _WLAN_WEXT_H_ */
diff --git a/drivers/scsi/Kconfig b/drivers/scsi/Kconfig
index 2b2f5c12019b..eb46cb0e3cb7 100644
--- a/drivers/scsi/Kconfig
+++ b/drivers/scsi/Kconfig
@@ -60,6 +60,7 @@ config BLK_DEV_SD
60 depends on SCSI 60 depends on SCSI
61 ---help--- 61 ---help---
62 If you want to use SCSI hard disks, Fibre Channel disks, 62 If you want to use SCSI hard disks, Fibre Channel disks,
63 Serial ATA (SATA) or Parallel ATA (PATA) hard disks,
63 USB storage or the SCSI or parallel port version of 64 USB storage or the SCSI or parallel port version of
64 the IOMEGA ZIP drive, say Y and read the SCSI-HOWTO, 65 the IOMEGA ZIP drive, say Y and read the SCSI-HOWTO,
65 the Disk-HOWTO and the Multi-Disk-HOWTO, available from 66 the Disk-HOWTO and the Multi-Disk-HOWTO, available from
diff --git a/fs/direct-io.c b/fs/direct-io.c
index 8593f3dfd299..52bb2638f7ab 100644
--- a/fs/direct-io.c
+++ b/fs/direct-io.c
@@ -1106,7 +1106,7 @@ direct_io_worker(int rw, struct kiocb *iocb, struct inode *inode,
1106 spin_lock_irqsave(&dio->bio_lock, flags); 1106 spin_lock_irqsave(&dio->bio_lock, flags);
1107 ret2 = --dio->refcount; 1107 ret2 = --dio->refcount;
1108 spin_unlock_irqrestore(&dio->bio_lock, flags); 1108 spin_unlock_irqrestore(&dio->bio_lock, flags);
1109 BUG_ON(!dio->is_async && ret2 != 0); 1109
1110 if (ret2 == 0) { 1110 if (ret2 == 0) {
1111 ret = dio_complete(dio, offset, ret); 1111 ret = dio_complete(dio, offset, ret);
1112 kfree(dio); 1112 kfree(dio);
diff --git a/fs/jffs2/readinode.c b/fs/jffs2/readinode.c
index 12e83f67eee4..7b363786c2d2 100644
--- a/fs/jffs2/readinode.c
+++ b/fs/jffs2/readinode.c
@@ -210,8 +210,7 @@ static void jffs2_kill_tn(struct jffs2_sb_info *c, struct jffs2_tmp_dnode_info *
210 * offset, and the one with the smallest length will come first in the 210 * offset, and the one with the smallest length will come first in the
211 * ordering. 211 * ordering.
212 * 212 *
213 * Returns 0 if the node was inserted 213 * Returns 0 if the node was handled (including marking it obsolete)
214 * 1 if the node is obsolete (because we can't mark it so yet)
215 * < 0 an if error occurred 214 * < 0 an if error occurred
216 */ 215 */
217static int jffs2_add_tn_to_tree(struct jffs2_sb_info *c, 216static int jffs2_add_tn_to_tree(struct jffs2_sb_info *c,
@@ -572,8 +571,7 @@ static struct jffs2_raw_node_ref *jffs2_first_valid_node(struct jffs2_raw_node_r
572 * Helper function for jffs2_get_inode_nodes(). 571 * Helper function for jffs2_get_inode_nodes().
573 * It is called every time an directory entry node is found. 572 * It is called every time an directory entry node is found.
574 * 573 *
575 * Returns: 0 on succes; 574 * Returns: 0 on success;
576 * 1 if the node should be marked obsolete;
577 * negative error code on failure. 575 * negative error code on failure.
578 */ 576 */
579static inline int read_direntry(struct jffs2_sb_info *c, struct jffs2_raw_node_ref *ref, 577static inline int read_direntry(struct jffs2_sb_info *c, struct jffs2_raw_node_ref *ref,
@@ -680,8 +678,7 @@ static inline int read_direntry(struct jffs2_sb_info *c, struct jffs2_raw_node_r
680 * Helper function for jffs2_get_inode_nodes(). 678 * Helper function for jffs2_get_inode_nodes().
681 * It is called every time an inode node is found. 679 * It is called every time an inode node is found.
682 * 680 *
683 * Returns: 0 on success; 681 * Returns: 0 on success (possibly after marking a bad node obsolete);
684 * 1 if the node should be marked obsolete;
685 * negative error code on failure. 682 * negative error code on failure.
686 */ 683 */
687static inline int read_dnode(struct jffs2_sb_info *c, struct jffs2_raw_node_ref *ref, 684static inline int read_dnode(struct jffs2_sb_info *c, struct jffs2_raw_node_ref *ref,
@@ -690,7 +687,7 @@ static inline int read_dnode(struct jffs2_sb_info *c, struct jffs2_raw_node_ref
690{ 687{
691 struct jffs2_tmp_dnode_info *tn; 688 struct jffs2_tmp_dnode_info *tn;
692 uint32_t len, csize; 689 uint32_t len, csize;
693 int ret = 1; 690 int ret = 0;
694 uint32_t crc; 691 uint32_t crc;
695 692
696 /* Obsoleted. This cannot happen, surely? dwmw2 20020308 */ 693 /* Obsoleted. This cannot happen, surely? dwmw2 20020308 */
@@ -719,8 +716,9 @@ static inline int read_dnode(struct jffs2_sb_info *c, struct jffs2_raw_node_ref
719 /* Sanity checks */ 716 /* Sanity checks */
720 if (unlikely(je32_to_cpu(rd->offset) > je32_to_cpu(rd->isize)) || 717 if (unlikely(je32_to_cpu(rd->offset) > je32_to_cpu(rd->isize)) ||
721 unlikely(PAD(je32_to_cpu(rd->csize) + sizeof(*rd)) != PAD(je32_to_cpu(rd->totlen)))) { 718 unlikely(PAD(je32_to_cpu(rd->csize) + sizeof(*rd)) != PAD(je32_to_cpu(rd->totlen)))) {
722 JFFS2_WARNING("inode node header CRC is corrupted at %#08x\n", ref_offset(ref)); 719 JFFS2_WARNING("inode node header CRC is corrupted at %#08x\n", ref_offset(ref));
723 jffs2_dbg_dump_node(c, ref_offset(ref)); 720 jffs2_dbg_dump_node(c, ref_offset(ref));
721 jffs2_mark_node_obsolete(c, ref);
724 goto free_out; 722 goto free_out;
725 } 723 }
726 724
@@ -775,6 +773,7 @@ static inline int read_dnode(struct jffs2_sb_info *c, struct jffs2_raw_node_ref
775 if (len >= csize && unlikely(tn->partial_crc != je32_to_cpu(rd->data_crc))) { 773 if (len >= csize && unlikely(tn->partial_crc != je32_to_cpu(rd->data_crc))) {
776 JFFS2_NOTICE("wrong data CRC in data node at 0x%08x: read %#08x, calculated %#08x.\n", 774 JFFS2_NOTICE("wrong data CRC in data node at 0x%08x: read %#08x, calculated %#08x.\n",
777 ref_offset(ref), tn->partial_crc, je32_to_cpu(rd->data_crc)); 775 ref_offset(ref), tn->partial_crc, je32_to_cpu(rd->data_crc));
776 jffs2_mark_node_obsolete(c, ref);
778 goto free_out; 777 goto free_out;
779 } 778 }
780 779
@@ -854,7 +853,6 @@ static inline int read_dnode(struct jffs2_sb_info *c, struct jffs2_raw_node_ref
854 * It is called every time an unknown node is found. 853 * It is called every time an unknown node is found.
855 * 854 *
856 * Returns: 0 on success; 855 * Returns: 0 on success;
857 * 1 if the node should be marked obsolete;
858 * negative error code on failure. 856 * negative error code on failure.
859 */ 857 */
860static inline int read_unknown(struct jffs2_sb_info *c, struct jffs2_raw_node_ref *ref, struct jffs2_unknown_node *un) 858static inline int read_unknown(struct jffs2_sb_info *c, struct jffs2_raw_node_ref *ref, struct jffs2_unknown_node *un)
@@ -1088,10 +1086,7 @@ static int jffs2_get_inode_nodes(struct jffs2_sb_info *c, struct jffs2_inode_inf
1088 } 1086 }
1089 1087
1090 err = read_unknown(c, ref, &node->u); 1088 err = read_unknown(c, ref, &node->u);
1091 if (err == 1) { 1089 if (unlikely(err))
1092 jffs2_mark_node_obsolete(c, ref);
1093 break;
1094 } else if (unlikely(err))
1095 goto free_out; 1090 goto free_out;
1096 1091
1097 } 1092 }
diff --git a/include/asm-blackfin/macros.h b/include/asm-blackfin/macros.h
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/include/asm-blackfin/macros.h
+++ /dev/null
diff --git a/include/asm-blackfin/processor.h b/include/asm-blackfin/processor.h
index aba2b30a8ed8..6bb3e0d4705d 100644
--- a/include/asm-blackfin/processor.h
+++ b/include/asm-blackfin/processor.h
@@ -124,6 +124,10 @@ static inline __attribute_pure__ uint32_t bfin_compiled_revid(void)
124 return 4; 124 return 4;
125#elif defined(CONFIG_BF_REV_0_5) 125#elif defined(CONFIG_BF_REV_0_5)
126 return 5; 126 return 5;
127#elif defined(CONFIG_BF_REV_ANY)
128 return 0xffff;
129#else
130 return -1;
127#endif 131#endif
128} 132}
129 133
diff --git a/include/asm-mips/mach-ip32/dma-coherence.h b/include/asm-mips/mach-ip32/dma-coherence.h
index c3f9a6a20eb0..a5511ebb2d53 100644
--- a/include/asm-mips/mach-ip32/dma-coherence.h
+++ b/include/asm-mips/mach-ip32/dma-coherence.h
@@ -6,8 +6,8 @@
6 * Copyright (C) 2006 Ralf Baechle <ralf@linux-mips.org> 6 * Copyright (C) 2006 Ralf Baechle <ralf@linux-mips.org>
7 * 7 *
8 */ 8 */
9#ifndef __ASM_MACH_IP35_DMA_COHERENCE_H 9#ifndef __ASM_MACH_IP32_DMA_COHERENCE_H
10#define __ASM_MACH_IP35_DMA_COHERENCE_H 10#define __ASM_MACH_IP32_DMA_COHERENCE_H
11 11
12#include <asm/ip32/crime.h> 12#include <asm/ip32/crime.h>
13 13
@@ -69,4 +69,4 @@ static inline int plat_device_is_coherent(struct device *dev)
69 return 0; /* IP32 is non-cohernet */ 69 return 0; /* IP32 is non-cohernet */
70} 70}
71 71
72#endif /* __ASM_MACH_IP35_DMA_COHERENCE_H */ 72#endif /* __ASM_MACH_IP32_DMA_COHERENCE_H */
diff --git a/include/asm-mips/ptrace.h b/include/asm-mips/ptrace.h
index 1906938285c0..85b44366343a 100644
--- a/include/asm-mips/ptrace.h
+++ b/include/asm-mips/ptrace.h
@@ -86,7 +86,7 @@ struct pt_regs {
86 86
87extern asmlinkage void do_syscall_trace(struct pt_regs *regs, int entryexit); 87extern asmlinkage void do_syscall_trace(struct pt_regs *regs, int entryexit);
88 88
89extern NORET_TYPE void die(const char *, struct pt_regs *); 89extern NORET_TYPE void die(const char *, struct pt_regs *) ATTRIB_NORET;
90 90
91static inline void die_if_kernel(const char *str, struct pt_regs *regs) 91static inline void die_if_kernel(const char *str, struct pt_regs *regs)
92{ 92{
diff --git a/include/asm-mips/unistd.h b/include/asm-mips/unistd.h
index 59d6fec8fbff..ed16de0a6398 100644
--- a/include/asm-mips/unistd.h
+++ b/include/asm-mips/unistd.h
@@ -977,6 +977,22 @@
977# define __ARCH_WANT_COMPAT_SYS_TIME 977# define __ARCH_WANT_COMPAT_SYS_TIME
978# endif 978# endif
979 979
980/* whitelists for checksyscalls */
981#define __IGNORE_select
982#define __IGNORE_vfork
983#define __IGNORE_time
984#define __IGNORE_uselib
985#define __IGNORE_fadvise64_64
986#define __IGNORE_getdents64
987#if _MIPS_SIM == _MIPS_SIM_NABI32
988#define __IGNORE_truncate64
989#define __IGNORE_ftruncate64
990#define __IGNORE_stat64
991#define __IGNORE_lstat64
992#define __IGNORE_fstat64
993#define __IGNORE_fstatat64
994#endif
995
980#endif /* !__ASSEMBLY__ */ 996#endif /* !__ASSEMBLY__ */
981 997
982/* 998/*
diff --git a/include/asm-powerpc/irq.h b/include/asm-powerpc/irq.h
index 4734cc178db5..05dd5a3eb3aa 100644
--- a/include/asm-powerpc/irq.h
+++ b/include/asm-powerpc/irq.h
@@ -138,10 +138,7 @@ struct irq_map_entry {
138 138
139extern struct irq_map_entry irq_map[NR_IRQS]; 139extern struct irq_map_entry irq_map[NR_IRQS];
140 140
141static inline irq_hw_number_t virq_to_hw(unsigned int virq) 141extern irq_hw_number_t virq_to_hw(unsigned int virq);
142{
143 return irq_map[virq].hwirq;
144}
145 142
146/** 143/**
147 * irq_alloc_host - Allocate a new irq_host data structure 144 * irq_alloc_host - Allocate a new irq_host data structure
diff --git a/include/linux/input.h b/include/linux/input.h
index be2bf3a2b031..d8521c72f69f 100644
--- a/include/linux/input.h
+++ b/include/linux/input.h
@@ -108,6 +108,13 @@ struct input_absinfo {
108 108
109/* 109/*
110 * Keys and buttons 110 * Keys and buttons
111 *
112 * Most of the keys/buttons are modeled after USB HUT 1.12
113 * (see http://www.usb.org/developers/hidpage).
114 * Abbreviations in the comments:
115 * AC - Application Control
116 * AL - Application Launch Button
117 * SC - System Control
111 */ 118 */
112 119
113#define KEY_RESERVED 0 120#define KEY_RESERVED 0
@@ -226,7 +233,7 @@ struct input_absinfo {
226#define KEY_MUTE 113 233#define KEY_MUTE 113
227#define KEY_VOLUMEDOWN 114 234#define KEY_VOLUMEDOWN 114
228#define KEY_VOLUMEUP 115 235#define KEY_VOLUMEUP 115
229#define KEY_POWER 116 236#define KEY_POWER 116 /* SC System Power Down */
230#define KEY_KPEQUAL 117 237#define KEY_KPEQUAL 117
231#define KEY_KPPLUSMINUS 118 238#define KEY_KPPLUSMINUS 118
232#define KEY_PAUSE 119 239#define KEY_PAUSE 119
@@ -240,38 +247,39 @@ struct input_absinfo {
240#define KEY_RIGHTMETA 126 247#define KEY_RIGHTMETA 126
241#define KEY_COMPOSE 127 248#define KEY_COMPOSE 127
242 249
243#define KEY_STOP 128 250#define KEY_STOP 128 /* AC Stop */
244#define KEY_AGAIN 129 251#define KEY_AGAIN 129
245#define KEY_PROPS 130 252#define KEY_PROPS 130 /* AC Properties */
246#define KEY_UNDO 131 253#define KEY_UNDO 131 /* AC Undo */
247#define KEY_FRONT 132 254#define KEY_FRONT 132
248#define KEY_COPY 133 255#define KEY_COPY 133 /* AC Copy */
249#define KEY_OPEN 134 256#define KEY_OPEN 134 /* AC Open */
250#define KEY_PASTE 135 257#define KEY_PASTE 135 /* AC Paste */
251#define KEY_FIND 136 258#define KEY_FIND 136 /* AC Search */
252#define KEY_CUT 137 259#define KEY_CUT 137 /* AC Cut */
253#define KEY_HELP 138 260#define KEY_HELP 138 /* AL Integrated Help Center */
254#define KEY_MENU 139 261#define KEY_MENU 139 /* Menu (show menu) */
255#define KEY_CALC 140 262#define KEY_CALC 140 /* AL Calculator */
256#define KEY_SETUP 141 263#define KEY_SETUP 141
257#define KEY_SLEEP 142 264#define KEY_SLEEP 142 /* SC System Sleep */
258#define KEY_WAKEUP 143 265#define KEY_WAKEUP 143 /* System Wake Up */
259#define KEY_FILE 144 266#define KEY_FILE 144 /* AL Local Machine Browser */
260#define KEY_SENDFILE 145 267#define KEY_SENDFILE 145
261#define KEY_DELETEFILE 146 268#define KEY_DELETEFILE 146
262#define KEY_XFER 147 269#define KEY_XFER 147
263#define KEY_PROG1 148 270#define KEY_PROG1 148
264#define KEY_PROG2 149 271#define KEY_PROG2 149
265#define KEY_WWW 150 272#define KEY_WWW 150 /* AL Internet Browser */
266#define KEY_MSDOS 151 273#define KEY_MSDOS 151
267#define KEY_COFFEE 152 274#define KEY_COFFEE 152 /* AL Terminal Lock/Screensaver */
275#define KEY_SCREENLOCK KEY_COFFEE
268#define KEY_DIRECTION 153 276#define KEY_DIRECTION 153
269#define KEY_CYCLEWINDOWS 154 277#define KEY_CYCLEWINDOWS 154
270#define KEY_MAIL 155 278#define KEY_MAIL 155
271#define KEY_BOOKMARKS 156 279#define KEY_BOOKMARKS 156 /* AC Bookmarks */
272#define KEY_COMPUTER 157 280#define KEY_COMPUTER 157
273#define KEY_BACK 158 281#define KEY_BACK 158 /* AC Back */
274#define KEY_FORWARD 159 282#define KEY_FORWARD 159 /* AC Forward */
275#define KEY_CLOSECD 160 283#define KEY_CLOSECD 160
276#define KEY_EJECTCD 161 284#define KEY_EJECTCD 161
277#define KEY_EJECTCLOSECD 162 285#define KEY_EJECTCLOSECD 162
@@ -281,20 +289,20 @@ struct input_absinfo {
281#define KEY_STOPCD 166 289#define KEY_STOPCD 166
282#define KEY_RECORD 167 290#define KEY_RECORD 167
283#define KEY_REWIND 168 291#define KEY_REWIND 168
284#define KEY_PHONE 169 292#define KEY_PHONE 169 /* Media Select Telephone */
285#define KEY_ISO 170 293#define KEY_ISO 170
286#define KEY_CONFIG 171 294#define KEY_CONFIG 171 /* AL Consumer Control Configuration */
287#define KEY_HOMEPAGE 172 295#define KEY_HOMEPAGE 172 /* AC Home */
288#define KEY_REFRESH 173 296#define KEY_REFRESH 173 /* AC Refresh */
289#define KEY_EXIT 174 297#define KEY_EXIT 174 /* AC Exit */
290#define KEY_MOVE 175 298#define KEY_MOVE 175
291#define KEY_EDIT 176 299#define KEY_EDIT 176
292#define KEY_SCROLLUP 177 300#define KEY_SCROLLUP 177
293#define KEY_SCROLLDOWN 178 301#define KEY_SCROLLDOWN 178
294#define KEY_KPLEFTPAREN 179 302#define KEY_KPLEFTPAREN 179
295#define KEY_KPRIGHTPAREN 180 303#define KEY_KPRIGHTPAREN 180
296#define KEY_NEW 181 304#define KEY_NEW 181 /* AC New */
297#define KEY_REDO 182 305#define KEY_REDO 182 /* AC Redo/Repeat */
298 306
299#define KEY_F13 183 307#define KEY_F13 183
300#define KEY_F14 184 308#define KEY_F14 184
@@ -314,11 +322,11 @@ struct input_absinfo {
314#define KEY_PROG3 202 322#define KEY_PROG3 202
315#define KEY_PROG4 203 323#define KEY_PROG4 203
316#define KEY_SUSPEND 205 324#define KEY_SUSPEND 205
317#define KEY_CLOSE 206 325#define KEY_CLOSE 206 /* AC Close */
318#define KEY_PLAY 207 326#define KEY_PLAY 207
319#define KEY_FASTFORWARD 208 327#define KEY_FASTFORWARD 208
320#define KEY_BASSBOOST 209 328#define KEY_BASSBOOST 209
321#define KEY_PRINT 210 329#define KEY_PRINT 210 /* AC Print */
322#define KEY_HP 211 330#define KEY_HP 211
323#define KEY_CAMERA 212 331#define KEY_CAMERA 212
324#define KEY_SOUND 213 332#define KEY_SOUND 213
@@ -327,11 +335,11 @@ struct input_absinfo {
327#define KEY_CHAT 216 335#define KEY_CHAT 216
328#define KEY_SEARCH 217 336#define KEY_SEARCH 217
329#define KEY_CONNECT 218 337#define KEY_CONNECT 218
330#define KEY_FINANCE 219 338#define KEY_FINANCE 219 /* AL Checkbook/Finance */
331#define KEY_SPORT 220 339#define KEY_SPORT 220
332#define KEY_SHOP 221 340#define KEY_SHOP 221
333#define KEY_ALTERASE 222 341#define KEY_ALTERASE 222
334#define KEY_CANCEL 223 342#define KEY_CANCEL 223 /* AC Cancel */
335#define KEY_BRIGHTNESSDOWN 224 343#define KEY_BRIGHTNESSDOWN 224
336#define KEY_BRIGHTNESSUP 225 344#define KEY_BRIGHTNESSUP 225
337#define KEY_MEDIA 226 345#define KEY_MEDIA 226
@@ -341,10 +349,10 @@ struct input_absinfo {
341#define KEY_KBDILLUMDOWN 229 349#define KEY_KBDILLUMDOWN 229
342#define KEY_KBDILLUMUP 230 350#define KEY_KBDILLUMUP 230
343 351
344#define KEY_SEND 231 352#define KEY_SEND 231 /* AC Send */
345#define KEY_REPLY 232 353#define KEY_REPLY 232 /* AC Reply */
346#define KEY_FORWARDMAIL 233 354#define KEY_FORWARDMAIL 233 /* AC Forward Msg */
347#define KEY_SAVE 234 355#define KEY_SAVE 234 /* AC Save */
348#define KEY_DOCUMENTS 235 356#define KEY_DOCUMENTS 235
349 357
350#define KEY_BATTERY 236 358#define KEY_BATTERY 236
@@ -433,15 +441,15 @@ struct input_absinfo {
433#define KEY_CLEAR 0x163 441#define KEY_CLEAR 0x163
434#define KEY_POWER2 0x164 442#define KEY_POWER2 0x164
435#define KEY_OPTION 0x165 443#define KEY_OPTION 0x165
436#define KEY_INFO 0x166 444#define KEY_INFO 0x166 /* AL OEM Features/Tips/Tutorial */
437#define KEY_TIME 0x167 445#define KEY_TIME 0x167
438#define KEY_VENDOR 0x168 446#define KEY_VENDOR 0x168
439#define KEY_ARCHIVE 0x169 447#define KEY_ARCHIVE 0x169
440#define KEY_PROGRAM 0x16a 448#define KEY_PROGRAM 0x16a /* Media Select Program Guide */
441#define KEY_CHANNEL 0x16b 449#define KEY_CHANNEL 0x16b
442#define KEY_FAVORITES 0x16c 450#define KEY_FAVORITES 0x16c
443#define KEY_EPG 0x16d 451#define KEY_EPG 0x16d
444#define KEY_PVR 0x16e 452#define KEY_PVR 0x16e /* Media Select Home */
445#define KEY_MHP 0x16f 453#define KEY_MHP 0x16f
446#define KEY_LANGUAGE 0x170 454#define KEY_LANGUAGE 0x170
447#define KEY_TITLE 0x171 455#define KEY_TITLE 0x171
@@ -451,36 +459,36 @@ struct input_absinfo {
451#define KEY_MODE 0x175 459#define KEY_MODE 0x175
452#define KEY_KEYBOARD 0x176 460#define KEY_KEYBOARD 0x176
453#define KEY_SCREEN 0x177 461#define KEY_SCREEN 0x177
454#define KEY_PC 0x178 462#define KEY_PC 0x178 /* Media Select Computer */
455#define KEY_TV 0x179 463#define KEY_TV 0x179 /* Media Select TV */
456#define KEY_TV2 0x17a 464#define KEY_TV2 0x17a /* Media Select Cable */
457#define KEY_VCR 0x17b 465#define KEY_VCR 0x17b /* Media Select VCR */
458#define KEY_VCR2 0x17c 466#define KEY_VCR2 0x17c /* VCR Plus */
459#define KEY_SAT 0x17d 467#define KEY_SAT 0x17d /* Media Select Satellite */
460#define KEY_SAT2 0x17e 468#define KEY_SAT2 0x17e
461#define KEY_CD 0x17f 469#define KEY_CD 0x17f /* Media Select CD */
462#define KEY_TAPE 0x180 470#define KEY_TAPE 0x180 /* Media Select Tape */
463#define KEY_RADIO 0x181 471#define KEY_RADIO 0x181
464#define KEY_TUNER 0x182 472#define KEY_TUNER 0x182 /* Media Select Tuner */
465#define KEY_PLAYER 0x183 473#define KEY_PLAYER 0x183
466#define KEY_TEXT 0x184 474#define KEY_TEXT 0x184
467#define KEY_DVD 0x185 475#define KEY_DVD 0x185 /* Media Select DVD */
468#define KEY_AUX 0x186 476#define KEY_AUX 0x186
469#define KEY_MP3 0x187 477#define KEY_MP3 0x187
470#define KEY_AUDIO 0x188 478#define KEY_AUDIO 0x188
471#define KEY_VIDEO 0x189 479#define KEY_VIDEO 0x189
472#define KEY_DIRECTORY 0x18a 480#define KEY_DIRECTORY 0x18a
473#define KEY_LIST 0x18b 481#define KEY_LIST 0x18b
474#define KEY_MEMO 0x18c 482#define KEY_MEMO 0x18c /* Media Select Messages */
475#define KEY_CALENDAR 0x18d 483#define KEY_CALENDAR 0x18d
476#define KEY_RED 0x18e 484#define KEY_RED 0x18e
477#define KEY_GREEN 0x18f 485#define KEY_GREEN 0x18f
478#define KEY_YELLOW 0x190 486#define KEY_YELLOW 0x190
479#define KEY_BLUE 0x191 487#define KEY_BLUE 0x191
480#define KEY_CHANNELUP 0x192 488#define KEY_CHANNELUP 0x192 /* Channel Increment */
481#define KEY_CHANNELDOWN 0x193 489#define KEY_CHANNELDOWN 0x193 /* Channel Decrement */
482#define KEY_FIRST 0x194 490#define KEY_FIRST 0x194
483#define KEY_LAST 0x195 491#define KEY_LAST 0x195 /* Recall Last */
484#define KEY_AB 0x196 492#define KEY_AB 0x196
485#define KEY_NEXT 0x197 493#define KEY_NEXT 0x197
486#define KEY_RESTART 0x198 494#define KEY_RESTART 0x198
@@ -491,21 +499,21 @@ struct input_absinfo {
491#define KEY_DIGITS 0x19d 499#define KEY_DIGITS 0x19d
492#define KEY_TEEN 0x19e 500#define KEY_TEEN 0x19e
493#define KEY_TWEN 0x19f 501#define KEY_TWEN 0x19f
494#define KEY_VIDEOPHONE 0x1a0 502#define KEY_VIDEOPHONE 0x1a0 /* Media Select Video Phone */
495#define KEY_GAMES 0x1a1 503#define KEY_GAMES 0x1a1 /* Media Select Games */
496#define KEY_ZOOMIN 0x1a2 504#define KEY_ZOOMIN 0x1a2 /* AC Zoom In */
497#define KEY_ZOOMOUT 0x1a3 505#define KEY_ZOOMOUT 0x1a3 /* AC Zoom Out */
498#define KEY_ZOOMRESET 0x1a4 506#define KEY_ZOOMRESET 0x1a4 /* AC Zoom */
499#define KEY_WORDPROCESSOR 0x1a5 507#define KEY_WORDPROCESSOR 0x1a5 /* AL Word Processor */
500#define KEY_EDITOR 0x1a6 508#define KEY_EDITOR 0x1a6 /* AL Text Editor */
501#define KEY_SPREADSHEET 0x1a7 509#define KEY_SPREADSHEET 0x1a7 /* AL Spreadsheet */
502#define KEY_GRAPHICSEDITOR 0x1a8 510#define KEY_GRAPHICSEDITOR 0x1a8 /* AL Graphics Editor */
503#define KEY_PRESENTATION 0x1a9 511#define KEY_PRESENTATION 0x1a9 /* AL Presentation App */
504#define KEY_DATABASE 0x1aa 512#define KEY_DATABASE 0x1aa /* AL Database App */
505#define KEY_NEWS 0x1ab 513#define KEY_NEWS 0x1ab /* AL Newsreader */
506#define KEY_VOICEMAIL 0x1ac 514#define KEY_VOICEMAIL 0x1ac /* AL Voicemail */
507#define KEY_ADDRESSBOOK 0x1ad 515#define KEY_ADDRESSBOOK 0x1ad /* AL Contacts/Address Book */
508#define KEY_MESSENGER 0x1ae 516#define KEY_MESSENGER 0x1ae /* AL Instant Messaging */
509#define KEY_DISPLAYTOGGLE 0x1af /* Turn display (LCD) on and off */ 517#define KEY_DISPLAYTOGGLE 0x1af /* Turn display (LCD) on and off */
510 518
511#define KEY_DEL_EOL 0x1c0 519#define KEY_DEL_EOL 0x1c0
@@ -603,6 +611,7 @@ struct input_absinfo {
603#define SW_LID 0x00 /* set = lid shut */ 611#define SW_LID 0x00 /* set = lid shut */
604#define SW_TABLET_MODE 0x01 /* set = tablet mode */ 612#define SW_TABLET_MODE 0x01 /* set = tablet mode */
605#define SW_HEADPHONE_INSERT 0x02 /* set = inserted */ 613#define SW_HEADPHONE_INSERT 0x02 /* set = inserted */
614#define SW_RADIO 0x03 /* set = radio enabled */
606#define SW_MAX 0x0f 615#define SW_MAX 0x0f
607 616
608/* 617/*
diff --git a/kernel/time/ntp.c b/kernel/time/ntp.c
index 87aa5ff931e0..cf53bb5814cb 100644
--- a/kernel/time/ntp.c
+++ b/kernel/time/ntp.c
@@ -122,7 +122,6 @@ void second_overflow(void)
122 */ 122 */
123 time_interpolator_update(-NSEC_PER_SEC); 123 time_interpolator_update(-NSEC_PER_SEC);
124 time_state = TIME_OOP; 124 time_state = TIME_OOP;
125 clock_was_set();
126 printk(KERN_NOTICE "Clock: inserting leap second " 125 printk(KERN_NOTICE "Clock: inserting leap second "
127 "23:59:60 UTC\n"); 126 "23:59:60 UTC\n");
128 } 127 }
@@ -137,7 +136,6 @@ void second_overflow(void)
137 */ 136 */
138 time_interpolator_update(NSEC_PER_SEC); 137 time_interpolator_update(NSEC_PER_SEC);
139 time_state = TIME_WAIT; 138 time_state = TIME_WAIT;
140 clock_was_set();
141 printk(KERN_NOTICE "Clock: deleting leap second " 139 printk(KERN_NOTICE "Clock: deleting leap second "
142 "23:59:59 UTC\n"); 140 "23:59:59 UTC\n");
143 } 141 }
diff --git a/mm/slab.c b/mm/slab.c
index a9c4472e9204..b344e6707128 100644
--- a/mm/slab.c
+++ b/mm/slab.c
@@ -137,6 +137,7 @@
137 137
138/* Shouldn't this be in a header file somewhere? */ 138/* Shouldn't this be in a header file somewhere? */
139#define BYTES_PER_WORD sizeof(void *) 139#define BYTES_PER_WORD sizeof(void *)
140#define REDZONE_ALIGN max(BYTES_PER_WORD, __alignof__(unsigned long long))
140 141
141#ifndef cache_line_size 142#ifndef cache_line_size
142#define cache_line_size() L1_CACHE_BYTES 143#define cache_line_size() L1_CACHE_BYTES
@@ -547,7 +548,7 @@ static unsigned long long *dbg_redzone2(struct kmem_cache *cachep, void *objp)
547 if (cachep->flags & SLAB_STORE_USER) 548 if (cachep->flags & SLAB_STORE_USER)
548 return (unsigned long long *)(objp + cachep->buffer_size - 549 return (unsigned long long *)(objp + cachep->buffer_size -
549 sizeof(unsigned long long) - 550 sizeof(unsigned long long) -
550 BYTES_PER_WORD); 551 REDZONE_ALIGN);
551 return (unsigned long long *) (objp + cachep->buffer_size - 552 return (unsigned long long *) (objp + cachep->buffer_size -
552 sizeof(unsigned long long)); 553 sizeof(unsigned long long));
553} 554}
@@ -2178,7 +2179,8 @@ kmem_cache_create (const char *name, size_t size, size_t align,
2178 * above the next power of two: caches with object sizes just above a 2179 * above the next power of two: caches with object sizes just above a
2179 * power of two have a significant amount of internal fragmentation. 2180 * power of two have a significant amount of internal fragmentation.
2180 */ 2181 */
2181 if (size < 4096 || fls(size - 1) == fls(size-1 + 3 * BYTES_PER_WORD)) 2182 if (size < 4096 || fls(size - 1) == fls(size-1 + REDZONE_ALIGN +
2183 2 * sizeof(unsigned long long)))
2182 flags |= SLAB_RED_ZONE | SLAB_STORE_USER; 2184 flags |= SLAB_RED_ZONE | SLAB_STORE_USER;
2183 if (!(flags & SLAB_DESTROY_BY_RCU)) 2185 if (!(flags & SLAB_DESTROY_BY_RCU))
2184 flags |= SLAB_POISON; 2186 flags |= SLAB_POISON;
@@ -2219,12 +2221,20 @@ kmem_cache_create (const char *name, size_t size, size_t align,
2219 } 2221 }
2220 2222
2221 /* 2223 /*
2222 * Redzoning and user store require word alignment. Note this will be 2224 * Redzoning and user store require word alignment or possibly larger.
2223 * overridden by architecture or caller mandated alignment if either 2225 * Note this will be overridden by architecture or caller mandated
2224 * is greater than BYTES_PER_WORD. 2226 * alignment if either is greater than BYTES_PER_WORD.
2225 */ 2227 */
2226 if (flags & SLAB_RED_ZONE || flags & SLAB_STORE_USER) 2228 if (flags & SLAB_STORE_USER)
2227 ralign = __alignof__(unsigned long long); 2229 ralign = BYTES_PER_WORD;
2230
2231 if (flags & SLAB_RED_ZONE) {
2232 ralign = REDZONE_ALIGN;
2233 /* If redzoning, ensure that the second redzone is suitably
2234 * aligned, by adjusting the object size accordingly. */
2235 size += REDZONE_ALIGN - 1;
2236 size &= ~(REDZONE_ALIGN - 1);
2237 }
2228 2238
2229 /* 2) arch mandated alignment */ 2239 /* 2) arch mandated alignment */
2230 if (ralign < ARCH_SLAB_MINALIGN) { 2240 if (ralign < ARCH_SLAB_MINALIGN) {
@@ -2261,9 +2271,13 @@ kmem_cache_create (const char *name, size_t size, size_t align,
2261 } 2271 }
2262 if (flags & SLAB_STORE_USER) { 2272 if (flags & SLAB_STORE_USER) {
2263 /* user store requires one word storage behind the end of 2273 /* user store requires one word storage behind the end of
2264 * the real object. 2274 * the real object. But if the second red zone needs to be
2275 * aligned to 64 bits, we must allow that much space.
2265 */ 2276 */
2266 size += BYTES_PER_WORD; 2277 if (flags & SLAB_RED_ZONE)
2278 size += REDZONE_ALIGN;
2279 else
2280 size += BYTES_PER_WORD;
2267 } 2281 }
2268#if FORCED_DEBUG && defined(CONFIG_DEBUG_PAGEALLOC) 2282#if FORCED_DEBUG && defined(CONFIG_DEBUG_PAGEALLOC)
2269 if (size >= malloc_sizes[INDEX_L3 + 1].cs_size 2283 if (size >= malloc_sizes[INDEX_L3 + 1].cs_size
diff --git a/mm/slub.c b/mm/slub.c
index 202049a45764..0437f2f09986 100644
--- a/mm/slub.c
+++ b/mm/slub.c
@@ -1798,8 +1798,6 @@ static struct kmem_cache_node * __init early_kmem_cache_node_alloc(gfp_t gfpflag
1798 BUG_ON(kmalloc_caches->size < sizeof(struct kmem_cache_node)); 1798 BUG_ON(kmalloc_caches->size < sizeof(struct kmem_cache_node));
1799 1799
1800 page = new_slab(kmalloc_caches, gfpflags | GFP_THISNODE, node); 1800 page = new_slab(kmalloc_caches, gfpflags | GFP_THISNODE, node);
1801 /* new_slab() disables interupts */
1802 local_irq_enable();
1803 1801
1804 BUG_ON(!page); 1802 BUG_ON(!page);
1805 n = page->freelist; 1803 n = page->freelist;
@@ -1811,6 +1809,12 @@ static struct kmem_cache_node * __init early_kmem_cache_node_alloc(gfp_t gfpflag
1811 init_kmem_cache_node(n); 1809 init_kmem_cache_node(n);
1812 atomic_long_inc(&n->nr_slabs); 1810 atomic_long_inc(&n->nr_slabs);
1813 add_partial(n, page); 1811 add_partial(n, page);
1812
1813 /*
1814 * new_slab() disables interupts. If we do not reenable interrupts here
1815 * then bootup would continue with interrupts disabled.
1816 */
1817 local_irq_enable();
1814 return n; 1818 return n;
1815} 1819}
1816 1820
generated by cgit v1.2.2 (git 2.25.0) at 2025-12-30 21:52:35 -0500