[Hackndev-commit] SF.net SVN: hackndev: [1309] linux4palm/linux/branches/ cleanup-branch-never-commit

[<hap...@us...>]

Revision: 1309
          http://hackndev.svn.sourceforge.net/hackndev/?rev=1309&view=rev
Author:   happy-slapin
Date:     2007-09-13 10:27:38 -0700 (Thu, 13 Sep 2007)

Log Message:
-----------
Cleanup before hh.org merge

Modified Paths:
--------------
    linux4palm/linux/branches/cleanup-branch-never-commit/Documentation/filesystems/00-INDEX
    linux4palm/linux/branches/cleanup-branch-never-commit/MAINTAINERS
    linux4palm/linux/branches/cleanup-branch-never-commit/arch/arm/Kconfig
    linux4palm/linux/branches/cleanup-branch-never-commit/arch/arm/Makefile
    linux4palm/linux/branches/cleanup-branch-never-commit/arch/arm/configs/asus620_static_defconfig
    linux4palm/linux/branches/cleanup-branch-never-commit/arch/arm/configs/asus730_static_defconfig
    linux4palm/linux/branches/cleanup-branch-never-commit/arch/arm/configs/aximx50_static_defconfig
    linux4palm/linux/branches/cleanup-branch-never-commit/drivers/media/video/Kconfig
    linux4palm/linux/branches/cleanup-branch-never-commit/drivers/media/video/Makefile
    linux4palm/linux/branches/cleanup-branch-never-commit/fs/Kconfig
    linux4palm/linux/branches/cleanup-branch-never-commit/fs/Makefile

Removed Paths:
-------------
    linux4palm/linux/branches/cleanup-branch-never-commit/arch/arm/armboot/
    linux4palm/linux/branches/cleanup-branch-never-commit/drivers/media/video/ov96xx.c
    linux4palm/linux/branches/cleanup-branch-never-commit/drivers/media/video/ov96xx_hw.h
    linux4palm/linux/branches/cleanup-branch-never-commit/fs/squashfs/
    linux4palm/linux/branches/cleanup-branch-never-commit/fs/squashfs_lzma/
    linux4palm/linux/branches/cleanup-branch-never-commit/fs/unionfs/
    linux4palm/linux/branches/cleanup-branch-never-commit/include/media/ov96xx.h

Modified: linux4palm/linux/branches/cleanup-branch-never-commit/Documentation/filesystems/00-INDEX
===================================================================
--- linux4palm/linux/branches/cleanup-branch-never-commit/Documentation/filesystems/00-INDEX	2007-09-12 16:47:07 UTC (rev 1308)
+++ linux4palm/linux/branches/cleanup-branch-never-commit/Documentation/filesystems/00-INDEX	2007-09-13 17:27:38 UTC (rev 1309)
@@ -84,8 +84,6 @@
 	- info and mount options for the UDF filesystem.
 ufs.txt
 	- info on the ufs filesystem.
-unionfs/
-	- info on the unionfs filesystem
 vfat.txt
 	- info on using the VFAT filesystem used in Windows NT and Windows 95
 vfs.txt

Modified: linux4palm/linux/branches/cleanup-branch-never-commit/MAINTAINERS
===================================================================
--- linux4palm/linux/branches/cleanup-branch-never-commit/MAINTAINERS	2007-09-12 16:47:07 UTC (rev 1308)
+++ linux4palm/linux/branches/cleanup-branch-never-commit/MAINTAINERS	2007-09-13 17:27:38 UTC (rev 1309)
@@ -3375,13 +3375,6 @@
 W:	http://www.kernel.dk
 S:	Maintained
 
-UNIONFS
-P:	Josef "Jeff" Sipek
-M:	js...@cs...
-L:	un...@fi...
-W:	http://unionfs.filesystems.org/
-S:	Maintained
-
 USB ACM DRIVER
 P:	Oliver Neukum
 M:	ol...@ne...

Modified: linux4palm/linux/branches/cleanup-branch-never-commit/arch/arm/Kconfig
===================================================================
--- linux4palm/linux/branches/cleanup-branch-never-commit/arch/arm/Kconfig	2007-09-12 16:47:07 UTC (rev 1308)
+++ linux4palm/linux/branches/cleanup-branch-never-commit/arch/arm/Kconfig	2007-09-13 17:27:38 UTC (rev 1309)
@@ -460,8 +460,6 @@
 	  Enable support for iWMMXt context switching at run time if
 	  running on a CPU that supports it.
 
-source arch/arm/armboot/Kconfig
-
 #  bool 'Use XScale PMU as timer source' CONFIG_XSCALE_PMU_TIMER
 config XSCALE_PMU
 	bool

Modified: linux4palm/linux/branches/cleanup-branch-never-commit/arch/arm/Makefile
===================================================================
--- linux4palm/linux/branches/cleanup-branch-never-commit/arch/arm/Makefile	2007-09-12 16:47:07 UTC (rev 1308)
+++ linux4palm/linux/branches/cleanup-branch-never-commit/arch/arm/Makefile	2007-09-13 17:27:38 UTC (rev 1309)
@@ -166,7 +166,7 @@
 endif
 
 # If we have a machine-specific directory, then include it in the build.
-core-y				+= arch/arm/kernel/ arch/arm/mm/ arch/arm/common/ arch/arm/armboot/
+core-y				+= arch/arm/kernel/ arch/arm/mm/ arch/arm/common/
 core-y				+= $(MACHINE)
 core-$(CONFIG_ARCH_S3C2410)	+= arch/arm/mach-s3c2400/
 core-$(CONFIG_ARCH_S3C2410)	+= arch/arm/mach-s3c2412/

Modified: linux4palm/linux/branches/cleanup-branch-never-commit/arch/arm/configs/asus620_static_defconfig
===================================================================
--- linux4palm/linux/branches/cleanup-branch-never-commit/arch/arm/configs/asus620_static_defconfig	2007-09-12 16:47:07 UTC (rev 1308)
+++ linux4palm/linux/branches/cleanup-branch-never-commit/arch/arm/configs/asus620_static_defconfig	2007-09-13 17:27:38 UTC (rev 1309)
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.21-hh12
-# Tue Jul 17 20:51:06 2007
+# Linux kernel version: 2.6.21-hh15
+# Mon Sep 10 20:36:40 2007
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -171,8 +171,7 @@
 # CONFIG_MACH_MAGICIAN is not set
 # CONFIG_MACH_HTCAPACHE is not set
 # CONFIG_MACH_BLUEANGEL is not set
-# CONFIG_MACH_HTCBEETLES is not set
-# CONFIG_MACH_HW6900 is not set
+# CONFIG_HTC_HW6X00 is not set
 # CONFIG_MACH_HTCATHENA is not set
 # CONFIG_ARCH_AXIMX3 is not set
 # CONFIG_ARCH_AXIMX5 is not set
@@ -402,58 +401,16 @@
 #
 # CONFIG_NET_PKTGEN is not set
 # CONFIG_HAMRADIO is not set
