Merge branch 'pnx4008-removal' of git://git.antcom.de/linux-2.6 into next/cleanup

	  family of Femtocell devices.  The picoxcell support requires device tree

	  for all boards.

config ARCH_PNX4008

	bool "Philips Nexperia PNX4008 Mobile"

	select CPU_ARM926T

	select CLKDEV_LOOKUP

	select ARCH_USES_GETTIMEOFFSET

	help

	  This enables support for Philips PNX4008 mobile platform.

config ARCH_PXA

	bool "PXA2xx/PXA3xx-based"

	depends on MMU

machine-$(CONFIG_ARCH_OMAP2PLUS)	:= omap2

machine-$(CONFIG_ARCH_ORION5X)		:= orion5x

machine-$(CONFIG_ARCH_PICOXCELL)	:= picoxcell

machine-$(CONFIG_ARCH_PNX4008)		:= pnx4008

machine-$(CONFIG_ARCH_PRIMA2)		:= prima2

machine-$(CONFIG_ARCH_PXA)		:= pxa

machine-$(CONFIG_ARCH_REALVIEW)		:= realview

CONFIG_EXPERIMENTAL=y

CONFIG_SYSVIPC=y

CONFIG_POSIX_MQUEUE=y

CONFIG_BSD_PROCESS_ACCT=y

CONFIG_AUDIT=y

CONFIG_LOG_BUF_SHIFT=14

CONFIG_BLK_DEV_INITRD=y

CONFIG_EXPERT=y

CONFIG_SLAB=y

CONFIG_MODULES=y

CONFIG_MODULE_UNLOAD=y

CONFIG_MODULE_FORCE_UNLOAD=y

CONFIG_MODVERSIONS=y

CONFIG_MODULE_SRCVERSION_ALL=y

CONFIG_ARCH_PNX4008=y

CONFIG_PREEMPT=y

CONFIG_ZBOOT_ROM_TEXT=0x0

CONFIG_ZBOOT_ROM_BSS=0x0

CONFIG_CMDLINE="mem=64M console=ttyS0,115200"

CONFIG_FPE_NWFPE=y

CONFIG_BINFMT_AOUT=m

CONFIG_BINFMT_MISC=m

CONFIG_PM=y

CONFIG_PACKET=y

CONFIG_UNIX=y

CONFIG_INET=y

CONFIG_IP_MULTICAST=y

CONFIG_IP_ADVANCED_ROUTER=y

CONFIG_IP_MULTIPLE_TABLES=y

CONFIG_IP_ROUTE_MULTIPATH=y

CONFIG_IP_ROUTE_VERBOSE=y

CONFIG_IP_PNP=y

CONFIG_IP_PNP_DHCP=y

CONFIG_IP_PNP_BOOTP=y

CONFIG_IP_MROUTE=y

CONFIG_IP_PIMSM_V1=y

CONFIG_IP_PIMSM_V2=y

CONFIG_SYN_COOKIES=y

CONFIG_INET_AH=m

CONFIG_INET_ESP=m

CONFIG_INET_IPCOMP=m

CONFIG_IPV6_PRIVACY=y

CONFIG_INET6_AH=m

CONFIG_INET6_ESP=m

CONFIG_INET6_IPCOMP=m

CONFIG_IPV6_TUNNEL=m

CONFIG_NETFILTER=y

CONFIG_IP_VS=m

CONFIG_IP_VS_PROTO_TCP=y

CONFIG_IP_VS_PROTO_UDP=y

CONFIG_IP_VS_PROTO_ESP=y

CONFIG_IP_VS_PROTO_AH=y

CONFIG_IP_VS_RR=m

CONFIG_IP_VS_WRR=m

CONFIG_IP_VS_LC=m

CONFIG_IP_VS_WLC=m

CONFIG_IP_VS_LBLC=m

CONFIG_IP_VS_LBLCR=m

CONFIG_IP_VS_DH=m

CONFIG_IP_VS_SH=m

CONFIG_IP_VS_SED=m

CONFIG_IP_VS_NQ=m

CONFIG_IP_VS_FTP=m

