Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ecab9ab2 authored by Paul Mackerras's avatar Paul Mackerras
Browse files

Merge branch 'for-2.6.26' of master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc into merge

parents 8d6bcd6e f17c6323

arch/powerpc/boot/dts/mpc8377_rdb.dts

+1 −7
Original line number Diff line number Diff line
@@ -164,12 +164,6 @@ 
				reg = <0x2>;

				device_type = "ethernet-phy";

			};

			phy3: ethernet-phy@3 {

				interrupt-parent = <&ipic>;

				interrupts = <18 0x8>;

				reg = <0x3>;

				device_type = "ethernet-phy";

			};

		};



		enet0: ethernet@24000 {
@@ -195,7 +189,7 @@ 
			interrupts = <35 0x8 36 0x8 37 0x8>;

			phy-connection-type = "mii";

			interrupt-parent = <&ipic>;

			phy-handle = <&phy3>;

			fixed-link = <1 1 1000 0 0>;

		};



		serial0: serial@4500 {

arch/powerpc/boot/dts/mpc8378_rdb.dts

+1 −7
Original line number Diff line number Diff line
@@ -164,12 +164,6 @@ 
				reg = <0x2>;

				device_type = "ethernet-phy";

			};

			phy3: ethernet-phy@3 {

				interrupt-parent = <&ipic>;

				interrupts = <18 0x8>;

				reg = <0x3>;

				device_type = "ethernet-phy";

			};

		};



		enet0: ethernet@24000 {
@@ -195,7 +189,7 @@ 
			interrupts = <35 0x8 36 0x8 37 0x8>;

			phy-connection-type = "mii";

			interrupt-parent = <&ipic>;

			phy-handle = <&phy3>;

			fixed-link = <1 1 1000 0 0>;

		};



		serial0: serial@4500 {

arch/powerpc/boot/dts/mpc8379_rdb.dts

+1 −7
Original line number Diff line number Diff line
@@ -164,12 +164,6 @@ 
				reg = <0x2>;

				device_type = "ethernet-phy";

			};

			phy3: ethernet-phy@3 {

				interrupt-parent = <&ipic>;

				interrupts = <18 0x8>;

				reg = <0x3>;

				device_type = "ethernet-phy";

			};

		};



		enet0: ethernet@24000 {
@@ -195,7 +189,7 @@ 
			interrupts = <35 0x8 36 0x8 37 0x8>;

			phy-connection-type = "mii";

			interrupt-parent = <&ipic>;

			phy-handle = <&phy3>;

			fixed-link = <1 1 1000 0 0>;

		};



		serial0: serial@4500 {

arch/powerpc/boot/dts/mpc8548cds.dts

+2 −2
Original line number Diff line number Diff line
@@ -409,7 +409,7 @@ 
		interrupts = <26 2>;

		bus-range = <0 255>;

		ranges = <0x2000000 0x0 0xa0000000 0xa0000000 0x0 0x20000000

			  0x1000000 0x0 0x0 0xe3000000 0x0 0x8000000>;

			  0x1000000 0x0 0x0 0xe3000000 0x0 0x100000>;

		clock-frequency = <33333333>;

		#interrupt-cells = <1>;

		#size-cells = <2>;
@@ -428,7 +428,7 @@ 


				  0x1000000 0x0 0x0

				  0x1000000 0x0 0x0

				  0x0 0x8000000>;

				  0x0 0x100000>;

		};

	};

};

arch/powerpc/configs/83xx/mpc8313_rdb_defconfig

+101 −54
Original line number Diff line number Diff line 
#

# Automatically generated make config: don't edit

# Linux kernel version: 2.6.25-rc6

# Fri Apr 11 11:10:09 2008

# Linux kernel version: 2.6.26-rc5

# Mon Jun  9 08:52:21 2008

#

# CONFIG_PPC64 is not set
@@ -31,6 +31,8 @@ CONFIG_GENERIC_CLOCKEVENTS=y 
CONFIG_GENERIC_HARDIRQS=y

# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set