-CONFIG_IRDA=y
-
-#
-# IrDA protocols
-#
-CONFIG_IRLAN=y
-CONFIG_IRCOMM=y
-CONFIG_IRDA_ULTRA=y
-
-#
-# IrDA options
-#
-CONFIG_IRDA_CACHE_LAST_LSAP=y
-CONFIG_IRDA_FAST_RR=y
-CONFIG_IRDA_DEBUG=y
-
-#
-# Infrared-port device drivers
-#
-
-#
-# SIR device drivers
-#
-CONFIG_IRTTY_SIR=y
-
-#
-# Dongle support
-#
-# CONFIG_DONGLE is not set
-
-#
-# Old SIR device drivers
-#
-# CONFIG_IRPORT_SIR is not set
-
-#
-# Old Serial dongle support
-#
-
-#
-# FIR device drivers
-#
-CONFIG_PXA_FICP=y
+# CONFIG_IRDA is not set
 CONFIG_BT=y
-CONFIG_BT_L2CAP=m
-CONFIG_BT_SCO=m
-CONFIG_BT_RFCOMM=m
+CONFIG_BT_L2CAP=y
+CONFIG_BT_SCO=y
+CONFIG_BT_RFCOMM=y
 CONFIG_BT_RFCOMM_TTY=y
-CONFIG_BT_BNEP=m
+CONFIG_BT_BNEP=y
 CONFIG_BT_BNEP_MC_FILTER=y
 CONFIG_BT_BNEP_PROTO_FILTER=y
-CONFIG_BT_HIDP=m
+CONFIG_BT_HIDP=y
 
 #
 # Bluetooth device drivers
@@ -486,21 +443,19 @@
 #
 # Memory Technology Devices (MTD)
 #
-CONFIG_MTD=y
+CONFIG_MTD=m
 CONFIG_MTD_DEBUG=y
 CONFIG_MTD_DEBUG_VERBOSE=0
-CONFIG_MTD_CONCAT=y
-CONFIG_MTD_PARTITIONS=y
-# CONFIG_MTD_REDBOOT_PARTS is not set
-# CONFIG_MTD_CMDLINE_PARTS is not set
-# CONFIG_MTD_AFS_PARTS is not set
+# CONFIG_MTD_CONCAT is not set
+# CONFIG_MTD_PARTITIONS is not set
 
 #
 # User Modules And Translation Layers
 #
-CONFIG_MTD_CHAR=y
-CONFIG_MTD_BLKDEVS=y
-CONFIG_MTD_BLOCK=y
+CONFIG_MTD_CHAR=m
+# CONFIG_MTD_BLKDEVS is not set
+# CONFIG_MTD_BLOCK is not set
+# CONFIG_MTD_BLOCK_RO is not set
 # CONFIG_FTL is not set
 # CONFIG_NFTL is not set
 # CONFIG_INFTL is not set
@@ -554,17 +509,15 @@
 #
 # NAND Flash Device Drivers
 #
-CONFIG_MTD_NAND=y
+CONFIG_MTD_NAND=m
 # CONFIG_MTD_NAND_VERIFY_WRITE is not set
 # CONFIG_MTD_NAND_ECC_SMC is not set
-# CONFIG_MTD_NAND_H1900 is not set
-CONFIG_MTD_NAND_IDS=y
-CONFIG_MTD_NAND_DISKONCHIP=y
+CONFIG_MTD_NAND_IDS=m
+CONFIG_MTD_NAND_DISKONCHIP=m
 # CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADVANCED is not set
 CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADDRESS=0
 # CONFIG_MTD_NAND_DISKONCHIP_BBTWRITE is not set
 # CONFIG_MTD_NAND_SHARPSL is not set
-# CONFIG_MTD_NAND_NANDSIM is not set
 
 #
 # OneNAND Flash Device Drivers
@@ -585,7 +538,8 @@
 # Block devices
 #
 # CONFIG_BLK_DEV_COW_COMMON is not set
-# CONFIG_BLK_DEV_LOOP is not set
+CONFIG_BLK_DEV_LOOP=m
+# CONFIG_BLK_DEV_CRYPTOLOOP is not set
 # CONFIG_BLK_DEV_NBD is not set
 CONFIG_BLK_DEV_RAM=y
 CONFIG_BLK_DEV_RAM_COUNT=4
@@ -668,6 +622,7 @@
 # CONFIG_KEYBOARD_NEWTON is not set
 # CONFIG_KEYBOARD_STOWAWAY is not set
 # CONFIG_GPIODEV_KEYS is not set
+# CONFIG_GPIODEV_KEYS2 is not set
 # CONFIG_GPIODEV_DIAGONAL is not set
 CONFIG_KEYBOARD_GPIO=y
 CONFIG_INPUT_MOUSE=y
@@ -782,12 +737,24 @@
 # CONFIG_ADC_AD7877 is not set
 
 #
+# Compaq/iPAQ Drivers
+#
+
+#
+# Compaq/HP iPAQ Drivers
+#
+# CONFIG_IPAQ_SLEEVE is not set
+# CONFIG_SLEEVE_DEBUG is not set
+
+#
 # Multifunction device drivers
 #
 # CONFIG_MFD_SM501 is not set
 # CONFIG_HTC_ASIC2 is not set
 # CONFIG_HTC_ASIC3 is not set
+# CONFIG_HTC_PASIC3 is not set
 # CONFIG_HTC_EGPIO is not set
+# CONFIG_HTC_BBKEYS is not set
 # CONFIG_HTC_ASIC3_DS1WM is not set
 # CONFIG_SOC_SAMCOP is not set
 # CONFIG_SOC_HAMCOP is not set
@@ -807,6 +774,7 @@
 #
 # LED drivers
 #
+# CONFIG_LEDS_GPIO is not set
 
 #
 # LED Triggers
@@ -814,6 +782,7 @@
 CONFIG_LEDS_TRIGGERS=y
 CONFIG_LEDS_TRIGGER_TIMER=y
 # CONFIG_LEDS_TRIGGER_HWTIMER is not set
+# CONFIG_LEDS_TRIGGER_BACKLIGHT is not set
 # CONFIG_LEDS_TRIGGER_HEARTBEAT is not set
 CONFIG_LEDS_TRIGGER_SHARED=y
 
@@ -899,7 +868,7 @@
 #
 # HID Devices
 #
-CONFIG_HID=m
+CONFIG_HID=y
 # CONFIG_HID_DEBUG is not set
 
 #
@@ -1106,8 +1075,8 @@
 # CONFIG_NLS_CODEPAGE_949 is not set
 # CONFIG_NLS_CODEPAGE_874 is not set
 # CONFIG_NLS_ISO8859_8 is not set
-CONFIG_NLS_CODEPAGE_1250=y
-CONFIG_NLS_CODEPAGE_1251=y
+# CONFIG_NLS_CODEPAGE_1250 is not set
+CONFIG_NLS_CODEPAGE_1251=m
 # CONFIG_NLS_ASCII is not set
 CONFIG_NLS_ISO8859_1=y
 # CONFIG_NLS_ISO8859_2 is not set