CONFIG_IP_NF_QUEUE=m

CONFIG_IP6_NF_QUEUE=m

CONFIG_DECNET_NF_GRABULATOR=m

CONFIG_BRIDGE_NF_EBTABLES=m

CONFIG_BRIDGE_EBT_BROUTE=m

CONFIG_BRIDGE_EBT_T_FILTER=m

CONFIG_BRIDGE_EBT_T_NAT=m

CONFIG_BRIDGE_EBT_802_3=m

CONFIG_BRIDGE_EBT_AMONG=m

CONFIG_BRIDGE_EBT_ARP=m

CONFIG_BRIDGE_EBT_IP=m

CONFIG_BRIDGE_EBT_LIMIT=m

CONFIG_BRIDGE_EBT_MARK=m

CONFIG_BRIDGE_EBT_PKTTYPE=m

CONFIG_BRIDGE_EBT_STP=m

CONFIG_BRIDGE_EBT_VLAN=m

CONFIG_BRIDGE_EBT_ARPREPLY=m

CONFIG_BRIDGE_EBT_DNAT=m

CONFIG_BRIDGE_EBT_MARK_T=m

CONFIG_BRIDGE_EBT_REDIRECT=m

CONFIG_BRIDGE_EBT_SNAT=m

CONFIG_BRIDGE_EBT_LOG=m

CONFIG_IP_SCTP=m

CONFIG_ATM=y

CONFIG_ATM_CLIP=y

CONFIG_ATM_LANE=m

CONFIG_ATM_MPOA=m

CONFIG_ATM_BR2684=m

CONFIG_BRIDGE=m

CONFIG_VLAN_8021Q=m

CONFIG_DECNET=m

CONFIG_LLC2=m

CONFIG_IPX=m

CONFIG_ATALK=m

CONFIG_DEV_APPLETALK=m

CONFIG_IPDDP=m

CONFIG_IPDDP_ENCAP=y

CONFIG_IPDDP_DECAP=y

CONFIG_X25=m

CONFIG_LAPB=m

CONFIG_ECONET=m

CONFIG_ECONET_AUNUDP=y

CONFIG_ECONET_NATIVE=y

CONFIG_WAN_ROUTER=m

CONFIG_NET_SCHED=y

CONFIG_NET_SCH_CBQ=m

CONFIG_NET_SCH_HTB=m

CONFIG_NET_SCH_HFSC=m

CONFIG_NET_SCH_ATM=m

CONFIG_NET_SCH_PRIO=m

CONFIG_NET_SCH_RED=m

CONFIG_NET_SCH_SFQ=m

CONFIG_NET_SCH_TEQL=m

CONFIG_NET_SCH_TBF=m

CONFIG_NET_SCH_GRED=m

CONFIG_NET_SCH_DSMARK=m

CONFIG_NET_SCH_NETEM=m

CONFIG_NET_CLS_TCINDEX=m

CONFIG_NET_CLS_ROUTE4=m

CONFIG_NET_CLS_FW=m

CONFIG_NET_CLS_U32=m

CONFIG_NET_CLS_RSVP=m

CONFIG_NET_CLS_RSVP6=m

CONFIG_NET_PKTGEN=m

CONFIG_MTD=y

CONFIG_MTD_CONCAT=y

CONFIG_MTD_PARTITIONS=y

CONFIG_MTD_REDBOOT_PARTS=y

CONFIG_MTD_CHAR=y

CONFIG_MTD_BLOCK=y

CONFIG_MTD_SLRAM=m

CONFIG_MTD_PHRAM=m

CONFIG_MTD_MTDRAM=m

CONFIG_MTD_DOC2000=m

CONFIG_MTD_DOC2001=m

CONFIG_MTD_DOC2001PLUS=m

CONFIG_MTD_NAND=y

CONFIG_MTD_NAND_NANDSIM=m

CONFIG_BLK_DEV_LOOP=y

CONFIG_BLK_DEV_CRYPTOLOOP=y

CONFIG_BLK_DEV_NBD=y

CONFIG_BLK_DEV_RAM=y

CONFIG_BLK_DEV_RAM_SIZE=8192