CONFIG_IRQ_PER_CPU=y

CONFIG_STACKTRACE_SUPPORT=y

CONFIG_LOCKDEP_SUPPORT=y

CONFIG_RWSEM_XCHGADD_ALGORITHM=y

CONFIG_ARCH_HAS_ILOG2_U32=y

CONFIG_GENERIC_HWEIGHT=y
@@ -86,6 +88,7 @@ CONFIG_INITRAMFS_SOURCE="" 
CONFIG_SYSCTL=y

CONFIG_EMBEDDED=y

CONFIG_SYSCTL_SYSCALL=y

CONFIG_SYSCTL_SYSCALL_CHECK=y

# CONFIG_KALLSYMS is not set

CONFIG_HOTPLUG=y

CONFIG_PRINTK=y
@@ -110,12 +113,14 @@ CONFIG_SLUB=y 
CONFIG_HAVE_OPROFILE=y

CONFIG_HAVE_KPROBES=y

CONFIG_HAVE_KRETPROBES=y

# CONFIG_HAVE_DMA_ATTRS is not set

CONFIG_PROC_PAGE_MONITOR=y

CONFIG_SLABINFO=y

CONFIG_RT_MUTEXES=y

# CONFIG_TINY_SHMEM is not set

CONFIG_BASE_SMALL=0

CONFIG_MODULES=y

# CONFIG_MODULE_FORCE_LOAD is not set

CONFIG_MODULE_UNLOAD=y

# CONFIG_MODULE_FORCE_UNLOAD is not set

# CONFIG_MODVERSIONS is not set
@@ -196,7 +201,6 @@ CONFIG_PREEMPT_NONE=y 
# CONFIG_PREEMPT is not set

CONFIG_BINFMT_ELF=y

# CONFIG_BINFMT_MISC is not set

CONFIG_FORCE_MAX_ZONEORDER=11

# CONFIG_IOMMU_HELPER is not set

CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y

CONFIG_ARCH_HAS_WALK_MEMORY=y
@@ -211,11 +215,13 @@ CONFIG_FLATMEM=y 
CONFIG_FLAT_NODE_MEM_MAP=y

# CONFIG_SPARSEMEM_STATIC is not set

# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set

CONFIG_PAGEFLAGS_EXTENDED=y

CONFIG_SPLIT_PTLOCK_CPUS=4

# CONFIG_RESOURCES_64BIT is not set

CONFIG_ZONE_DMA_FLAG=1

CONFIG_BOUNCE=y

CONFIG_VIRT_TO_BUS=y

CONFIG_FORCE_MAX_ZONEORDER=11

CONFIG_PROC_DEVICETREE=y

# CONFIG_CMDLINE_BOOL is not set

# CONFIG_PM is not set
@@ -239,6 +245,7 @@ CONFIG_PCI_LEGACY=y 
# CONFIG_PCI_DEBUG is not set

# CONFIG_PCCARD is not set

# CONFIG_HOTPLUG_PCI is not set

# CONFIG_HAS_RAPIDIO is not set



#

# Advanced setup
@@ -248,11 +255,11 @@ CONFIG_PCI_LEGACY=y 
#

# Default settings for advanced configuration options are used

#

CONFIG_HIGHMEM_START=0xfe000000

CONFIG_LOWMEM_SIZE=0x30000000

CONFIG_PAGE_OFFSET=0xc0000000

CONFIG_KERNEL_START=0xc0000000

CONFIG_PHYSICAL_START=0x00000000

CONFIG_TASK_SIZE=0xc0000000

CONFIG_BOOT_LOAD=0x00800000



#

# Networking
@@ -300,8 +307,6 @@ CONFIG_TCP_CONG_CUBIC=y 
CONFIG_DEFAULT_TCP_CONG="cubic"

# CONFIG_TCP_MD5SIG is not set

# CONFIG_IPV6 is not set

# CONFIG_INET6_XFRM_TUNNEL is not set

# CONFIG_INET6_TUNNEL is not set

# CONFIG_NETWORK_SECMARK is not set