@@ -1190,7 +1159,7 @@
 # CONFIG_CRC16 is not set
 CONFIG_CRC32=y
 # CONFIG_LIBCRC32C is not set
-CONFIG_REED_SOLOMON=y
+CONFIG_REED_SOLOMON=m
 CONFIG_REED_SOLOMON_DEC16=y
 CONFIG_PLIST=y
 CONFIG_HAS_IOMEM=y

Modified: linux4palm/linux/branches/cleanup-branch-never-commit/arch/arm/configs/asus730_static_defconfig
===================================================================
--- linux4palm/linux/branches/cleanup-branch-never-commit/arch/arm/configs/asus730_static_defconfig	2007-09-12 16:47:07 UTC (rev 1308)
+++ linux4palm/linux/branches/cleanup-branch-never-commit/arch/arm/configs/asus730_static_defconfig	2007-09-13 17:27:38 UTC (rev 1309)
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.21-hh12
-# Tue Jul 17 20:51:07 2007
+# Linux kernel version: 2.6.21-hh15
+# Tue Sep 11 04:54:55 2007
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -167,6 +167,10 @@
 # CONFIG_MACH_MAGICIAN is not set
 # CONFIG_MACH_HTCAPACHE is not set
 # CONFIG_MACH_BLUEANGEL is not set
+
+#
+# HTC_HW6X00
+#
 # CONFIG_MACH_HTCBEETLES is not set
 # CONFIG_MACH_HW6900 is not set
 # CONFIG_MACH_HTCATHENA is not set
@@ -408,68 +412,8 @@
 #
 # CONFIG_NET_PKTGEN is not set
 # CONFIG_HAMRADIO is not set
-CONFIG_IRDA=y
-
-#
-# IrDA protocols
-#
-CONFIG_IRLAN=y
-CONFIG_IRCOMM=y
-CONFIG_IRDA_ULTRA=y
-
-#
-# IrDA options
-#
-CONFIG_IRDA_CACHE_LAST_LSAP=y
-CONFIG_IRDA_FAST_RR=y
-CONFIG_IRDA_DEBUG=y
-
-#
-# Infrared-port device drivers
-#
-
-#
-# SIR device drivers
-#
-CONFIG_IRTTY_SIR=y
-
-#
-# Dongle support
-#
-# CONFIG_DONGLE is not set
-
-#
-# Old SIR device drivers
-#
-# CONFIG_IRPORT_SIR is not set
-
-#
-# Old Serial dongle support
-#
-
-#
-# FIR device drivers
-#
-CONFIG_PXA_FICP=y
-CONFIG_BT=y
-CONFIG_BT_L2CAP=m
-CONFIG_BT_SCO=m
-CONFIG_BT_RFCOMM=m
-CONFIG_BT_RFCOMM_TTY=y
-CONFIG_BT_BNEP=m
-CONFIG_BT_BNEP_MC_FILTER=y
-CONFIG_BT_BNEP_PROTO_FILTER=y
-CONFIG_BT_HIDP=m
-
-#
-# Bluetooth device drivers
-#
-# CONFIG_BT_HCIUART is not set
-# CONFIG_BT_HCIDTL1 is not set
-# CONFIG_BT_HCIBT3C is not set
-# CONFIG_BT_HCIBLUECARD is not set
-# CONFIG_BT_HCIBTUART is not set
-# CONFIG_BT_HCIVHCI is not set
+# CONFIG_IRDA is not set
+# CONFIG_BT is not set
 # CONFIG_IEEE80211 is not set
 
 #
@@ -518,8 +462,14 @@
 #
 # RAM/ROM/Flash chip drivers
 #
-# CONFIG_MTD_CFI is not set
+CONFIG_MTD_CFI=y
 # CONFIG_MTD_JEDECPROBE is not set
+CONFIG_MTD_GEN_PROBE=y
+CONFIG_MTD_CFI_ADV_OPTIONS=y
+CONFIG_MTD_CFI_NOSWAP=y
+# CONFIG_MTD_CFI_BE_BYTE_SWAP is not set
+# CONFIG_MTD_CFI_LE_BYTE_SWAP is not set
+CONFIG_MTD_CFI_GEOMETRY=y
 CONFIG_MTD_MAP_BANK_WIDTH_1=y
 CONFIG_MTD_MAP_BANK_WIDTH_2=y
 CONFIG_MTD_MAP_BANK_WIDTH_4=y
@@ -530,15 +480,24 @@
 CONFIG_MTD_CFI_I2=y
 # CONFIG_MTD_CFI_I4 is not set
 # CONFIG_MTD_CFI_I8 is not set
+# CONFIG_MTD_OTP is not set
+CONFIG_MTD_CFI_INTELEXT=y
+# CONFIG_MTD_CFI_AMDSTD is not set
+# CONFIG_MTD_CFI_STAA is not set
+CONFIG_MTD_CFI_UTIL=y
 # CONFIG_MTD_RAM is not set
 # CONFIG_MTD_ROM is not set
 # CONFIG_MTD_ABSENT is not set
 # CONFIG_MTD_OBSOLETE_CHIPS is not set
+# CONFIG_MTD_XIP is not set
 
 #
 # Mapping drivers for chip access
 #
 # CONFIG_MTD_COMPLEX_MAPPINGS is not set
+# CONFIG_MTD_PHYSMAP is not set
+# CONFIG_MTD_ARM_INTEGRATOR is not set
+# CONFIG_MTD_IPAQ is not set
 # CONFIG_MTD_SHARP_SL is not set
 # CONFIG_MTD_PLATRAM is not set
 
@@ -562,14 +521,7 @@
 #
 # NAND Flash Device Drivers
 #
-CONFIG_MTD_NAND=y
-# CONFIG_MTD_NAND_VERIFY_WRITE is not set
-# CONFIG_MTD_NAND_ECC_SMC is not set
-# CONFIG_MTD_NAND_H1900 is not set
-CONFIG_MTD_NAND_IDS=y
-# CONFIG_MTD_NAND_DISKONCHIP is not set
-# CONFIG_MTD_NAND_SHARPSL is not set
-# CONFIG_MTD_NAND_NANDSIM is not set
+# CONFIG_MTD_NAND is not set
 
 #
 # OneNAND Flash Device Drivers
@@ -590,7 +542,8 @@
 # Block devices
 #
 # CONFIG_BLK_DEV_COW_COMMON is not set
-# CONFIG_BLK_DEV_LOOP is not set
+CONFIG_BLK_DEV_LOOP=m
+# CONFIG_BLK_DEV_CRYPTOLOOP is not set
 # CONFIG_BLK_DEV_NBD is not set
 CONFIG_BLK_DEV_RAM=y
 CONFIG_BLK_DEV_RAM_COUNT=4
@@ -695,6 +648,7 @@
 # CONFIG_KEYBOARD_NEWTON is not set
 # CONFIG_KEYBOARD_STOWAWAY is not set
 # CONFIG_GPIODEV_KEYS is not set