CONFIG_CDROM_PKTCDVD=m

CONFIG_EEPROM_LEGACY=m

CONFIG_SCSI=m

CONFIG_BLK_DEV_SD=m

CONFIG_CHR_DEV_ST=m

CONFIG_CHR_DEV_OSST=m

CONFIG_BLK_DEV_SR=m

CONFIG_CHR_DEV_SG=m

CONFIG_CHR_DEV_SCH=m

CONFIG_SCSI_MULTI_LUN=y

CONFIG_SCSI_CONSTANTS=y

CONFIG_SCSI_LOGGING=y

CONFIG_SCSI_SPI_ATTRS=m

CONFIG_SCSI_FC_ATTRS=m

CONFIG_SCSI_DEBUG=m

CONFIG_NETDEVICES=y

CONFIG_DUMMY=m

CONFIG_BONDING=m

CONFIG_EQUALIZER=m

CONFIG_TUN=m

CONFIG_NET_ETHERNET=y

CONFIG_USB_CATC=m

CONFIG_USB_KAWETH=m

CONFIG_USB_PEGASUS=m

CONFIG_USB_RTL8150=m

CONFIG_USB_USBNET=m

# CONFIG_USB_NET_CDC_SUBSET is not set

CONFIG_WAN=y

CONFIG_HDLC=m

CONFIG_HDLC_RAW=m

CONFIG_HDLC_RAW_ETH=m

CONFIG_HDLC_CISCO=m

CONFIG_HDLC_FR=m

CONFIG_HDLC_PPP=m

CONFIG_HDLC_X25=m

CONFIG_DLCI=m

CONFIG_WAN_ROUTER_DRIVERS=m

CONFIG_LAPBETHER=m

CONFIG_X25_ASY=m

CONFIG_ATM_TCP=m

CONFIG_PPP=m

CONFIG_PPP_MULTILINK=y

CONFIG_PPP_FILTER=y

CONFIG_PPP_ASYNC=m

CONFIG_PPP_SYNC_TTY=m

CONFIG_PPP_DEFLATE=m

CONFIG_PPP_BSDCOMP=m

CONFIG_PPP_MPPE=m

CONFIG_PPPOE=m

CONFIG_PPPOATM=m

CONFIG_SLIP=m

CONFIG_SLIP_COMPRESSED=y

CONFIG_SLIP_SMART=y

CONFIG_SLIP_MODE_SLIP6=y

CONFIG_NETCONSOLE=m

# CONFIG_INPUT_MOUSEDEV is not set

CONFIG_INPUT_JOYDEV=m

CONFIG_INPUT_EVDEV=m

CONFIG_INPUT_EVBUG=m

CONFIG_KEYBOARD_LKKBD=m

CONFIG_KEYBOARD_NEWTON=m

CONFIG_KEYBOARD_SUNKBD=m

CONFIG_KEYBOARD_XTKBD=m

CONFIG_MOUSE_PS2=m

CONFIG_MOUSE_SERIAL=m

CONFIG_MOUSE_VSXXXAA=m

CONFIG_INPUT_JOYSTICK=y

CONFIG_JOYSTICK_ANALOG=m

CONFIG_JOYSTICK_A3D=m

CONFIG_JOYSTICK_ADI=m

CONFIG_JOYSTICK_COBRA=m

CONFIG_JOYSTICK_GF2K=m

CONFIG_JOYSTICK_GRIP=m

CONFIG_JOYSTICK_GRIP_MP=m

CONFIG_JOYSTICK_GUILLEMOT=m

CONFIG_JOYSTICK_INTERACT=m

CONFIG_JOYSTICK_SIDEWINDER=m

CONFIG_JOYSTICK_TMDC=m

CONFIG_JOYSTICK_IFORCE=m

CONFIG_JOYSTICK_IFORCE_USB=y

CONFIG_JOYSTICK_IFORCE_232=y

CONFIG_JOYSTICK_WARRIOR=m

CONFIG_JOYSTICK_MAGELLAN=m

CONFIG_JOYSTICK_SPACEORB=m