# CONFIG_NETFILTER is not set

# CONFIG_IP_DCCP is not set
@@ -362,6 +367,7 @@ CONFIG_MTD_PARTITIONS=y 
# CONFIG_MTD_REDBOOT_PARTS is not set

# CONFIG_MTD_CMDLINE_PARTS is not set

CONFIG_MTD_OF_PARTS=y

# CONFIG_MTD_AR7_PARTS is not set



#

# User Modules And Translation Layers
@@ -445,6 +451,7 @@ CONFIG_MTD_NAND_FSL_ELBC=y 
#

# CONFIG_MTD_UBI is not set

CONFIG_OF_DEVICE=y

CONFIG_OF_I2C=y

# CONFIG_PARPORT is not set

CONFIG_BLK_DEV=y

# CONFIG_BLK_DEV_FD is not set
@@ -641,7 +648,6 @@ CONFIG_NETDEV_1000=y 
# CONFIG_SIS190 is not set

# CONFIG_SKGE is not set

# CONFIG_SKY2 is not set

# CONFIG_SK98LIN is not set

# CONFIG_VIA_VELOCITY is not set

# CONFIG_TIGON3 is not set

# CONFIG_BNX2 is not set
@@ -661,6 +667,7 @@ CONFIG_NETDEV_10000=y 
# CONFIG_MLX4_CORE is not set

# CONFIG_TEHUTI is not set

# CONFIG_BNX2X is not set

# CONFIG_SFC is not set

# CONFIG_TR is not set



#
@@ -668,6 +675,7 @@ CONFIG_NETDEV_10000=y 
#

# CONFIG_WLAN_PRE80211 is not set

# CONFIG_WLAN_80211 is not set

# CONFIG_IWLWIFI_LEDS is not set



#

# USB Network Adapters
@@ -724,6 +732,7 @@ CONFIG_INPUT=y 
# Character devices

#

# CONFIG_VT is not set

CONFIG_DEVKMEM=y

# CONFIG_SERIAL_NONSTANDARD is not set

# CONFIG_NOZOMI is not set
@@ -751,7 +760,6 @@ CONFIG_LEGACY_PTY_COUNT=256 
# CONFIG_IPMI_HANDLER is not set

CONFIG_HW_RANDOM=y

# CONFIG_NVRAM is not set

# CONFIG_GEN_RTC is not set

# CONFIG_R3964 is not set

# CONFIG_APPLICOM is not set

# CONFIG_RAW_DRIVER is not set
@@ -761,13 +769,6 @@ CONFIG_I2C=y 
CONFIG_I2C_BOARDINFO=y

CONFIG_I2C_CHARDEV=y



#

# I2C Algorithms

#

# CONFIG_I2C_ALGOBIT is not set

# CONFIG_I2C_ALGOPCF is not set

# CONFIG_I2C_ALGOPCA is not set



#

# I2C Hardware Bus support

#
@@ -795,6 +796,7 @@ CONFIG_I2C_MPC=y 
# CONFIG_I2C_VIA is not set

# CONFIG_I2C_VIAPRO is not set

# CONFIG_I2C_VOODOO3 is not set

# CONFIG_I2C_PCA_PLATFORM is not set



#

# Miscellaneous I2C Chip support
@@ -804,17 +806,12 @@ CONFIG_I2C_MPC=y 
# CONFIG_SENSORS_PCF8574 is not set

# CONFIG_PCF8575 is not set

# CONFIG_SENSORS_PCF8591 is not set

# CONFIG_TPS65010 is not set

# CONFIG_SENSORS_MAX6875 is not set

# CONFIG_SENSORS_TSL2550 is not set

# CONFIG_I2C_DEBUG_CORE is not set

# CONFIG_I2C_DEBUG_ALGO is not set

# CONFIG_I2C_DEBUG_BUS is not set

# CONFIG_I2C_DEBUG_CHIP is not set



#

# SPI support

#

CONFIG_SPI=y

# CONFIG_SPI_DEBUG is not set