+# CONFIG_GPIODEV_KEYS2 is not set
 # CONFIG_GPIODEV_DIAGONAL is not set
 # CONFIG_KEYBOARD_PXA27x is not set
 # CONFIG_KEYBOARD_GPIO is not set
@@ -847,12 +801,24 @@
 # CONFIG_ADC_AD7877 is not set
 
 #
+# Compaq/iPAQ Drivers
+#
+
+#
+# Compaq/HP iPAQ Drivers
+#
+# CONFIG_IPAQ_SLEEVE is not set
+# CONFIG_SLEEVE_DEBUG is not set
+
+#
 # Multifunction device drivers
 #
 # CONFIG_MFD_SM501 is not set
 # CONFIG_HTC_ASIC2 is not set
 # CONFIG_HTC_ASIC3 is not set
+# CONFIG_HTC_PASIC3 is not set
 # CONFIG_HTC_EGPIO is not set
+# CONFIG_HTC_BBKEYS is not set
 # CONFIG_HTC_ASIC3_DS1WM is not set
 # CONFIG_SOC_SAMCOP is not set
 # CONFIG_SOC_HAMCOP is not set
@@ -872,6 +838,7 @@
 #
 # LED drivers
 #
+# CONFIG_LEDS_GPIO is not set
 
 #
 # LED Triggers
@@ -880,6 +847,7 @@
 CONFIG_LEDS_TRIGGER_TIMER=y
 # CONFIG_LEDS_TRIGGER_HWTIMER is not set
 # CONFIG_LEDS_TRIGGER_IDE_DISK is not set
+# CONFIG_LEDS_TRIGGER_BACKLIGHT is not set
 # CONFIG_LEDS_TRIGGER_HEARTBEAT is not set
 CONFIG_LEDS_TRIGGER_SHARED=y
 
@@ -1005,8 +973,7 @@
 #
 # HID Devices
 #
-CONFIG_HID=m
-# CONFIG_HID_DEBUG is not set
+# CONFIG_HID is not set
 
 #
 # USB support
@@ -1155,7 +1122,18 @@
 # CONFIG_BEFS_FS is not set
 # CONFIG_BFS_FS is not set
 # CONFIG_EFS_FS is not set
-# CONFIG_JFFS2_FS is not set
+CONFIG_JFFS2_FS=y
+CONFIG_JFFS2_FS_DEBUG=0
+CONFIG_JFFS2_FS_WRITEBUFFER=y
+# CONFIG_JFFS2_SUMMARY is not set
+# CONFIG_JFFS2_FS_XATTR is not set
+CONFIG_JFFS2_COMPRESSION_OPTIONS=y
+CONFIG_JFFS2_ZLIB=y
+CONFIG_JFFS2_RTIME=y
+# CONFIG_JFFS2_RUBIN is not set
+# CONFIG_JFFS2_CMODE_NONE is not set
+CONFIG_JFFS2_CMODE_PRIORITY=y
+# CONFIG_JFFS2_CMODE_SIZE is not set
 # CONFIG_CRAMFS is not set
 # CONFIG_VXFS_FS is not set
 # CONFIG_HPFS_FS is not set
@@ -1218,8 +1196,8 @@
 # CONFIG_NLS_CODEPAGE_949 is not set
 # CONFIG_NLS_CODEPAGE_874 is not set
 # CONFIG_NLS_ISO8859_8 is not set
-CONFIG_NLS_CODEPAGE_1250=y
-CONFIG_NLS_CODEPAGE_1251=y
+# CONFIG_NLS_CODEPAGE_1250 is not set
+CONFIG_NLS_CODEPAGE_1251=m
 # CONFIG_NLS_ASCII is not set
 CONFIG_NLS_ISO8859_1=y
 # CONFIG_NLS_ISO8859_2 is not set
@@ -1302,6 +1280,8 @@
 # CONFIG_CRC16 is not set
 CONFIG_CRC32=y
 # CONFIG_LIBCRC32C is not set
+CONFIG_ZLIB_INFLATE=y
+CONFIG_ZLIB_DEFLATE=y
 CONFIG_PLIST=y
 CONFIG_HAS_IOMEM=y
 CONFIG_HAS_IOPORT=y

Modified: linux4palm/linux/branches/cleanup-branch-never-commit/arch/arm/configs/aximx50_static_defconfig
===================================================================
--- linux4palm/linux/branches/cleanup-branch-never-commit/arch/arm/configs/aximx50_static_defconfig	2007-09-12 16:47:07 UTC (rev 1308)
+++ linux4palm/linux/branches/cleanup-branch-never-commit/arch/arm/configs/aximx50_static_defconfig	2007-09-13 17:27:38 UTC (rev 1309)
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.21-hh12
-# Tue Jul 17 20:51:07 2007
+# Linux kernel version: 2.6.21-hh15
+# Mon Sep 10 20:36:41 2007
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -166,8 +166,7 @@
 # CONFIG_MACH_MAGICIAN is not set
 # CONFIG_MACH_HTCAPACHE is not set
 # CONFIG_MACH_BLUEANGEL is not set
-# CONFIG_MACH_HTCBEETLES is not set
-# CONFIG_MACH_HW6900 is not set
+# CONFIG_HTC_HW6X00 is not set
 # CONFIG_MACH_HTCATHENA is not set
 # CONFIG_ARCH_AXIMX3 is not set
 # CONFIG_ARCH_AXIMX5 is not set
@@ -402,64 +401,8 @@
 #
 # CONFIG_NET_PKTGEN is not set
 # CONFIG_HAMRADIO is not set
-CONFIG_IRDA=y
-
-#
-# IrDA protocols
-#
-CONFIG_IRLAN=y
-CONFIG_IRCOMM=y
-CONFIG_IRDA_ULTRA=y
-
-#
-# IrDA options
-#
-CONFIG_IRDA_CACHE_LAST_LSAP=y
-CONFIG_IRDA_FAST_RR=y
-CONFIG_IRDA_DEBUG=y
-
-#
-# Infrared-port device drivers
-#
-
-#
-# SIR device drivers
-#
-CONFIG_IRTTY_SIR=y
-
-#
-# Dongle support
-#
-# CONFIG_DONGLE is not set
-
-#
-# Old SIR device drivers
-#
-# CONFIG_IRPORT_SIR is not set
-
-#
-# Old Serial dongle support
-#
-
-#
-# FIR device drivers
-#
-CONFIG_PXA_FICP=y
-CONFIG_BT=y
-CONFIG_BT_L2CAP=m
-CONFIG_BT_SCO=m
-CONFIG_BT_RFCOMM=m
-CONFIG_BT_RFCOMM_TTY=y
-CONFIG_BT_BNEP=m
-CONFIG_BT_BNEP_MC_FILTER=y
-CONFIG_BT_BNEP_PROTO_FILTER=y
-CONFIG_BT_HIDP=m
-
-#
-# Bluetooth device drivers
-#
-# CONFIG_BT_HCIUART is not set
-# CONFIG_BT_HCIVHCI is not set
+# CONFIG_IRDA is not set
+# CONFIG_BT is not set
 # CONFIG_IEEE80211 is not set
 
 #