CONFIG_JOYSTICK_SPACEBALL=m

CONFIG_JOYSTICK_STINGER=m

CONFIG_JOYSTICK_JOYDUMP=m

CONFIG_INPUT_TOUCHSCREEN=y

CONFIG_TOUCHSCREEN_GUNZE=m

CONFIG_INPUT_MISC=y

CONFIG_INPUT_UINPUT=m

CONFIG_SERIO_SERPORT=m

CONFIG_SERIO_RAW=m

CONFIG_GAMEPORT_NS558=m

CONFIG_GAMEPORT_L4=m

CONFIG_SERIAL_8250=y

CONFIG_SERIAL_8250_CONSOLE=y

CONFIG_SERIAL_8250_EXTENDED=y

CONFIG_SERIAL_8250_MANY_PORTS=y

CONFIG_SERIAL_8250_SHARE_IRQ=y

CONFIG_SERIAL_8250_RSA=y

CONFIG_HW_RANDOM=y

CONFIG_I2C=y

CONFIG_I2C_CHARDEV=y

CONFIG_SPI=y

CONFIG_SPI_BITBANG=y

# CONFIG_HWMON is not set

CONFIG_WATCHDOG=y

CONFIG_SOFT_WATCHDOG=m

CONFIG_USBPCWATCHDOG=m

# CONFIG_VGA_CONSOLE is not set

CONFIG_SOUND=m

CONFIG_SND=m

CONFIG_SND_SEQUENCER=m

CONFIG_SND_SEQ_DUMMY=m

CONFIG_SND_MIXER_OSS=m

CONFIG_SND_PCM_OSS=m

CONFIG_SND_SEQUENCER_OSS=y

CONFIG_SND_DUMMY=m

CONFIG_SND_VIRMIDI=m

CONFIG_SND_MTPAV=m

CONFIG_SND_SERIAL_U16550=m

CONFIG_SND_MPU401=m

CONFIG_SND_USB_AUDIO=m

CONFIG_SOUND_PRIME=m

CONFIG_USB_HID=m

CONFIG_USB_HIDDEV=y

CONFIG_USB_KBD=m

CONFIG_USB_MOUSE=m

CONFIG_USB=y

CONFIG_USB_DEVICEFS=y

CONFIG_USB_MON=y

CONFIG_USB_SL811_HCD=m

CONFIG_USB_ACM=m

CONFIG_USB_PRINTER=m

CONFIG_USB_STORAGE=m

CONFIG_USB_STORAGE_DATAFAB=m

CONFIG_USB_STORAGE_FREECOM=m

CONFIG_USB_STORAGE_USBAT=m

CONFIG_USB_STORAGE_SDDR09=m

CONFIG_USB_STORAGE_SDDR55=m

CONFIG_USB_STORAGE_JUMPSHOT=m

CONFIG_USB_MDC800=m

CONFIG_USB_MICROTEK=m

CONFIG_USB_SERIAL=m

CONFIG_USB_SERIAL_GENERIC=y

CONFIG_USB_SERIAL_BELKIN=m

CONFIG_USB_SERIAL_WHITEHEAT=m

CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m

CONFIG_USB_SERIAL_CYPRESS_M8=m

CONFIG_USB_SERIAL_EMPEG=m

CONFIG_USB_SERIAL_FTDI_SIO=m

CONFIG_USB_SERIAL_VISOR=m

CONFIG_USB_SERIAL_IPAQ=m

CONFIG_USB_SERIAL_IR=m

CONFIG_USB_SERIAL_EDGEPORT=m

CONFIG_USB_SERIAL_EDGEPORT_TI=m

CONFIG_USB_SERIAL_IPW=m

CONFIG_USB_SERIAL_KEYSPAN_PDA=m

CONFIG_USB_SERIAL_KEYSPAN=m

CONFIG_USB_SERIAL_KLSI=m

CONFIG_USB_SERIAL_KOBIL_SCT=m

CONFIG_USB_SERIAL_MCT_U232=m

CONFIG_USB_SERIAL_PL2303=m

CONFIG_USB_SERIAL_SAFE=m