CONFIG_SPI_MASTER=y
@@ -919,12 +916,22 @@ CONFIG_SSB_POSSIBLE=y 
# Multifunction device drivers

#

# CONFIG_MFD_SM501 is not set

# CONFIG_HTC_PASIC3 is not set



#

# Multimedia devices

#



#

# Multimedia core support

#

# CONFIG_VIDEO_DEV is not set

# CONFIG_DVB_CORE is not set

# CONFIG_VIDEO_MEDIA is not set



#

# Multimedia drivers

#

CONFIG_DAB=y

# CONFIG_USB_DABUSB is not set
@@ -977,16 +984,20 @@ CONFIG_USB_DEVICEFS=y 
CONFIG_USB_DEVICE_CLASS=y

# CONFIG_USB_DYNAMIC_MINORS is not set

# CONFIG_USB_OTG is not set

# CONFIG_USB_OTG_WHITELIST is not set

# CONFIG_USB_OTG_BLACKLIST_HUB is not set



#

# USB Host Controller Drivers

#

# CONFIG_USB_C67X00_HCD is not set

CONFIG_USB_EHCI_HCD=y

CONFIG_USB_EHCI_ROOT_HUB_TT=y

# CONFIG_USB_EHCI_TT_NEWSCHED is not set

CONFIG_USB_EHCI_FSL=y

CONFIG_USB_EHCI_HCD_PPC_OF=y

# CONFIG_USB_ISP116X_HCD is not set

# CONFIG_USB_ISP1760_HCD is not set

CONFIG_USB_OHCI_HCD=y

CONFIG_USB_OHCI_HCD_PPC_OF=y

CONFIG_USB_OHCI_HCD_PPC_OF_BE=y
@@ -1004,6 +1015,7 @@ CONFIG_USB_UHCI_HCD=y 
#

# CONFIG_USB_ACM is not set

# CONFIG_USB_PRINTER is not set

# CONFIG_USB_WDM is not set



#

# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
@@ -1023,7 +1035,9 @@ CONFIG_USB_STORAGE=y 
# CONFIG_USB_STORAGE_SDDR55 is not set

# CONFIG_USB_STORAGE_JUMPSHOT is not set

# CONFIG_USB_STORAGE_ALAUDA is not set

# CONFIG_USB_STORAGE_ONETOUCH is not set

# CONFIG_USB_STORAGE_KARMA is not set

# CONFIG_USB_STORAGE_CYPRESS_ATACB is not set

# CONFIG_USB_LIBUSUAL is not set



#
@@ -1061,6 +1075,7 @@ CONFIG_USB_MON=y 
# CONFIG_USB_TRANCEVIBRATOR is not set

# CONFIG_USB_IOWARRIOR is not set

# CONFIG_USB_TEST is not set

# CONFIG_USB_ISIGHTFW is not set

CONFIG_USB_GADGET=y

# CONFIG_USB_GADGET_DEBUG is not set

# CONFIG_USB_GADGET_DEBUG_FILES is not set
@@ -1072,6 +1087,7 @@ CONFIG_USB_GADGET_NET2280=y 
CONFIG_USB_NET2280=y

# CONFIG_USB_GADGET_PXA2XX is not set

# CONFIG_USB_GADGET_M66592 is not set

# CONFIG_USB_GADGET_PXA27X is not set

# CONFIG_USB_GADGET_GOKU is not set

# CONFIG_USB_GADGET_LH7A40X is not set

# CONFIG_USB_GADGET_OMAP is not set
@@ -1090,6 +1106,7 @@ CONFIG_USB_ETH_RNDIS=y 
# CONFIG_MMC is not set

# CONFIG_MEMSTICK is not set

# CONFIG_NEW_LEDS is not set

# CONFIG_ACCESSIBILITY is not set

# CONFIG_INFINIBAND is not set

# CONFIG_EDAC is not set

CONFIG_RTC_LIB=y
@@ -1144,11 +1161,8 @@ CONFIG_RTC_DRV_DS1307=y 
#