@@ -484,21 +427,19 @@
 #
 # Memory Technology Devices (MTD)
 #
-CONFIG_MTD=y
+CONFIG_MTD=m
 CONFIG_MTD_DEBUG=y
 CONFIG_MTD_DEBUG_VERBOSE=0
-CONFIG_MTD_CONCAT=y
-CONFIG_MTD_PARTITIONS=y
-# CONFIG_MTD_REDBOOT_PARTS is not set
-# CONFIG_MTD_CMDLINE_PARTS is not set
-# CONFIG_MTD_AFS_PARTS is not set
+# CONFIG_MTD_CONCAT is not set
+# CONFIG_MTD_PARTITIONS is not set
 
 #
 # User Modules And Translation Layers
 #
-CONFIG_MTD_CHAR=y
-CONFIG_MTD_BLKDEVS=y
-CONFIG_MTD_BLOCK=y
+CONFIG_MTD_CHAR=m
+# CONFIG_MTD_BLKDEVS is not set
+# CONFIG_MTD_BLOCK is not set
+# CONFIG_MTD_BLOCK_RO is not set
 # CONFIG_FTL is not set
 # CONFIG_NFTL is not set
 # CONFIG_INFTL is not set
@@ -573,7 +514,8 @@
 # Block devices
 #
 # CONFIG_BLK_DEV_COW_COMMON is not set
-# CONFIG_BLK_DEV_LOOP is not set
+CONFIG_BLK_DEV_LOOP=m
+# CONFIG_BLK_DEV_CRYPTOLOOP is not set
 # CONFIG_BLK_DEV_NBD is not set
 CONFIG_BLK_DEV_RAM=y
 CONFIG_BLK_DEV_RAM_COUNT=4
@@ -656,6 +598,7 @@
 # CONFIG_KEYBOARD_NEWTON is not set
 # CONFIG_KEYBOARD_STOWAWAY is not set
 # CONFIG_GPIODEV_KEYS is not set
+# CONFIG_GPIODEV_KEYS2 is not set
 # CONFIG_GPIODEV_DIAGONAL is not set
 CONFIG_KEYBOARD_PXA27x=y
 CONFIG_KEYBOARD_GPIO=y
@@ -780,12 +723,24 @@
 # CONFIG_ADC_AD7877 is not set
 
 #
+# Compaq/iPAQ Drivers
+#
+
+#
+# Compaq/HP iPAQ Drivers
+#
+# CONFIG_IPAQ_SLEEVE is not set
+# CONFIG_SLEEVE_DEBUG is not set
+
+#
 # Multifunction device drivers
 #
 # CONFIG_MFD_SM501 is not set
 # CONFIG_HTC_ASIC2 is not set
 # CONFIG_HTC_ASIC3 is not set
+# CONFIG_HTC_PASIC3 is not set
 # CONFIG_HTC_EGPIO is not set
+# CONFIG_HTC_BBKEYS is not set
 # CONFIG_HTC_ASIC3_DS1WM is not set
 # CONFIG_SOC_SAMCOP is not set
 # CONFIG_SOC_HAMCOP is not set
@@ -805,6 +760,7 @@
 #
 # LED drivers
 #
+# CONFIG_LEDS_GPIO is not set
 
 #
 # LED Triggers
@@ -812,6 +768,7 @@
 CONFIG_LEDS_TRIGGERS=y
 CONFIG_LEDS_TRIGGER_TIMER=y
 CONFIG_LEDS_TRIGGER_HWTIMER=y
+# CONFIG_LEDS_TRIGGER_BACKLIGHT is not set
 # CONFIG_LEDS_TRIGGER_HEARTBEAT is not set
 CONFIG_LEDS_TRIGGER_SHARED=y
 
@@ -897,8 +854,7 @@
 #
 # HID Devices
 #
-CONFIG_HID=m
-# CONFIG_HID_DEBUG is not set
+# CONFIG_HID is not set
 
 #
 # USB support
@@ -1104,8 +1060,8 @@
 # CONFIG_NLS_CODEPAGE_949 is not set
 # CONFIG_NLS_CODEPAGE_874 is not set
 # CONFIG_NLS_ISO8859_8 is not set
-CONFIG_NLS_CODEPAGE_1250=y
-CONFIG_NLS_CODEPAGE_1251=y
+# CONFIG_NLS_CODEPAGE_1250 is not set
+CONFIG_NLS_CODEPAGE_1251=m
 # CONFIG_NLS_ASCII is not set
 CONFIG_NLS_ISO8859_1=y
 # CONFIG_NLS_ISO8859_2 is not set

Modified: linux4palm/linux/branches/cleanup-branch-never-commit/drivers/media/video/Kconfig
===================================================================
--- linux4palm/linux/branches/cleanup-branch-never-commit/drivers/media/video/Kconfig	2007-09-12 16:47:07 UTC (rev 1308)
+++ linux4palm/linux/branches/cleanup-branch-never-commit/drivers/media/video/Kconfig	2007-09-13 17:27:38 UTC (rev 1309)
@@ -763,8 +763,4 @@
 
 endmenu # V4L USB devices
 
-config PXACI
-	depends on VIDEO_DEV
-	tristate "Camera Interface for PXA27x"
-
 endmenu

Modified: linux4palm/linux/branches/cleanup-branch-never-commit/drivers/media/video/Makefile
===================================================================
--- linux4palm/linux/branches/cleanup-branch-never-commit/drivers/media/video/Makefile	2007-09-12 16:47:07 UTC (rev 1308)
+++ linux4palm/linux/branches/cleanup-branch-never-commit/drivers/media/video/Makefile	2007-09-13 17:27:38 UTC (rev 1309)
@@ -111,7 +111,5 @@
 obj-$(CONFIG_USB_QUICKCAM_MESSENGER)	+= usbvideo/
 
 obj-$(CONFIG_VIDEO_VIVI) += vivi.o
-# obj-$(CONFIG_PXACI) += pxa_camera.o pxa_ci.o pxa_camera_ioctl.o
-obj-$(CONFIG_PXACI) += ov96xx.o
 
 EXTRA_CFLAGS += -Idrivers/media/dvb/dvb-core