CONFIG_USB_SERIAL_CYBERJACK=m

CONFIG_USB_SERIAL_XIRCOM=m

CONFIG_USB_SERIAL_OMNINET=m

CONFIG_USB_RIO500=m

CONFIG_USB_LEGOTOWER=m

CONFIG_USB_LCD=m

CONFIG_USB_LED=m

CONFIG_USB_CYTHERM=m

CONFIG_USB_TEST=m

CONFIG_USB_ATM=m

CONFIG_USB_SPEEDTOUCH=m

CONFIG_USB_GADGET=m

CONFIG_USB_GADGET_DUMMY_HCD=y

CONFIG_USB_ZERO=m

CONFIG_USB_ETH=m

CONFIG_USB_GADGETFS=m

CONFIG_USB_FILE_STORAGE=m

CONFIG_USB_G_SERIAL=m

CONFIG_MMC=m

CONFIG_EXT2_FS=y

CONFIG_EXT2_FS_XATTR=y

CONFIG_EXT2_FS_POSIX_ACL=y

CONFIG_EXT2_FS_SECURITY=y

CONFIG_EXT3_FS=m

CONFIG_EXT3_FS_POSIX_ACL=y

CONFIG_EXT3_FS_SECURITY=y

CONFIG_REISERFS_FS=m

CONFIG_REISERFS_FS_XATTR=y

CONFIG_REISERFS_FS_POSIX_ACL=y

CONFIG_REISERFS_FS_SECURITY=y

CONFIG_JFS_FS=m

CONFIG_JFS_POSIX_ACL=y

CONFIG_JFS_STATISTICS=y

CONFIG_XFS_FS=m

CONFIG_XFS_QUOTA=y

CONFIG_XFS_POSIX_ACL=y

CONFIG_XFS_RT=y

CONFIG_INOTIFY=y

CONFIG_QUOTA=y

CONFIG_QFMT_V1=m

CONFIG_QFMT_V2=m

CONFIG_AUTOFS_FS=m

CONFIG_AUTOFS4_FS=m

CONFIG_ISO9660_FS=m

CONFIG_JOLIET=y

CONFIG_ZISOFS=y

CONFIG_UDF_FS=m

CONFIG_MSDOS_FS=m

CONFIG_VFAT_FS=m

CONFIG_NTFS_FS=m

CONFIG_TMPFS=y

CONFIG_ADFS_FS=m

CONFIG_AFFS_FS=m

CONFIG_HFS_FS=m

CONFIG_HFSPLUS_FS=m

CONFIG_BEFS_FS=m

CONFIG_BFS_FS=m

CONFIG_EFS_FS=m

CONFIG_JFFS2_FS=m

CONFIG_CRAMFS=y

CONFIG_VXFS_FS=m

CONFIG_MINIX_FS=m

CONFIG_HPFS_FS=m

CONFIG_QNX4FS_FS=m

CONFIG_ROMFS_FS=m

CONFIG_SYSV_FS=m

CONFIG_UFS_FS=m

CONFIG_NFS_FS=y

CONFIG_NFS_V3=y

CONFIG_NFS_V4=y

CONFIG_ROOT_NFS=y

CONFIG_NFSD=m

CONFIG_NFSD_V4=y

CONFIG_RPCSEC_GSS_SPKM3=m

CONFIG_SMB_FS=m

CONFIG_CIFS=m

CONFIG_NCP_FS=m

CONFIG_NCPFS_PACKET_SIGNING=y

CONFIG_NCPFS_IOCTL_LOCKING=y

CONFIG_NCPFS_STRONG=y

CONFIG_NCPFS_NFS_NS=y

CONFIG_NCPFS_OS2_NS=y

CONFIG_NCPFS_NLS=y

CONFIG_NCPFS_EXTRAS=y

CONFIG_CODA_FS=m

CONFIG_AFS_FS=m

CONFIG_PARTITION_ADVANCED=y

CONFIG_ACORN_PARTITION=y

CONFIG_ACORN_PARTITION_ICS=y

CONFIG_ACORN_PARTITION_RISCIX=y

CONFIG_OSF_PARTITION=y