# on-CPU RTC drivers

#

# CONFIG_RTC_DRV_PPC is not set

# CONFIG_DMADEVICES is not set



#

# Userspace I/O

#

# CONFIG_UIO is not set



#
@@ -1168,7 +1182,6 @@ CONFIG_FS_MBCACHE=y 
# CONFIG_JFS_FS is not set

# CONFIG_FS_POSIX_ACL is not set

# CONFIG_XFS_FS is not set

# CONFIG_GFS2_FS is not set

# CONFIG_OCFS2_FS is not set

CONFIG_DNOTIFY=y

CONFIG_INOTIFY=y
@@ -1237,7 +1250,6 @@ CONFIG_NFS_FS=y 
CONFIG_NFS_V3=y

# CONFIG_NFS_V3_ACL is not set

CONFIG_NFS_V4=y

# CONFIG_NFS_DIRECTIO is not set

# CONFIG_NFSD is not set

CONFIG_ROOT_NFS=y

CONFIG_LOCKD=y
@@ -1282,6 +1294,7 @@ CONFIG_MSDOS_PARTITION=y 
# Library routines

#

CONFIG_BITREVERSE=y

# CONFIG_GENERIC_FIND_FIRST_BIT is not set

# CONFIG_CRC_CCITT is not set

# CONFIG_CRC16 is not set

# CONFIG_CRC_ITU_T is not set
@@ -1302,6 +1315,7 @@ CONFIG_HAVE_LMB=y 
# CONFIG_PRINTK_TIME is not set

CONFIG_ENABLE_WARN_DEPRECATED=y

CONFIG_ENABLE_MUST_CHECK=y

CONFIG_FRAME_WARN=1024

# CONFIG_MAGIC_SYSRQ is not set

# CONFIG_UNUSED_SYMBOLS is not set

# CONFIG_DEBUG_FS is not set
@@ -1312,6 +1326,7 @@ CONFIG_DETECT_SOFTLOCKUP=y 
CONFIG_SCHED_DEBUG=y

# CONFIG_SCHEDSTATS is not set

# CONFIG_TIMER_STATS is not set

# CONFIG_DEBUG_OBJECTS is not set

# CONFIG_SLUB_DEBUG_ON is not set

# CONFIG_SLUB_STATS is not set

# CONFIG_DEBUG_RT_MUTEXES is not set
@@ -1324,6 +1339,7 @@ CONFIG_SCHED_DEBUG=y 
# CONFIG_DEBUG_BUGVERBOSE is not set

# CONFIG_DEBUG_INFO is not set

# CONFIG_DEBUG_VM is not set

# CONFIG_DEBUG_WRITECOUNT is not set

# CONFIG_DEBUG_LIST is not set

# CONFIG_DEBUG_SG is not set

# CONFIG_BOOT_PRINTK_DELAY is not set
@@ -1335,6 +1351,7 @@ CONFIG_SCHED_DEBUG=y 
# CONFIG_DEBUG_STACK_USAGE is not set

# CONFIG_DEBUG_PAGEALLOC is not set

# CONFIG_DEBUGGER is not set

# CONFIG_IRQSTACKS is not set

# CONFIG_BDI_SWITCH is not set

# CONFIG_PPC_EARLY_DEBUG is not set
@@ -1345,51 +1362,81 @@ CONFIG_SCHED_DEBUG=y 
# CONFIG_SECURITY is not set

# CONFIG_SECURITY_FILE_CAPABILITIES is not set

CONFIG_CRYPTO=y



#

# Crypto core or helper

#

CONFIG_CRYPTO_ALGAPI=y

CONFIG_CRYPTO_BLKCIPHER=y

# CONFIG_CRYPTO_SEQIV is not set

CONFIG_CRYPTO_MANAGER=y

# CONFIG_CRYPTO_GF128MUL is not set

# CONFIG_CRYPTO_NULL is not set

# CONFIG_CRYPTO_CRYPTD is not set

# CONFIG_CRYPTO_AUTHENC is not set

# CONFIG_CRYPTO_TEST is not set