Deleted: linux4palm/linux/branches/cleanup-branch-never-commit/drivers/media/video/ov96xx.c
===================================================================
--- linux4palm/linux/branches/cleanup-branch-never-commit/drivers/media/video/ov96xx.c	2007-09-12 16:47:07 UTC (rev 1308)
+++ linux4palm/linux/branches/cleanup-branch-never-commit/drivers/media/video/ov96xx.c	2007-09-13 17:27:38 UTC (rev 1309)
@@ -1,268 +0,0 @@
-/*
- *  ov96xx.c - Omnivision 9640, 9650 CMOS sensor driver
- *
- *  Copyright (C) 2003 Intel Corporation
- *  Copyright (C) 2004 Motorola Inc.
- *  Copyright (C) 2007 Philipp Zabel <phi...@gm...>
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- */
-
-#include <linux/clk.h>
-#include <linux/delay.h>
-#include <linux/module.h>
-#include <linux/platform_device.h>
-
-#include <media/ov96xx.h>	/* ov96xx_platform_data */
-#include <media/v4l2-dev.h>
-
-#include <asm/arch/gpio.h>
-
-#include <asm/ioctl.h>
-#include <asm/irq.h>
-#include <asm/hardware.h>
-#include <asm/uaccess.h>
-
-#include "pxa_ci_types.h"
-#include "ov96xx_hw.h"
-
-extern int i2c_ov96xx_init(void);
-extern int i2c_ov96xx_cleanup(void);
-extern int i2c_ov96xx_read(u8 addr, u8 *pvalue);
-extern int i2c_ov96xx_write(u8 addr, u8 value);
-
-#define DEBUG 1
-#define DPRINTK(fmt,args...) \
-	do { if (DEBUG) printk("in function %s "fmt,__FUNCTION__,##args);} while(0)
-
-struct ov96xx_data {
-	int		version;
-	struct clk	*clk;
-};
-
-void ov96xx_soft_reset(struct platform_device *pdev)
-{
-	struct ov96xx_data *ov96xx = platform_get_drvdata(pdev);
-
-	i2c_ov96xx_write(OV96xx_COM7, 0x80);		/* COM7 = 0x12 */
-	mdelay(10);
-
-	/* enable digital BLC */
-	switch (ov96xx->version) {
-	case REV_OV9640:
-	case REV_OV9640_v3:
-		break;
-	case REV_OV9650_0:
-		i2c_ov96xx_write(OV96xx_TSLB, 0x0c);	/* TSLB = 0x3a */
-		i2c_ov96xx_write(OV96xx_COM6, 0x4a);	/* COM6 = 0x0f */
-		break;
-	case REV_OV9650:
-		i2c_ov96xx_write(OV96xx_TSLB, 0x0d);	/* TSLB = 0x3a */
-		i2c_ov96xx_write(OV96xx_COM6, 0x42);	/* COM6 = 0x0f */
-		break;
-	}
-
-	dbg_print("end initial register");
-}
-
-int ov96xx_check_revision(struct platform_device *pdev)
-{
-	struct ov96xx_data *ov96xx = platform_get_drvdata(pdev);
-	u8 val;
-
-	i2c_ov96xx_read(OV96xx_PID, &val);
-	DPRINTK("PID = %x\n", val);
-
-	if (val != PID_OV96xx)
-		return -ENODEV;
-
-	mdelay(2000);
-	i2c_ov96xx_read(OV96xx_REV, &val);
-	DPRINTK("REV = %x\n", val);
-
-	switch (val) {
-	case REV_OV9640:
-		printk("detected OV9640\n");
-		break;
-	case REV_OV9640_v3:
-		printk("detected OV9640 v3\n");
-		break;
-	case REV_OV9650_0:
-		printk("detected OV9650-0\n");
-		break;
-	case REV_OV9650:
-		printk("detected OV9650\n");
-		break;
-	default:
-		printk("couldn't detect OV96xx\n");
-		return -ENODEV;
-	}
-	ov96xx->version = val;
-	return val;
-}
-
-void ov96xx_power(struct platform_device *pdev, int powerup)
-{
-	struct ov96xx_platform_data *pdata = pdev->dev.platform_data;
-
-	if (powerup) {
-		gpio_set_value(pdata->power_gpio, pdata->power_gpio_active_high);
-		if (pdata->reset_gpio) {
-			gpio_set_value(pdata->reset_gpio, 1);
-			mdelay(20);
-			gpio_set_value(pdata->reset_gpio, 0);
-		}
-	} else {
-		gpio_set_value(pdata->power_gpio, !pdata->power_gpio_active_high);
-	}
-	mdelay(100);
-}
-
-static int ov96xx_probe(struct platform_device *pdev)
-{
-	struct ov96xx_data *ov96xx;
-	struct ov96xx_platform_data *pdata;
-	int ret;
-	int rate, i;
-	u8 val;
-
-	if (!pdev)
-		return -ENODEV;
-
-	pdata = pdev->dev.platform_data;
-	if (!pdata->power_gpio)
-		return -EINVAL;
-
-	ov96xx = kzalloc(sizeof (struct ov96xx_data), GFP_KERNEL);
-	if (!ov96xx)
-		return -ENOMEM;
-
-	platform_set_drvdata(pdev, ov96xx);
-
-	ov96xx->clk = clk_get(&pdev->dev, "CI_MCLK");
-	if (IS_ERR(ov96xx->clk)) {
-		DPRINTK("couldn't get CI master clock\n");
-		ret = -ENOENT;
-		goto err;
-	}
-
-	rate = clk_get_rate(ov96xx->clk);
-	printk("clock rate = %d\n", rate);
-
-	/* enable clock, camera */
-	clk_enable(ov96xx->clk);
-	ov96xx_power(pdev, 1);
-
-	/* enable i2c */
-	i2c_ov96xx_init();
-
-	/* check revision */
-	//mdelay(2000);
-	mdelay(100);
-	ov96xx_check_revision(pdev);
-
-	/* dump all registers */
-	for (i=0; i<0xff; i++) {
-		if ((i%16) == 0) {
-			printk("\n%02x: ", i);
-		}
-		i2c_ov96xx_read(i, &val);
-		printk("%02x ", val);
-	}
-	printk("\n");
-
-	ov96xx_power(pdev, 0);
-
-	/* disable clock */
-	clk_disable(ov96xx->clk);
-
-	/* disable i2c */
-	i2c_ov96xx_cleanup();
-
-	return 0;
-err:
-	kfree(ov96xx);
-	return ret;
-}
-
-#ifdef CONFIG_PM
-static int ov96xx_suspend(struct platform_device *pdev, pm_message_t state)
-{
-	/*
-	 * stopping DMA transfers and disabling interrupts / clocks
-	 * is the business of the capture interface driver
-	 */
-
-	return 0;
-}
-
-static int ov96xx_resume(struct platform_device *pdev)
-{
-/*	struct ov96xx_data *ov96xx = platform_get_drvdata(pdev); */
-
-	/*
-	 * enabling interrupts / clocks and resuming DMA transfers
-	 * is the business of the capture interface driver
-	 */
-#if 0
-	camera_init(ov96xx->cam_ctx);
-	//ov96xx_restore_property(cam_ctx, 0);
-	if (resume_dma == 1) {
-		camera_start_video_capture(cam_ctx, 0);
-		resume_dma = 0;
-	}
-#endif
-	return 0;
-}
-#else
-#define ov96xx_suspend NULL
-#define ov96xx_resume NULL
-#endif
-
-static int ov96xx_remove(struct platform_device *pdev)
-{
-	struct ov96xx_data *ov96xx = platform_get_drvdata(pdev);
-
-	kfree(ov96xx);
-	return 0;
-}
-
-static struct platform_driver ov96xx_driver = {
-	.driver   = {
-		.name = "ov96xx",
-	},
-	.probe    = ov96xx_probe,
-	.remove   = ov96xx_remove,
-	.suspend  = ov96xx_suspend,
-	.resume   = ov96xx_resume
-};
-
-static int __init ov96xx_init(void)
-{
-	return platform_driver_register(&ov96xx_driver);
-}
-
-static void __exit ov96xx_exit(void)
-{
-	platform_driver_unregister(&ov96xx_driver);
-}
-
-module_init(ov96xx_init);
-module_exit(ov96xx_exit);
-
-MODULE_DESCRIPTION("OV96xx CMOS sensor driver");
-MODULE_LICENSE("GPL");
-

Deleted: linux4palm/linux/branches/cleanup-branch-never-commit/drivers/media/video/ov96xx_hw.h
===================================================================
--- linux4palm/linux/branches/cleanup-branch-never-commit/drivers/media/video/ov96xx_hw.h	2007-09-12 16:47:07 UTC (rev 1308)
+++ linux4palm/linux/branches/cleanup-branch-never-commit/drivers/media/video/ov96xx_hw.h	2007-09-13 17:27:38 UTC (rev 1309)
@@ -1,237 +0,0 @@
-/*
- *  ov96xx_hw.h - Omnivision 9640, 9650 CMOS sensor driver
- *
- *  Copyright (C) 2003, Intel Corporation
- *  Copyright (C) 2004 Motorola Inc.
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- * Merge of OV9640,OV9650 (C) 2007 Philipp Zabel
- *
- */
-
-#ifndef __OV_96xx_HW_H__
-#define __OV_96xx_HW_H__
-
-/* Revision constants */
-#define PID_OV96xx		0x96
-#define REV_OV9640		0x48
-#define REV_OV9640_v3		0x49
-#define REV_OV9650_0		0x51
-#define REV_OV9650		0x52
-
-/* Return codes */
-#define OV_ERR_NONE       	0x00
-#define OV_ERR_TIMEOUT    	-1
-#define OV_ERR_PARAMETER  	-2
-#define OV_COMM_ERR		-3
-
-/* Output Size & Format */
-/*
-#define OV_SIZE_NONE		0
-#define OV_SIZE_QQVGA		0x01
-#define OV_SIZE_QVGA		( OV_SIZE_QQVGA << 1 )
-#define OV_SIZE_VGA		( OV_SIZE_QQVGA << 2 )
-#define OV_SIZE_SXGA		( OV_SIZE_QQVGA << 3 )
-#define OV_SIZE_QQCIF		0x10
-#define OV_SIZE_QCIF		( OV_SIZE_QQCIF << 1 )
-#define OV_SIZE_CIF		( OV_SIZE_QQCIF << 2 )
-#define OV_FORMAT_NONE		0
-#define OV_FORMAT_YUV_422	1
-#define OV_FORMAT_RGB_565	2
-*/
-enum OV_SIZE {
-	OV_SIZE_NONE=0	,
-	OV_SIZE_QQVGA	,
-	OV_SIZE_QVGA	,
-	OV_SIZE_VGA	,
-	OV_SIZE_SXGA	,
-	OV_SIZE_QQCIF	,
-	OV_SIZE_QCIF	,
-	OV_SIZE_CIF
-};
-enum OV_FORMAT {
-	OV_FORMAT_NONE=0 ,
-	OV_FORMAT_YUV_422,
-	OV_FORMAT_RGB_565,
-};
-
-/* Camera Mode */
-#define VIEWFINDER_MODE     0x10
-#define STILLFRAME_MODE     0x20
-
-/* Others */
-#define OV96xx_TIMEOUT    1000    // ms to timeout.
-
-/* OV96xx Register Definitions */
-#define OV96xx_GAIN		0x00
-#define OV96xx_BLUE		0x01
-#define OV96xx_RED		0x02
-#define OV96xx_VREF		0x03
-#define OV96xx_COM1		0x04
-#define OV96xx_BAVE		0x05				// U/B Average Level
-#define OV96xx_GEAVE		0x06				// Y/Ge Average Level
-#define OV96xx_GOAVE		0x07				// Y/Go Average Level
-#define OV96xx_RAVE		0x08				// V/R Average level
-#define OV96xx_COM2		0x09				// Common control 2
-#define OV96xx_PID		0x0A				// Product ID
-#define OV96xx_REV		0x0B				// Revision
-#define OV96xx_COM3		0x0C
-#define OV96xx_COM4		0x0D
-#define OV96xx_COM5		0x0E
-#define OV96xx_COM6		0x0F
-#define OV96xx_AECH		0x10
-#define OV96xx_CLKRC		0x11
-#define OV96xx_COM7		0x12
-#define OV96xx_COM8		0x13
-#define OV96xx_COM9		0x14
-#define OV96xx_COM10		0x15
-#define OV96xx_WS		0x16
-#define OV96xx_HSTART		0x17
-#define OV96xx_HSTOP		0x18
-#define OV96xx_VSTRT		0x19
-#define OV96xx_VSTOP		0x1A
-#define OV96xx_PSHFT		0x1B
-#define OV96xx_MIDH		0x1C
-#define OV96xx_MIDL		0x1D
-#define OV9640_DLY		0x1E
-#define OV9650_MVLP		0x1E
-#define OV96xx_LAEC		0x1F
-#define OV96xx_BOS		0x20
-#define OV96xx_GBOS		0x21
-#define OV96xx_GROS		0x22
-#define OV96xx_ROS		0x23
-#define OV96xx_AEW		0x24
-#define OV96xx_AEB		0x25
-#define OV96xx_VPT		0x26
-#define OV96xx_BBIAS		0x27
-#define OV96xx_GbBIAS		0x28
-#define OV9640_GrBIAS		0x29
-#define OV9650_GrCOM		0x29
-#define OV96xx_EXHCH		0x2A
-#define OV96xx_EXHCL		0x2B
-#define OV96xx_RBIAS		0x2C
-#define OV96xx_ADVFL		0x2D
-#define OV96xx_ADVFH		0x2E
-#define OV96xx_YAVE		0x2F
-#define OV96xx_HSYST		0x30
-#define OV96xx_HSYEN		0x31
-#define OV96xx_HREF		0x32
-#define OV96xx_CHLF		0x33
-#define OV96xx_ARBLM		0x34
-#define OV96xx_VRHL		0x35
-#define OV96xx_VIDO		0x36
-#define OV96xx_ADC		0x37
-#define OV96xx_ACOM		0x38
-#define OV96xx_OFON		0x39
-#define OV96xx_TSLB		0x3A
-#define OV96xx_COM11		0x3B
-#define OV96xx_COM12		0x3C
-#define OV96xx_COM13		0x3D
-#define OV96xx_COM14		0x3E
-#define OV96xx_EDGE		0x3F
-#define OV96xx_COM15		0x40
-#define OV96xx_COM16		0x41
-#define OV96xx_COM17		0x42
-#define OV96xx_AWBTH1		0x43
-#define OV96xx_AWBTH2		0x44
-#define OV96xx_AWBTH3		0x45
-#define OV96xx_AWBTH4		0x46
-#define OV96xx_AWBTH5		0x47
-#define OV96xx_AWBTH6		0x48
-#define OV96xx_MTX1		0x4F
-#define OV96xx_MTX2		0x50
-#define OV96xx_MTX3		0x51
-#define OV96xx_MTX4		0x52
-#define OV96xx_MTX5		0x53
-#define OV96xx_MTX6		0x54
-#define OV96xx_MTX7		0x55
-#define OV96xx_MTX8		0x56
-#define OV96xx_MTX9		0x57
-#define OV96xx_MTXS		0x58
-#define OV96xx_AWBC1		0x59
-#define OV96xx_AWBC2		0x5A
-#define OV96xx_AWBC3		0x5B
-#define OV96xx_AWBC4		0x5C
-#define OV96xx_AWBC5		0x5D
-#define OV96xx_AWBC6		0x5E
-#define OV96xx_AWBC7		0x5F
-#define OV96xx_AWBC8		0x60
-#define OV96xx_AWBC9		0x61
-#define OV96xx_LCC1		0x62
-#define OV96xx_LCC2		0x63
-#define OV96xx_LCC3		0x64
-#define OV96xx_LCC4		0x65
-#define OV96xx_LCC5		0x66
-#define OV96xx_MANU		0x67
-#define OV96xx_MANV		0x68
-#define OV96xx_HV		0x69
-#define OV96xx_MBD		0x6A
-#define OV96xx_DBLV		0x6B
-#define OV96xx_GSP0		0x6C
-#define OV96xx_GSP1		0x6D
-#define OV96xx_GSP2		0x6E
-#define OV96xx_GSP3		0x6F
-#define OV96xx_GSP4		0x70
-#define OV96xx_GSP5		0x71
-#define OV96xx_GSP6		0x72
-#define OV96xx_GSP7		0x73
-#define OV96xx_GSP8		0x74
-#define OV96xx_GSP9		0x75
-#define OV96xx_GSP10		0x76
-#define OV96xx_GSP11		0x77
-#define OV96xx_GSP12		0x78
-#define OV96xx_GSP13		0x79
-#define OV96xx_GSP14		0x7A
-#define OV96xx_GSP15		0x7B
-#define OV96xx_GST0		0x7C
-#define OV96xx_GST1		0x7D
-#define OV96xx_GST2		0x7E
-#define OV96xx_GST3		0x7F
-#define OV96xx_GST4		0x80
-#define OV96xx_GST5		0x81
-#define OV96xx_GST6		0x82
-#define OV96xx_GST7		0x83
-#define OV96xx_GST8		0x84
-#define OV96xx_GST9		0x85
-#define OV96xx_GST10		0x86
-#define OV96xx_GST11		0x87
-#define OV96xx_GST12		0x88
-#define OV96xx_GST13		0x89
-#define OV96xx_GST14		0x8A
-
-/* End of OV9640 register */
-#define OV9640_REGEND		( OV96xx_GST14 + 1 )
-
-/* OV9650 Register Definitions */
-#define OV9650_COM21		0x8B
-#define OV9650_COM22		0x8C
-#define OV9650_COM23		0x8D
-#define OV9650_COM24		0x8E
-#define OV9650_DBLC1		0x8F
-#define OV9650_DBLCB		0x90
-#define OV9650_DBLCR		0x91
-#define OV9650_DMLNL		0x92
-#define OV9650_DMLNH		0x93
-
-#define OV9650_AECHM		0xA1
-
-/* End of OV9650 register */
-#define OV9650_LASTREG		0xAA
-
-/* End flag of register */
-#define OV9650_REGEND		( 0xff )
-
-#endif

Modified: linux4palm/linux/branches/cleanup-branch-never-commit/fs/Kconfig
===================================================================
--- linux4palm/linux/branches/cleanup-branch-never-commit/fs/Kconfig	2007-09-12 16:47:07 UTC (rev 1308)
+++ linux4palm/linux/branches/cleanup-branch-never-commit/fs/Kconfig	2007-09-13 17:27:38 UTC (rev 1309)
@@ -1086,8 +1086,6 @@
 	  To compile this file system support as a module, choose M here: the
 	  module will be called affs.  If unsure, say N.
 
-source "fs/aufs/Kconfig"
-
 config ECRYPT_FS
 	tristate "eCrypt filesystem layer support (EXPERIMENTAL)"
 	depends on EXPERIMENTAL && KEYS && CRYPTO && NET
@@ -1437,8 +1435,6 @@
 
 	  If unsure, say N.
 
-source "fs/squashfs_lzma/Kconfig"
-
 config VXFS_FS
 	tristate "FreeVxFS file system support (VERITAS VxFS(TM) compatible)"
 	depends on BLOCK

Modified: linux4palm/linux/branches/cleanup-branch-never-commit/fs/Makefile
===================================================================
--- linux4palm/linux/branches/cleanup-branch-never-commit/fs/Makefile	2007-09-12 16:47:07 UTC (rev 1308)
+++ linux4palm/linux/branches/cleanup-branch-never-commit/fs/Makefile	2007-09-13 17:27:38 UTC (rev 1309)
@@ -68,8 +68,6 @@
 obj-$(CONFIG_JBD2)		+= jbd2/
 obj-$(CONFIG_EXT2_FS)		+= ext2/
 obj-$(CONFIG_CRAMFS)		+= cramfs/
-obj-$(CONFIG_SQUASHFS)		+= squashfs/
-obj-$(CONFIG_SQUASHFS_LZMA)	+= squashfs_lzma/
 obj-$(CONFIG_RAMFS)		+= ramfs/
 obj-$(CONFIG_HUGETLBFS)		+= hugetlbfs/
 obj-$(CONFIG_CODA_FS)		+= coda/
@@ -115,6 +113,4 @@
 obj-$(CONFIG_HPPFS)		+= hppfs/
 obj-$(CONFIG_DEBUG_FS)		+= debugfs/
 obj-$(CONFIG_OCFS2_FS)		+= ocfs2/
-obj-$(CONFIG_AUFS)		+= aufs/
-obj-$(CONFIG_UNION_FS)		+= unionfs/
 obj-$(CONFIG_GFS2_FS)           += gfs2/

Deleted: linux4palm/linux/branches/cleanup-branch-never-commit/include/media/ov96xx.h
===================================================================
--- linux4palm/linux/branches/cleanup-branch-never-commit/include/media/ov96xx.h	2007-09-12 16:47:07 UTC (rev 1308)
+++ linux4palm/linux/branches/cleanup-branch-never-commit/include/media/ov96xx.h	2007-09-13 17:27:38 UTC (rev 1309)
@@ -1,5 +0,0 @@
-struct ov96xx_platform_data {
-	int	power_gpio;
-	int	power_gpio_active_high;
-	int	reset_gpio;
-};


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.