CONFIG_AMIGA_PARTITION=y

CONFIG_ATARI_PARTITION=y

CONFIG_MAC_PARTITION=y

CONFIG_BSD_DISKLABEL=y

CONFIG_MINIX_SUBPARTITION=y

CONFIG_SOLARIS_X86_PARTITION=y

CONFIG_UNIXWARE_DISKLABEL=y

CONFIG_LDM_PARTITION=y

CONFIG_SGI_PARTITION=y

CONFIG_ULTRIX_PARTITION=y

CONFIG_SUN_PARTITION=y

CONFIG_NLS_DEFAULT="cp437"

CONFIG_NLS_CODEPAGE_437=m

CONFIG_NLS_CODEPAGE_737=m

CONFIG_NLS_CODEPAGE_775=m

CONFIG_NLS_CODEPAGE_850=m

CONFIG_NLS_CODEPAGE_852=m

CONFIG_NLS_CODEPAGE_855=m

CONFIG_NLS_CODEPAGE_857=m

CONFIG_NLS_CODEPAGE_860=m

CONFIG_NLS_CODEPAGE_861=m

CONFIG_NLS_CODEPAGE_862=m

CONFIG_NLS_CODEPAGE_863=m

CONFIG_NLS_CODEPAGE_864=m

CONFIG_NLS_CODEPAGE_865=m

CONFIG_NLS_CODEPAGE_866=m

CONFIG_NLS_CODEPAGE_869=m

CONFIG_NLS_CODEPAGE_936=m

CONFIG_NLS_CODEPAGE_950=m

CONFIG_NLS_CODEPAGE_932=m

CONFIG_NLS_CODEPAGE_949=m

CONFIG_NLS_CODEPAGE_874=m

CONFIG_NLS_ISO8859_8=m

CONFIG_NLS_CODEPAGE_1250=m

CONFIG_NLS_CODEPAGE_1251=m

CONFIG_NLS_ASCII=m

CONFIG_NLS_ISO8859_1=m

CONFIG_NLS_ISO8859_2=m

CONFIG_NLS_ISO8859_3=m

CONFIG_NLS_ISO8859_4=m

CONFIG_NLS_ISO8859_5=m

CONFIG_NLS_ISO8859_6=m

CONFIG_NLS_ISO8859_7=m

CONFIG_NLS_ISO8859_9=m

CONFIG_NLS_ISO8859_13=m

CONFIG_NLS_ISO8859_14=m

CONFIG_NLS_ISO8859_15=m

CONFIG_NLS_KOI8_R=m

CONFIG_NLS_KOI8_U=m

CONFIG_MAGIC_SYSRQ=y

CONFIG_DEBUG_KERNEL=y

CONFIG_DEBUG_MUTEXES=y

# CONFIG_DEBUG_BUGVERBOSE is not set

CONFIG_SECURITY=y

CONFIG_CRYPTO_NULL=m

CONFIG_CRYPTO_TEST=m

CONFIG_CRYPTO_HMAC=y

CONFIG_CRYPTO_MD4=m

CONFIG_CRYPTO_MICHAEL_MIC=m

CONFIG_CRYPTO_SHA256=m

CONFIG_CRYPTO_SHA512=m

CONFIG_CRYPTO_WP512=m

CONFIG_CRYPTO_ANUBIS=m

CONFIG_CRYPTO_BLOWFISH=m

CONFIG_CRYPTO_CAST6=m

CONFIG_CRYPTO_KHAZAD=m

CONFIG_CRYPTO_SERPENT=m

CONFIG_CRYPTO_TEA=m

CONFIG_CRYPTO_TWOFISH=m

CONFIG_CRC16=m

#

# Makefile for the linux kernel.

#

obj-y			:= core.o irq.o time.o clock.o gpio.o serial.o dma.o i2c.o

obj-m			:=

obj-n			:=

obj-			:=

# Power Management

obj-$(CONFIG_PM) += pm.o sleep.o

   zreladdr-y		+= 0x80008000

params_phys-y		:= 0x80000100

initrd_phys-y		:= 0x80800000