#

# Authenticated Encryption with Associated Data

#

# CONFIG_CRYPTO_CCM is not set

# CONFIG_CRYPTO_GCM is not set

# CONFIG_CRYPTO_SEQIV is not set



#

# Block modes

#

CONFIG_CRYPTO_CBC=y

# CONFIG_CRYPTO_CTR is not set

# CONFIG_CRYPTO_CTS is not set

# CONFIG_CRYPTO_ECB is not set

# CONFIG_CRYPTO_LRW is not set

CONFIG_CRYPTO_PCBC=m

# CONFIG_CRYPTO_XTS is not set



#

# Hash modes

#

# CONFIG_CRYPTO_HMAC is not set

# CONFIG_CRYPTO_XCBC is not set

# CONFIG_CRYPTO_NULL is not set



#

# Digest

#

# CONFIG_CRYPTO_CRC32C is not set

# CONFIG_CRYPTO_MD4 is not set

CONFIG_CRYPTO_MD5=y

# CONFIG_CRYPTO_MICHAEL_MIC is not set

# CONFIG_CRYPTO_SHA1 is not set

# CONFIG_CRYPTO_SHA256 is not set

# CONFIG_CRYPTO_SHA512 is not set

# CONFIG_CRYPTO_WP512 is not set

# CONFIG_CRYPTO_TGR192 is not set

# CONFIG_CRYPTO_GF128MUL is not set

# CONFIG_CRYPTO_ECB is not set

CONFIG_CRYPTO_CBC=y

CONFIG_CRYPTO_PCBC=m

# CONFIG_CRYPTO_LRW is not set

# CONFIG_CRYPTO_XTS is not set

# CONFIG_CRYPTO_CTR is not set

# CONFIG_CRYPTO_GCM is not set

# CONFIG_CRYPTO_CCM is not set

# CONFIG_CRYPTO_CRYPTD is not set

CONFIG_CRYPTO_DES=y

# CONFIG_CRYPTO_FCRYPT is not set

# CONFIG_CRYPTO_BLOWFISH is not set

# CONFIG_CRYPTO_TWOFISH is not set

# CONFIG_CRYPTO_SERPENT is not set

# CONFIG_CRYPTO_WP512 is not set



#

# Ciphers

#

# CONFIG_CRYPTO_AES is not set

# CONFIG_CRYPTO_ANUBIS is not set

# CONFIG_CRYPTO_ARC4 is not set

# CONFIG_CRYPTO_BLOWFISH is not set

# CONFIG_CRYPTO_CAMELLIA is not set

# CONFIG_CRYPTO_CAST5 is not set

# CONFIG_CRYPTO_CAST6 is not set

# CONFIG_CRYPTO_TEA is not set

# CONFIG_CRYPTO_ARC4 is not set

CONFIG_CRYPTO_DES=y

# CONFIG_CRYPTO_FCRYPT is not set

# CONFIG_CRYPTO_KHAZAD is not set

# CONFIG_CRYPTO_ANUBIS is not set

# CONFIG_CRYPTO_SEED is not set

# CONFIG_CRYPTO_SALSA20 is not set

# CONFIG_CRYPTO_SEED is not set

# CONFIG_CRYPTO_SERPENT is not set

# CONFIG_CRYPTO_TEA is not set

# CONFIG_CRYPTO_TWOFISH is not set



#

# Compression

#

# CONFIG_CRYPTO_DEFLATE is not set

# CONFIG_CRYPTO_MICHAEL_MIC is not set

# CONFIG_CRYPTO_CRC32C is not set

# CONFIG_CRYPTO_CAMELLIA is not set

# CONFIG_CRYPTO_TEST is not set

# CONFIG_CRYPTO_AUTHENC is not set

# CONFIG_CRYPTO_LZO is not set

CONFIG_CRYPTO_HW=y

# CONFIG_CRYPTO_DEV_HIFN_795X is not set

# CONFIG_PPC_CLOCK is not set

# CONFIG_VIRTUALIZATION is not set