From: tanner Date: Thu, 15 Apr 2010 09:48:57 +0000 (+0200) Subject: old version maemo11 X-Git-Url: http://vcs.maemo.org/git/?p=kernel-bfs;a=commitdiff_plain;h=8b873c1814063737d4ab33b038431768d310cdab old version maemo11 --- diff --git a/kernel-maemo-2.6.28/debian/changelog b/kernel-maemo-2.6.28/debian/changelog index ff40717..c1aef3b 100644 --- a/kernel-maemo-2.6.28/debian/changelog +++ b/kernel-maemo-2.6.28/debian/changelog @@ -1,3 +1,11 @@ +kernel-maemo (2.6.28-maemo11) fremantle; urgency=low + + * enabled PPP module + * use indepedent, rx51maemo_defconfig, integrate original Nokia config in patch + * more efficient build process: don't copy source, use build tree (patched pvr Makefile) + + -- Thomas Tanner Sun, 28 Feb 2010 00:00:00 +0100 + kernel-maemo (2.6.28-maemo10) fremantle; urgency=low * integrate mobile hotspot patches from diff --git a/kernel-maemo-2.6.28/debian/patches/maemo-build.diff b/kernel-maemo-2.6.28/debian/patches/maemo-build.diff index 229bd4f..73b5d0d 100644 --- a/kernel-maemo-2.6.28/debian/patches/maemo-build.diff +++ b/kernel-maemo-2.6.28/debian/patches/maemo-build.diff @@ -1,5 +1,5 @@ ---- kernel-2.6.28.orig/Makefile -+++ kernel-2.6.28/Makefile +--- kernel-maemo-2.6.28.orig/Makefile ++++ kernel-maemo-2.6.28/Makefile @@ -1,7 +1,7 @@ VERSION = 2 PATCHLEVEL = 6 @@ -9,8 +9,8 @@ NAME = Erotic Pickled Herring # *DOCUMENTATION* ---- kernel-2.6.28.orig/scripts/kconfig/lxdialog/check-lxdialog.sh -+++ kernel-2.6.28/scripts/kconfig/lxdialog/check-lxdialog.sh +--- kernel-maemo-2.6.28.orig/scripts/kconfig/lxdialog/check-lxdialog.sh ++++ kernel-maemo-2.6.28/scripts/kconfig/lxdialog/check-lxdialog.sh @@ -68,12 +68,14 @@ check ;; @@ -28,3 +28,12 @@ ;; "*") usage +--- kernel-maemo-2.6.28.orig/drivers/gpu/pvr/Makefile ++++ kernel-maemo-2.6.28/drivers/gpu/pvr/Makefile +@@ -21,5 +21,5 @@ + -DPVR_BUILD_DIR="\"$(PVR_BUILD_DIR)\"" \ + -DPVR_BUILD_DATE="\"$(DATE)\"" + +-ccflags-y += $(CBUILD) -include $(src)/pvrconfig.h ++ccflags-y += $(CBUILD) -include $(KBUILD_SRC)/$(src)/pvrconfig.h + diff --git a/kernel-maemo-2.6.28/debian/patches/nokia-20094803.3+0m5.diff b/kernel-maemo-2.6.28/debian/patches/nokia-20094803.3+0m5.diff index 08507b3..eca9408 100644 --- a/kernel-maemo-2.6.28/debian/patches/nokia-20094803.3+0m5.diff +++ b/kernel-maemo-2.6.28/debian/patches/nokia-20094803.3+0m5.diff @@ -1,5 +1,5 @@ ---- kernel-2.6.28.orig/Documentation/DocBook/mac80211.tmpl -+++ kernel-2.6.28/Documentation/DocBook/mac80211.tmpl +--- kernel-maemo-2.6.28.orig/Documentation/DocBook/mac80211.tmpl ++++ kernel-maemo-2.6.28/Documentation/DocBook/mac80211.tmpl @@ -223,6 +223,17 @@ !Finclude/net/mac80211.h ieee80211_key_flags @@ -19,7 +19,7 @@ Multiple queues and QoS support TBD --- /dev/null -+++ kernel-2.6.28/Documentation/arm/OMAP/DSS ++++ kernel-maemo-2.6.28/Documentation/arm/OMAP/DSS @@ -0,0 +1,317 @@ +OMAP2/3 Display Subsystem +------------------------- @@ -339,7 +339,7 @@ +- Not sure if needed + --- /dev/null -+++ kernel-2.6.28/Documentation/arm/OMAP/README ++++ kernel-maemo-2.6.28/Documentation/arm/OMAP/README @@ -0,0 +1,376 @@ + + README for ARM based OMAP processor from TI @@ -718,7 +718,7 @@ +The OMAP Linux Kernel Team +Dirk Behme --- /dev/null -+++ kernel-2.6.28/Documentation/arm/OMAP/gpio ++++ kernel-maemo-2.6.28/Documentation/arm/OMAP/gpio @@ -0,0 +1,285 @@ + + OMAP GPIO API's HowTo @@ -1006,7 +1006,7 @@ +Arnold +Dirk Behme --- /dev/null -+++ kernel-2.6.28/Documentation/arm/OMAP/omap_pm ++++ kernel-maemo-2.6.28/Documentation/arm/OMAP/omap_pm @@ -0,0 +1,204 @@ + +The OMAP PM interface @@ -1213,7 +1213,7 @@ + +13. omap_pm_pwrdm_inactive(struct powerdomain *pwrdm) --- /dev/null -+++ kernel-2.6.28/Documentation/arm/OMAP/ssi/ssi ++++ kernel-maemo-2.6.28/Documentation/arm/OMAP/ssi/ssi @@ -0,0 +1,225 @@ +OMAP SSI API's How To +===================== @@ -1440,8 +1440,8 @@ +================================================= +Contact: Carlos Chinea +Copyright (C) 2008 Nokia Corporation. ---- kernel-2.6.28.orig/Documentation/filesystems/ubifs.txt -+++ kernel-2.6.28/Documentation/filesystems/ubifs.txt +--- kernel-maemo-2.6.28.orig/Documentation/filesystems/ubifs.txt ++++ kernel-maemo-2.6.28/Documentation/filesystems/ubifs.txt @@ -79,13 +79,6 @@ (*) == default. @@ -1466,8 +1466,8 @@ Quick usage instructions ---- kernel-2.6.28.orig/Documentation/filesystems/vfat.txt -+++ kernel-2.6.28/Documentation/filesystems/vfat.txt +--- kernel-maemo-2.6.28.orig/Documentation/filesystems/vfat.txt ++++ kernel-maemo-2.6.28/Documentation/filesystems/vfat.txt @@ -132,6 +132,11 @@ If you want to use ATTR_RO as read-only flag even for the directory, set this option. @@ -1481,7 +1481,7 @@ TODO --- /dev/null -+++ kernel-2.6.28/Documentation/tidspbridge/README ++++ kernel-maemo-2.6.28/Documentation/tidspbridge/README @@ -0,0 +1,70 @@ + Linux DSP/BIOS Bridge release + @@ -1553,8 +1553,8 @@ +task might perform audio decompression (ADPCM, MPEG, CELP) on data received +from a GPP audio driver and then send the decompressed linear samples to a +digital-to-analog converter. ---- kernel-2.6.28.orig/MAINTAINERS -+++ kernel-2.6.28/MAINTAINERS +--- kernel-maemo-2.6.28.orig/MAINTAINERS ++++ kernel-maemo-2.6.28/MAINTAINERS @@ -2979,6 +2979,7 @@ P: Felipe Balbi M: felipe.balbi@nokia.com @@ -1563,8 +1563,8 @@ S: Maintained MYRICOM MYRI-10G 10GbE DRIVER (MYRI10GE) ---- kernel-2.6.28.orig/Makefile -+++ kernel-2.6.28/Makefile +--- kernel-maemo-2.6.28.orig/Makefile ++++ kernel-maemo-2.6.28/Makefile @@ -16,6 +16,9 @@ # o print "Entering directory ..."; MAKEFLAGS += -rR --no-print-directory @@ -1593,8 +1593,8 @@ # Architecture as present in compile.h UTS_MACHINE := $(ARCH) ---- kernel-2.6.28.orig/arch/arm/Kconfig -+++ kernel-2.6.28/arch/arm/Kconfig +--- kernel-maemo-2.6.28.orig/arch/arm/Kconfig ++++ kernel-maemo-2.6.28/arch/arm/Kconfig @@ -161,6 +161,12 @@ if OPROFILE @@ -1622,8 +1622,8 @@ endmenu source "fs/Kconfig" ---- kernel-2.6.28.orig/arch/arm/boot/compressed/Makefile -+++ kernel-2.6.28/arch/arm/boot/compressed/Makefile +--- kernel-maemo-2.6.28.orig/arch/arm/boot/compressed/Makefile ++++ kernel-maemo-2.6.28/arch/arm/boot/compressed/Makefile @@ -44,6 +44,10 @@ OBJS += head-sharpsl.o endif @@ -1636,7 +1636,7 @@ ifeq ($(CONFIG_CPU_CP15),y) OBJS += big-endian.o --- /dev/null -+++ kernel-2.6.28/arch/arm/boot/compressed/head-omap.S ++++ kernel-maemo-2.6.28/arch/arm/boot/compressed/head-omap.S @@ -0,0 +1,18 @@ +/* + * linux/arch/arm/boot/compressed/head-omap.S @@ -1656,8 +1656,8 @@ + mov r7, #(MACH_TYPE_OMAP_PERSEUS2 & ~0xf) + orr r7, r7, #(MACH_TYPE_OMAP_PERSEUS2 & 0xf) +#endif ---- kernel-2.6.28.orig/arch/arm/boot/compressed/head.S -+++ kernel-2.6.28/arch/arm/boot/compressed/head.S +--- kernel-maemo-2.6.28.orig/arch/arm/boot/compressed/head.S ++++ kernel-maemo-2.6.28/arch/arm/boot/compressed/head.S @@ -717,6 +717,9 @@ bl __armv7_mmu_cache_flush mov r0, #0 @@ -1702,7 +1702,7 @@ __armv5tej_mmu_cache_flush: --- /dev/null -+++ kernel-2.6.28/arch/arm/configs/n800_defconfig ++++ kernel-maemo-2.6.28/arch/arm/configs/n800_defconfig @@ -0,0 +1,1595 @@ +# +# Automatically generated make config: don't edit @@ -3300,7 +3300,7 @@ +CONFIG_HAS_IOPORT=y +CONFIG_HAS_DMA=y --- /dev/null -+++ kernel-2.6.28/arch/arm/configs/omap2_evm_defconfig ++++ kernel-maemo-2.6.28/arch/arm/configs/omap2_evm_defconfig @@ -0,0 +1,1255 @@ +# +# Automatically generated make config: don't edit @@ -4557,8 +4557,8 @@ +CONFIG_HAS_IOMEM=y +CONFIG_HAS_IOPORT=y +CONFIG_HAS_DMA=y ---- kernel-2.6.28.orig/arch/arm/configs/omap3_beagle_defconfig -+++ kernel-2.6.28/arch/arm/configs/omap3_beagle_defconfig +--- kernel-maemo-2.6.28.orig/arch/arm/configs/omap3_beagle_defconfig ++++ kernel-maemo-2.6.28/arch/arm/configs/omap3_beagle_defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit @@ -4832,7 +4832,7 @@ # CONFIG_EXT2_FS=y --- /dev/null -+++ kernel-2.6.28/arch/arm/configs/omap3_evm_defconfig ++++ kernel-maemo-2.6.28/arch/arm/configs/omap3_evm_defconfig @@ -0,0 +1,1448 @@ +# +# Automatically generated make config: don't edit @@ -6283,7 +6283,7 @@ +CONFIG_HAS_IOPORT=y +CONFIG_HAS_DMA=y --- /dev/null -+++ kernel-2.6.28/arch/arm/configs/omap3_pandora_defconfig ++++ kernel-maemo-2.6.28/arch/arm/configs/omap3_pandora_defconfig @@ -0,0 +1,1489 @@ +# +# Automatically generated make config: don't edit @@ -7774,8 +7774,8 @@ +CONFIG_HAS_IOMEM=y +CONFIG_HAS_IOPORT=y +CONFIG_HAS_DMA=y ---- kernel-2.6.28.orig/arch/arm/configs/omap_2430sdp_defconfig -+++ kernel-2.6.28/arch/arm/configs/omap_2430sdp_defconfig +--- kernel-maemo-2.6.28.orig/arch/arm/configs/omap_2430sdp_defconfig ++++ kernel-maemo-2.6.28/arch/arm/configs/omap_2430sdp_defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit @@ -8883,7 +8883,7 @@ CONFIG_CRC32=y # CONFIG_CRC7 is not set --- /dev/null -+++ kernel-2.6.28/arch/arm/configs/omap_3430sdp_defconfig ++++ kernel-maemo-2.6.28/arch/arm/configs/omap_3430sdp_defconfig @@ -0,0 +1,1515 @@ +# +# Automatically generated make config: don't edit @@ -10401,7 +10401,7 @@ +CONFIG_HAS_IOPORT=y +CONFIG_HAS_DMA=y --- /dev/null -+++ kernel-2.6.28/arch/arm/configs/omap_3430sdp_min_defconfig ++++ kernel-maemo-2.6.28/arch/arm/configs/omap_3430sdp_min_defconfig @@ -0,0 +1,1106 @@ +# +# Automatically generated make config: don't edit @@ -11510,7 +11510,7 @@ +CONFIG_HAS_IOPORT=y +CONFIG_HAS_DMA=y --- /dev/null -+++ kernel-2.6.28/arch/arm/configs/omap_h3_1710_defconfig ++++ kernel-maemo-2.6.28/arch/arm/configs/omap_h3_1710_defconfig @@ -0,0 +1,1316 @@ +# +# Automatically generated make config: don't edit @@ -12828,8 +12828,8 @@ +CONFIG_HAS_IOMEM=y +CONFIG_HAS_IOPORT=y +CONFIG_HAS_DMA=y ---- kernel-2.6.28.orig/arch/arm/configs/omap_ldp_defconfig -+++ kernel-2.6.28/arch/arm/configs/omap_ldp_defconfig +--- kernel-maemo-2.6.28.orig/arch/arm/configs/omap_ldp_defconfig ++++ kernel-maemo-2.6.28/arch/arm/configs/omap_ldp_defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit @@ -13456,8 +13456,8 @@ # CONFIG_CRC_ITU_T is not set CONFIG_CRC32=y # CONFIG_CRC7 is not set ---- kernel-2.6.28.orig/arch/arm/configs/overo_defconfig -+++ kernel-2.6.28/arch/arm/configs/overo_defconfig +--- kernel-maemo-2.6.28.orig/arch/arm/configs/overo_defconfig ++++ kernel-maemo-2.6.28/arch/arm/configs/overo_defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit @@ -13815,7 +13815,7 @@ # CONFIG_EXT2_FS=y --- /dev/null -+++ kernel-2.6.28/arch/arm/configs/rx51_tiny_defconfig ++++ kernel-maemo-2.6.28/arch/arm/configs/rx51_tiny_defconfig @@ -0,0 +1,1877 @@ +# +# Automatically generated make config: don't edit @@ -15695,7 +15695,7 @@ +CONFIG_HAS_IOPORT=y +CONFIG_HAS_DMA=y --- /dev/null -+++ kernel-2.6.28/arch/arm/configs/rx71_tiny_defconfig ++++ kernel-maemo-2.6.28/arch/arm/configs/rx71_tiny_defconfig @@ -0,0 +1,1839 @@ +# +# Automatically generated make config: don't edit @@ -17536,8 +17536,8 @@ +CONFIG_HAS_IOMEM=y +CONFIG_HAS_IOPORT=y +CONFIG_HAS_DMA=y ---- kernel-2.6.28.orig/arch/arm/include/asm/cache.h -+++ kernel-2.6.28/arch/arm/include/asm/cache.h +--- kernel-maemo-2.6.28.orig/arch/arm/include/asm/cache.h ++++ kernel-maemo-2.6.28/arch/arm/include/asm/cache.h @@ -4,7 +4,23 @@ #ifndef __ASMARM_CACHE_H #define __ASMARM_CACHE_H @@ -17563,8 +17563,8 @@ +#endif + #endif ---- kernel-2.6.28.orig/arch/arm/include/asm/elf.h -+++ kernel-2.6.28/arch/arm/include/asm/elf.h +--- kernel-maemo-2.6.28.orig/arch/arm/include/asm/elf.h ++++ kernel-maemo-2.6.28/arch/arm/include/asm/elf.h @@ -45,11 +45,13 @@ #define EF_ARM_HASENTRY 0x00000002 /* All */ #define EF_ARM_RELEXEC 0x00000001 /* All */ @@ -17595,8 +17595,8 @@ /* This is the location that an ET_DYN program is loaded if exec'ed. Typical use of this is to invoke "./ld.so someprog" to test out a new version of the loader. We need to make sure that it is out of the way of the program ---- kernel-2.6.28.orig/arch/arm/include/asm/hwcap.h -+++ kernel-2.6.28/arch/arm/include/asm/hwcap.h +--- kernel-maemo-2.6.28.orig/arch/arm/include/asm/hwcap.h ++++ kernel-maemo-2.6.28/arch/arm/include/asm/hwcap.h @@ -16,6 +16,9 @@ #define HWCAP_IWMMXT 512 #define HWCAP_CRUNCH 1024 @@ -17607,8 +17607,8 @@ #if defined(__KERNEL__) && !defined(__ASSEMBLY__) /* ---- kernel-2.6.28.orig/arch/arm/include/asm/io.h -+++ kernel-2.6.28/arch/arm/include/asm/io.h +--- kernel-maemo-2.6.28.orig/arch/arm/include/asm/io.h ++++ kernel-maemo-2.6.28/arch/arm/include/asm/io.h @@ -75,6 +75,12 @@ extern void __iounmap(volatile void __iomem *addr); @@ -17622,8 +17622,8 @@ * Bad read/write accesses... */ extern void __readwrite_bug(const char *fn); ---- kernel-2.6.28.orig/arch/arm/include/asm/mach/map.h -+++ kernel-2.6.28/arch/arm/include/asm/mach/map.h +--- kernel-maemo-2.6.28.orig/arch/arm/include/asm/mach/map.h ++++ kernel-maemo-2.6.28/arch/arm/include/asm/mach/map.h @@ -26,6 +26,7 @@ #define MT_HIGH_VECTORS 8 #define MT_MEMORY 9 @@ -17632,8 +17632,8 @@ #ifdef CONFIG_MMU extern void iotable_init(struct map_desc *, int); ---- kernel-2.6.28.orig/arch/arm/include/asm/page.h -+++ kernel-2.6.28/arch/arm/include/asm/page.h +--- kernel-maemo-2.6.28.orig/arch/arm/include/asm/page.h ++++ kernel-maemo-2.6.28/arch/arm/include/asm/page.h @@ -10,9 +10,11 @@ #ifndef _ASMARM_PAGE_H #define _ASMARM_PAGE_H @@ -17661,8 +17661,8 @@ #include #endif ---- kernel-2.6.28.orig/arch/arm/include/asm/pgtable.h -+++ kernel-2.6.28/arch/arm/include/asm/pgtable.h +--- kernel-maemo-2.6.28.orig/arch/arm/include/asm/pgtable.h ++++ kernel-maemo-2.6.28/arch/arm/include/asm/pgtable.h @@ -317,6 +317,7 @@ #define pmd_none(pmd) (!pmd_val(pmd)) #define pmd_present(pmd) (pmd_val(pmd)) @@ -17671,8 +17671,8 @@ #define copy_pmd(pmdpd,pmdps) \ do { \ ---- kernel-2.6.28.orig/arch/arm/include/asm/ptrace.h -+++ kernel-2.6.28/arch/arm/include/asm/ptrace.h +--- kernel-maemo-2.6.28.orig/arch/arm/include/asm/ptrace.h ++++ kernel-maemo-2.6.28/arch/arm/include/asm/ptrace.h @@ -27,6 +27,8 @@ /* PTRACE_SYSCALL is 24 */ #define PTRACE_GETCRUNCHREGS 25 @@ -17682,8 +17682,8 @@ /* * PSR bits ---- kernel-2.6.28.orig/arch/arm/include/asm/scatterlist.h -+++ kernel-2.6.28/arch/arm/include/asm/scatterlist.h +--- kernel-maemo-2.6.28.orig/arch/arm/include/asm/scatterlist.h ++++ kernel-maemo-2.6.28/arch/arm/include/asm/scatterlist.h @@ -24,4 +24,6 @@ #define sg_dma_address(sg) ((sg)->dma_address) #define sg_dma_len(sg) ((sg)->length) @@ -17691,8 +17691,8 @@ +#define ARCH_HAS_SG_CHAIN + #endif /* _ASMARM_SCATTERLIST_H */ ---- kernel-2.6.28.orig/arch/arm/include/asm/setup.h -+++ kernel-2.6.28/arch/arm/include/asm/setup.h +--- kernel-maemo-2.6.28.orig/arch/arm/include/asm/setup.h ++++ kernel-maemo-2.6.28/arch/arm/include/asm/setup.h @@ -136,6 +136,13 @@ __u8 adfsdrives; }; @@ -17719,8 +17719,8 @@ * DC21285 specific */ struct tag_memclk memclk; ---- kernel-2.6.28.orig/arch/arm/include/asm/thread_info.h -+++ kernel-2.6.28/arch/arm/include/asm/thread_info.h +--- kernel-maemo-2.6.28.orig/arch/arm/include/asm/thread_info.h ++++ kernel-maemo-2.6.28/arch/arm/include/asm/thread_info.h @@ -113,6 +113,8 @@ extern void iwmmxt_task_release(struct thread_info *); extern void iwmmxt_task_switch(struct thread_info *); @@ -17730,8 +17730,8 @@ #endif /* ---- kernel-2.6.28.orig/arch/arm/include/asm/tlb.h -+++ kernel-2.6.28/arch/arm/include/asm/tlb.h +--- kernel-maemo-2.6.28.orig/arch/arm/include/asm/tlb.h ++++ kernel-maemo-2.6.28/arch/arm/include/asm/tlb.h @@ -36,6 +36,8 @@ struct mmu_gather { struct mm_struct *mm; @@ -17784,8 +17784,8 @@ } #define tlb_remove_page(tlb,page) free_page_and_swap_cache(page) ---- kernel-2.6.28.orig/arch/arm/include/asm/ucontext.h -+++ kernel-2.6.28/arch/arm/include/asm/ucontext.h +--- kernel-maemo-2.6.28.orig/arch/arm/include/asm/ucontext.h ++++ kernel-maemo-2.6.28/arch/arm/include/asm/ucontext.h @@ -59,23 +59,19 @@ #endif /* CONFIG_IWMMXT */ @@ -17826,8 +17826,8 @@ struct vfp_sigframe vfp; #endif /* Something that isn't a valid magic number for any coprocessor. */ ---- kernel-2.6.28.orig/arch/arm/include/asm/user.h -+++ kernel-2.6.28/arch/arm/include/asm/user.h +--- kernel-maemo-2.6.28.orig/arch/arm/include/asm/user.h ++++ kernel-maemo-2.6.28/arch/arm/include/asm/user.h @@ -81,4 +81,13 @@ #define HOST_TEXT_START_ADDR (u.start_code) #define HOST_STACK_END_ADDR (u.start_stack + u.u_ssize * NBPG) @@ -17842,8 +17842,8 @@ +}; + #endif /* _ARM_USER_H */ ---- kernel-2.6.28.orig/arch/arm/kernel/elf.c -+++ kernel-2.6.28/arch/arm/kernel/elf.c +--- kernel-maemo-2.6.28.orig/arch/arm/kernel/elf.c ++++ kernel-maemo-2.6.28/arch/arm/kernel/elf.c @@ -74,9 +74,9 @@ */ int arm_elf_read_implies_exec(const struct elf32_hdr *x, int executable_stack) @@ -17856,8 +17856,8 @@ return 1; return 0; } ---- kernel-2.6.28.orig/arch/arm/kernel/entry-armv.S -+++ kernel-2.6.28/arch/arm/kernel/entry-armv.S +--- kernel-maemo-2.6.28.orig/arch/arm/kernel/entry-armv.S ++++ kernel-maemo-2.6.28/arch/arm/kernel/entry-armv.S @@ -650,6 +650,7 @@ no_fp: mov pc, lr @@ -17866,8 +17866,8 @@ mov r0, sp adr lr, ret_from_exception b do_undefinstr ---- kernel-2.6.28.orig/arch/arm/kernel/head.S -+++ kernel-2.6.28/arch/arm/kernel/head.S +--- kernel-maemo-2.6.28.orig/arch/arm/kernel/head.S ++++ kernel-maemo-2.6.28/arch/arm/kernel/head.S @@ -282,7 +282,7 @@ .endif str r6, [r0] @@ -17877,8 +17877,8 @@ ldr r7, [r10, #PROCINFO_IO_MMUFLAGS] @ io_mmuflags /* * Map in IO space for serial debugging. ---- kernel-2.6.28.orig/arch/arm/kernel/irq.c -+++ kernel-2.6.28/arch/arm/kernel/irq.c +--- kernel-maemo-2.6.28.orig/arch/arm/kernel/irq.c ++++ kernel-maemo-2.6.28/arch/arm/kernel/irq.c @@ -98,12 +98,6 @@ return 0; } @@ -17920,8 +17920,8 @@ init_arch_irq(); } ---- kernel-2.6.28.orig/arch/arm/kernel/module.c -+++ kernel-2.6.28/arch/arm/kernel/module.c +--- kernel-maemo-2.6.28.orig/arch/arm/kernel/module.c ++++ kernel-maemo-2.6.28/arch/arm/kernel/module.c @@ -132,6 +132,21 @@ *(u32 *)loc |= offset & 0x00ffffff; break; @@ -17944,8 +17944,8 @@ default: printk(KERN_ERR "%s: unknown relocation: %u\n", module->name, ELF32_R_TYPE(rel->r_info)); ---- kernel-2.6.28.orig/arch/arm/kernel/process.c -+++ kernel-2.6.28/arch/arm/kernel/process.c +--- kernel-maemo-2.6.28.orig/arch/arm/kernel/process.c ++++ kernel-maemo-2.6.28/arch/arm/kernel/process.c @@ -29,6 +29,7 @@ #include #include @@ -18004,8 +18004,8 @@ * fill in the fpe structure for a core dump... */ int dump_fpu (struct pt_regs *regs, struct user_fp *fp) ---- kernel-2.6.28.orig/arch/arm/kernel/ptrace.c -+++ kernel-2.6.28/arch/arm/kernel/ptrace.c +--- kernel-maemo-2.6.28.orig/arch/arm/kernel/ptrace.c ++++ kernel-maemo-2.6.28/arch/arm/kernel/ptrace.c @@ -653,6 +653,54 @@ } #endif @@ -18078,8 +18078,8 @@ default: ret = ptrace_request(child, request, addr, data); break; ---- kernel-2.6.28.orig/arch/arm/kernel/setup.c -+++ kernel-2.6.28/arch/arm/kernel/setup.c +--- kernel-maemo-2.6.28.orig/arch/arm/kernel/setup.c ++++ kernel-maemo-2.6.28/arch/arm/kernel/setup.c @@ -772,6 +772,10 @@ "java", "iwmmxt", @@ -18091,8 +18091,8 @@ NULL }; ---- kernel-2.6.28.orig/arch/arm/kernel/signal.c -+++ kernel-2.6.28/arch/arm/kernel/signal.c +--- kernel-maemo-2.6.28.orig/arch/arm/kernel/signal.c ++++ kernel-maemo-2.6.28/arch/arm/kernel/signal.c @@ -196,6 +196,67 @@ #endif @@ -18183,8 +18183,8 @@ #endif __put_user_error(0, &aux->end_magic, err); ---- kernel-2.6.28.orig/arch/arm/kernel/traps.c -+++ kernel-2.6.28/arch/arm/kernel/traps.c +--- kernel-maemo-2.6.28.orig/arch/arm/kernel/traps.c ++++ kernel-maemo-2.6.28/arch/arm/kernel/traps.c @@ -404,12 +404,14 @@ static inline void do_cache_op(unsigned long start, unsigned long end, int flags) @@ -18209,8 +18209,8 @@ } /* ---- kernel-2.6.28.orig/arch/arm/kernel/vmlinux.lds.S -+++ kernel-2.6.28/arch/arm/kernel/vmlinux.lds.S +--- kernel-maemo-2.6.28.orig/arch/arm/kernel/vmlinux.lds.S ++++ kernel-maemo-2.6.28/arch/arm/kernel/vmlinux.lds.S @@ -6,6 +6,7 @@ #include #include @@ -18268,8 +18268,8 @@ __nosave_end = .; /* ---- kernel-2.6.28.orig/arch/arm/mach-davinci/usb.c -+++ kernel-2.6.28/arch/arm/mach-davinci/usb.c +--- kernel-maemo-2.6.28.orig/arch/arm/mach-davinci/usb.c ++++ kernel-maemo-2.6.28/arch/arm/mach-davinci/usb.c @@ -76,29 +76,6 @@ .num_resources = ARRAY_SIZE(usb_resources), }; @@ -18300,8 +18300,8 @@ void __init setup_usb(unsigned mA, unsigned potpgt_msec) { usb_data.power = mA / 2; ---- kernel-2.6.28.orig/arch/arm/mach-omap1/Kconfig -+++ kernel-2.6.28/arch/arm/mach-omap1/Kconfig +--- kernel-maemo-2.6.28.orig/arch/arm/mach-omap1/Kconfig ++++ kernel-maemo-2.6.28/arch/arm/mach-omap1/Kconfig @@ -38,7 +38,6 @@ config MACH_OMAP_H3 bool "TI H3 Support" @@ -18310,8 +18310,8 @@ help TI OMAP 1710 H3 board support. Say Y here if you have such a board. ---- kernel-2.6.28.orig/arch/arm/mach-omap1/Makefile -+++ kernel-2.6.28/arch/arm/mach-omap1/Makefile +--- kernel-maemo-2.6.28.orig/arch/arm/mach-omap1/Makefile ++++ kernel-maemo-2.6.28/arch/arm/mach-omap1/Makefile @@ -13,6 +13,12 @@ # Power Management obj-$(CONFIG_PM) += pm.o sleep.o @@ -18325,8 +18325,8 @@ led-y := leds.o # Specific board support ---- kernel-2.6.28.orig/arch/arm/mach-omap1/board-fsample.c -+++ kernel-2.6.28/arch/arm/mach-omap1/board-fsample.c +--- kernel-maemo-2.6.28.orig/arch/arm/mach-omap1/board-fsample.c ++++ kernel-maemo-2.6.28/arch/arm/mach-omap1/board-fsample.c @@ -205,7 +205,7 @@ static int nand_dev_ready(struct omap_nand_platform_data *data) @@ -18348,8 +18348,8 @@ omap_cfg_reg(L3_1610_FLASH_CS2B_OE); omap_cfg_reg(M8_1610_FLASH_CS2B_WE); ---- kernel-2.6.28.orig/arch/arm/mach-omap1/board-h2-mmc.c -+++ kernel-2.6.28/arch/arm/mach-omap1/board-h2-mmc.c +--- kernel-maemo-2.6.28.orig/arch/arm/mach-omap1/board-h2-mmc.c ++++ kernel-maemo-2.6.28/arch/arm/mach-omap1/board-h2-mmc.c @@ -12,90 +12,68 @@ * published by the Free Software Foundation. */ @@ -18481,8 +18481,8 @@ -{ -} #endif ---- kernel-2.6.28.orig/arch/arm/mach-omap1/board-h2.c -+++ kernel-2.6.28/arch/arm/mach-omap1/board-h2.c +--- kernel-maemo-2.6.28.orig/arch/arm/mach-omap1/board-h2.c ++++ kernel-maemo-2.6.28/arch/arm/mach-omap1/board-h2.c @@ -20,6 +20,7 @@ */ @@ -18668,8 +18668,8 @@ h2_irda_data.transceiver_mode = h2_transceiver_mode; } #endif ---- kernel-2.6.28.orig/arch/arm/mach-omap1/board-h3-mmc.c -+++ kernel-2.6.28/arch/arm/mach-omap1/board-h3-mmc.c +--- kernel-maemo-2.6.28.orig/arch/arm/mach-omap1/board-h3-mmc.c ++++ kernel-maemo-2.6.28/arch/arm/mach-omap1/board-h3-mmc.c @@ -12,94 +12,55 @@ * published by the Free Software Foundation. */ @@ -18802,8 +18802,8 @@ -{ -} #endif ---- kernel-2.6.28.orig/arch/arm/mach-omap1/board-h3.c -+++ kernel-2.6.28/arch/arm/mach-omap1/board-h3.c +--- kernel-maemo-2.6.28.orig/arch/arm/mach-omap1/board-h3.c ++++ kernel-maemo-2.6.28/arch/arm/mach-omap1/board-h3.c @@ -26,8 +26,13 @@ #include #include @@ -19225,8 +19225,8 @@ printk("Error requesting gpio 40 for smc91x irq\n"); return; } ---- kernel-2.6.28.orig/arch/arm/mach-omap1/board-innovator.c -+++ kernel-2.6.28/arch/arm/mach-omap1/board-innovator.c +--- kernel-maemo-2.6.28.orig/arch/arm/mach-omap1/board-innovator.c ++++ kernel-maemo-2.6.28/arch/arm/mach-omap1/board-innovator.c @@ -37,8 +37,7 @@ #include #include @@ -19370,8 +19370,8 @@ } static void __init innovator_map_io(void) ---- kernel-2.6.28.orig/arch/arm/mach-omap1/board-nokia770.c -+++ kernel-2.6.28/arch/arm/mach-omap1/board-nokia770.c +--- kernel-maemo-2.6.28.orig/arch/arm/mach-omap1/board-nokia770.c ++++ kernel-maemo-2.6.28/arch/arm/mach-omap1/board-nokia770.c @@ -19,6 +19,7 @@ #include #include @@ -19594,8 +19594,8 @@ } static void __init omap_nokia770_map_io(void) ---- kernel-2.6.28.orig/arch/arm/mach-omap1/board-osk.c -+++ kernel-2.6.28/arch/arm/mach-omap1/board-osk.c +--- kernel-maemo-2.6.28.orig/arch/arm/mach-omap1/board-osk.c ++++ kernel-maemo-2.6.28/arch/arm/mach-omap1/board-osk.c @@ -51,8 +51,6 @@ #include #include @@ -19769,8 +19769,8 @@ platform_add_devices(mistral_devices, ARRAY_SIZE(mistral_devices)); } #else ---- kernel-2.6.28.orig/arch/arm/mach-omap1/board-palmte.c -+++ kernel-2.6.28/arch/arm/mach-omap1/board-palmte.c +--- kernel-maemo-2.6.28.orig/arch/arm/mach-omap1/board-palmte.c ++++ kernel-maemo-2.6.28/arch/arm/mach-omap1/board-palmte.c @@ -42,8 +42,7 @@ #include #include @@ -19918,8 +19918,8 @@ palmte_misc_gpio_setup(); omap_serial_init(); omap_register_i2c_bus(1, 100, NULL, 0); ---- kernel-2.6.28.orig/arch/arm/mach-omap1/board-palmtt.c -+++ kernel-2.6.28/arch/arm/mach-omap1/board-palmtt.c +--- kernel-maemo-2.6.28.orig/arch/arm/mach-omap1/board-palmtt.c ++++ kernel-maemo-2.6.28/arch/arm/mach-omap1/board-palmtt.c @@ -30,7 +30,6 @@ #include @@ -19998,8 +19998,8 @@ } static const struct ads7846_platform_data palmtt_ts_info = { ---- kernel-2.6.28.orig/arch/arm/mach-omap1/board-palmz71.c -+++ kernel-2.6.28/arch/arm/mach-omap1/board-palmz71.c +--- kernel-maemo-2.6.28.orig/arch/arm/mach-omap1/board-palmz71.c ++++ kernel-maemo-2.6.28/arch/arm/mach-omap1/board-palmz71.c @@ -32,7 +32,6 @@ #include #include @@ -20146,8 +20146,8 @@ } } ---- kernel-2.6.28.orig/arch/arm/mach-omap1/board-perseus2.c -+++ kernel-2.6.28/arch/arm/mach-omap1/board-perseus2.c +--- kernel-maemo-2.6.28.orig/arch/arm/mach-omap1/board-perseus2.c ++++ kernel-maemo-2.6.28/arch/arm/mach-omap1/board-perseus2.c @@ -205,7 +205,7 @@ static int nand_dev_ready(struct omap_nand_platform_data *data) @@ -20169,8 +20169,8 @@ omap_cfg_reg(L3_1610_FLASH_CS2B_OE); omap_cfg_reg(M8_1610_FLASH_CS2B_WE); ---- kernel-2.6.28.orig/arch/arm/mach-omap1/board-sx1-mmc.c -+++ kernel-2.6.28/arch/arm/mach-omap1/board-sx1-mmc.c +--- kernel-maemo-2.6.28.orig/arch/arm/mach-omap1/board-sx1-mmc.c ++++ kernel-maemo-2.6.28/arch/arm/mach-omap1/board-sx1-mmc.c @@ -12,30 +12,20 @@ * published by the Free Software Foundation. */ @@ -20290,8 +20290,8 @@ -{ -} #endif ---- kernel-2.6.28.orig/arch/arm/mach-omap1/board-sx1.c -+++ kernel-2.6.28/arch/arm/mach-omap1/board-sx1.c +--- kernel-maemo-2.6.28.orig/arch/arm/mach-omap1/board-sx1.c ++++ kernel-maemo-2.6.28/arch/arm/mach-omap1/board-sx1.c @@ -33,14 +33,13 @@ #include @@ -20400,8 +20400,8 @@ } /*----------------------------------------*/ static void __init omap_sx1_init_irq(void) ---- kernel-2.6.28.orig/arch/arm/mach-omap1/board-voiceblue.c -+++ kernel-2.6.28/arch/arm/mach-omap1/board-voiceblue.c +--- kernel-maemo-2.6.28.orig/arch/arm/mach-omap1/board-voiceblue.c ++++ kernel-maemo-2.6.28/arch/arm/mach-omap1/board-voiceblue.c @@ -15,13 +15,13 @@ #include #include @@ -20520,8 +20520,8 @@ } void voiceblue_reset(void) ---- kernel-2.6.28.orig/arch/arm/mach-omap1/clock.c -+++ kernel-2.6.28/arch/arm/mach-omap1/clock.c +--- kernel-maemo-2.6.28.orig/arch/arm/mach-omap1/clock.c ++++ kernel-maemo-2.6.28/arch/arm/mach-omap1/clock.c @@ -34,27 +34,50 @@ * Omap1 specific clock functions *-------------------------------------------------------------------------*/ @@ -20836,8 +20836,8 @@ printk(KERN_INFO "Clocking rate (xtal/DPLL1/MPU): " "%ld.%01ld/%ld.%01ld/%ld.%01ld MHz\n", ck_ref.rate / 1000000, (ck_ref.rate / 100000) % 10, ---- kernel-2.6.28.orig/arch/arm/mach-omap1/clock.h -+++ kernel-2.6.28/arch/arm/mach-omap1/clock.h +--- kernel-maemo-2.6.28.orig/arch/arm/mach-omap1/clock.h ++++ kernel-maemo-2.6.28/arch/arm/mach-omap1/clock.h @@ -15,16 +15,22 @@ static int omap1_clk_enable_generic(struct clk * clk); @@ -21268,8 +21268,8 @@ ALWAYS_ENABLED, .parent = &armper_ck.clk, .recalc = &followparent_recalc, ---- kernel-2.6.28.orig/arch/arm/mach-omap1/devices.c -+++ kernel-2.6.28/arch/arm/mach-omap1/devices.c +--- kernel-maemo-2.6.28.orig/arch/arm/mach-omap1/devices.c ++++ kernel-maemo-2.6.28/arch/arm/mach-omap1/devices.c @@ -22,6 +22,7 @@ #include #include @@ -21383,8 +21383,8 @@ #if defined(CONFIG_OMAP_STI) #define OMAP1_STI_BASE 0xfffea000 ---- kernel-2.6.28.orig/arch/arm/mach-omap1/fpga.c -+++ kernel-2.6.28/arch/arm/mach-omap1/fpga.c +--- kernel-maemo-2.6.28.orig/arch/arm/mach-omap1/fpga.c ++++ kernel-maemo-2.6.28/arch/arm/mach-omap1/fpga.c @@ -177,9 +177,9 @@ * NOTE: For general GPIO/MPUIO access and interrupts, please see * gpio.[ch] @@ -21398,8 +21398,8 @@ set_irq_chained_handler(OMAP1510_INT_FPGA, innovator_fpga_IRQ_demux); } ---- kernel-2.6.28.orig/arch/arm/mach-omap1/id.c -+++ kernel-2.6.28/arch/arm/mach-omap1/id.c +--- kernel-maemo-2.6.28.orig/arch/arm/mach-omap1/id.c ++++ kernel-maemo-2.6.28/arch/arm/mach-omap1/id.c @@ -15,6 +15,7 @@ #include #include @@ -21524,8 +21524,8 @@ system_serial_high); } ---- kernel-2.6.28.orig/arch/arm/mach-omap1/leds-h2p2-debug.c -+++ kernel-2.6.28/arch/arm/mach-omap1/leds-h2p2-debug.c +--- kernel-maemo-2.6.28.orig/arch/arm/mach-omap1/leds-h2p2-debug.c ++++ kernel-maemo-2.6.28/arch/arm/mach-omap1/leds-h2p2-debug.c @@ -65,8 +65,8 @@ /* all leds off during suspend or shutdown */ @@ -21564,8 +21564,8 @@ goto done; } ---- kernel-2.6.28.orig/arch/arm/mach-omap1/leds-osk.c -+++ kernel-2.6.28/arch/arm/mach-omap1/leds-osk.c +--- kernel-maemo-2.6.28.orig/arch/arm/mach-omap1/leds-osk.c ++++ kernel-maemo-2.6.28/arch/arm/mach-omap1/leds-osk.c @@ -44,8 +44,8 @@ green = 1; /* else both sides are disabled */ @@ -21577,8 +21577,8 @@ } #endif ---- kernel-2.6.28.orig/arch/arm/mach-omap1/leds.c -+++ kernel-2.6.28/arch/arm/mach-omap1/leds.c +--- kernel-maemo-2.6.28.orig/arch/arm/mach-omap1/leds.c ++++ kernel-maemo-2.6.28/arch/arm/mach-omap1/leds.c @@ -47,14 +47,14 @@ * that's a different kind of LED (just one color at a time). */ @@ -21598,8 +21598,8 @@ else printk(KERN_WARNING "LED: can't get MPUIO4/green?\n"); } ---- kernel-2.6.28.orig/arch/arm/mach-omap1/mailbox.c -+++ kernel-2.6.28/arch/arm/mach-omap1/mailbox.c +--- kernel-maemo-2.6.28.orig/arch/arm/mach-omap1/mailbox.c ++++ kernel-maemo-2.6.28/arch/arm/mach-omap1/mailbox.c @@ -1,7 +1,7 @@ /* * Mailbox reservation modules for DSP @@ -21691,8 +21691,8 @@ +MODULE_DESCRIPTION("omap mailbox: omap1 architecture specific functions"); +MODULE_AUTHOR("Hiroshi DOYU" ); +MODULE_ALIAS("platform:"DRV_NAME); ---- kernel-2.6.28.orig/arch/arm/mach-omap1/mcbsp.c -+++ kernel-2.6.28/arch/arm/mach-omap1/mcbsp.c +--- kernel-maemo-2.6.28.orig/arch/arm/mach-omap1/mcbsp.c ++++ kernel-maemo-2.6.28/arch/arm/mach-omap1/mcbsp.c @@ -26,81 +26,8 @@ #define DPS_RSTCT2_PER_EN (1 << 0) #define DSP_RSTCT2_WD_PER_EN (1 << 1) @@ -21835,7 +21835,7 @@ omap_mcbsp_count = OMAP730_MCBSP_PDATA_SZ; if (cpu_is_omap15xx()) --- /dev/null -+++ kernel-2.6.28/arch/arm/mach-omap1/mmu.c ++++ kernel-maemo-2.6.28/arch/arm/mach-omap1/mmu.c @@ -0,0 +1,351 @@ +/* + * linux/arch/arm/mach-omap1/mmu.c @@ -22189,7 +22189,7 @@ +}; +EXPORT_SYMBOL_GPL(omap1_mmu_ops); --- /dev/null -+++ kernel-2.6.28/arch/arm/mach-omap1/mmu.h ++++ kernel-maemo-2.6.28/arch/arm/mach-omap1/mmu.h @@ -0,0 +1,119 @@ +#ifndef __MACH_OMAP1_MMU_H +#define __MACH_OMAP1_MMU_H @@ -22310,8 +22310,8 @@ +} + +#endif /* __MACH_OMAP1_MMU_H */ ---- kernel-2.6.28.orig/arch/arm/mach-omap1/pm.c -+++ kernel-2.6.28/arch/arm/mach-omap1/pm.c +--- kernel-maemo-2.6.28.orig/arch/arm/mach-omap1/pm.c ++++ kernel-maemo-2.6.28/arch/arm/mach-omap1/pm.c @@ -226,7 +226,8 @@ { unsigned long arg0 = 0, arg1 = 0; @@ -22332,8 +22332,8 @@ } #if defined(DEBUG) && defined(CONFIG_PROC_FS) ---- kernel-2.6.28.orig/arch/arm/mach-omap1/serial.c -+++ kernel-2.6.28/arch/arm/mach-omap1/serial.c +--- kernel-maemo-2.6.28.orig/arch/arm/mach-omap1/serial.c ++++ kernel-maemo-2.6.28/arch/arm/mach-omap1/serial.c @@ -244,22 +244,22 @@ { int ret; @@ -22362,8 +22362,8 @@ } static int __init omap_serial_wakeup_init(void) ---- kernel-2.6.28.orig/arch/arm/mach-omap2/Kconfig -+++ kernel-2.6.28/arch/arm/mach-omap2/Kconfig +--- kernel-maemo-2.6.28.orig/arch/arm/mach-omap2/Kconfig ++++ kernel-maemo-2.6.28/arch/arm/mach-omap2/Kconfig @@ -10,10 +10,13 @@ depends on ARCH_OMAP24XX select OMAP_DM_TIMER @@ -22520,8 +22520,8 @@ + depends on VIDEO_MACH_RX51 + help + Say Y here if you want to support the rx51 camera button ---- kernel-2.6.28.orig/arch/arm/mach-omap2/Makefile -+++ kernel-2.6.28/arch/arm/mach-omap2/Makefile +--- kernel-maemo-2.6.28.orig/arch/arm/mach-omap2/Makefile ++++ kernel-maemo-2.6.28/arch/arm/mach-omap2/Makefile @@ -3,9 +3,9 @@ # @@ -22649,7 +22649,7 @@ +obj-$(CONFIG_RX51_CAMERA_BUTTON) += rx51_camera_btn.o --- /dev/null -+++ kernel-2.6.28/arch/arm/mach-omap2/board-2430sdp-flash.c ++++ kernel-maemo-2.6.28/arch/arm/mach-omap2/board-2430sdp-flash.c @@ -0,0 +1,185 @@ +/* + * linux/arch/arm/mach-omap2/board-2430sdp-flash.c @@ -22836,8 +22836,8 @@ + } + } +} ---- kernel-2.6.28.orig/arch/arm/mach-omap2/board-2430sdp.c -+++ kernel-2.6.28/arch/arm/mach-omap2/board-2430sdp.c +--- kernel-maemo-2.6.28.orig/arch/arm/mach-omap2/board-2430sdp.c ++++ kernel-maemo-2.6.28/arch/arm/mach-omap2/board-2430sdp.c @@ -19,9 +19,13 @@ #include #include @@ -23140,7 +23140,7 @@ static void __init omap_2430sdp_map_io(void) --- /dev/null -+++ kernel-2.6.28/arch/arm/mach-omap2/board-3430sdp-flash.c ++++ kernel-maemo-2.6.28/arch/arm/mach-omap2/board-3430sdp-flash.c @@ -0,0 +1,269 @@ +/* + * linux/arch/arm/mach-omap2/board-3430sdp-flash.c @@ -23412,7 +23412,7 @@ + } +} --- /dev/null -+++ kernel-2.6.28/arch/arm/mach-omap2/board-3430sdp.c ++++ kernel-maemo-2.6.28/arch/arm/mach-omap2/board-3430sdp.c @@ -0,0 +1,508 @@ +/* + * linux/arch/arm/mach-omap2/board-3430sdp.c @@ -23923,7 +23923,7 @@ + .timer = &omap_timer, +MACHINE_END --- /dev/null -+++ kernel-2.6.28/arch/arm/mach-omap2/board-apollon-keys.c ++++ kernel-maemo-2.6.28/arch/arm/mach-omap2/board-apollon-keys.c @@ -0,0 +1,101 @@ +/* + * linux/arch/arm/mach-omap2/board-apollon-keys.c @@ -24027,7 +24027,7 @@ + +arch_initcall(omap_apollon_keys_init); --- /dev/null -+++ kernel-2.6.28/arch/arm/mach-omap2/board-apollon-mmc.c ++++ kernel-maemo-2.6.28/arch/arm/mach-omap2/board-apollon-mmc.c @@ -0,0 +1,101 @@ +/* + * linux/arch/arm/mach-omap2/board-apollon-mmc.c @@ -24130,8 +24130,8 @@ +} + +#endif /* CONFIG_MMC_OMAP */ ---- kernel-2.6.28.orig/arch/arm/mach-omap2/board-apollon.c -+++ kernel-2.6.28/arch/arm/mach-omap2/board-apollon.c +--- kernel-maemo-2.6.28.orig/arch/arm/mach-omap2/board-apollon.c ++++ kernel-maemo-2.6.28/arch/arm/mach-omap2/board-apollon.c @@ -1,10 +1,10 @@ /* * linux/arch/arm/mach-omap2/board-apollon.c @@ -24627,8 +24627,8 @@ } static void __init omap_apollon_map_io(void) ---- kernel-2.6.28.orig/arch/arm/mach-omap2/board-generic.c -+++ kernel-2.6.28/arch/arm/mach-omap2/board-generic.c +--- kernel-maemo-2.6.28.orig/arch/arm/mach-omap2/board-generic.c ++++ kernel-maemo-2.6.28/arch/arm/mach-omap2/board-generic.c @@ -33,7 +33,7 @@ static void __init omap_generic_init_irq(void) @@ -24669,7 +24669,7 @@ static void __init omap_generic_map_io(void) --- /dev/null -+++ kernel-2.6.28/arch/arm/mach-omap2/board-h4-mmc.c ++++ kernel-maemo-2.6.28/arch/arm/mach-omap2/board-h4-mmc.c @@ -0,0 +1,272 @@ +/* + * linux/arch/arm/mach-omap2/board-h4-mmc.c @@ -24943,8 +24943,8 @@ + +#endif + ---- kernel-2.6.28.orig/arch/arm/mach-omap2/board-h4.c -+++ kernel-2.6.28/arch/arm/mach-omap2/board-h4.c +--- kernel-maemo-2.6.28.orig/arch/arm/mach-omap2/board-h4.c ++++ kernel-maemo-2.6.28/arch/arm/mach-omap2/board-h4.c @@ -18,11 +18,22 @@ #include #include @@ -25509,8 +25509,8 @@ } static void __init omap_h4_map_io(void) ---- kernel-2.6.28.orig/arch/arm/mach-omap2/board-ldp.c -+++ kernel-2.6.28/arch/arm/mach-omap2/board-ldp.c +--- kernel-maemo-2.6.28.orig/arch/arm/mach-omap2/board-ldp.c ++++ kernel-maemo-2.6.28/arch/arm/mach-omap2/board-ldp.c @@ -16,11 +16,13 @@ #include #include @@ -26032,7 +26032,7 @@ static void __init omap_ldp_map_io(void) --- /dev/null -+++ kernel-2.6.28/arch/arm/mach-omap2/board-n800-audio.c ++++ kernel-maemo-2.6.28/arch/arm/mach-omap2/board-n800-audio.c @@ -0,0 +1,88 @@ +/* + * linux/arch/arm/mach-omap2/board-n800-audio.c @@ -26123,7 +26123,7 @@ + +#endif /* CONFIG_OMAP_DSP */ --- /dev/null -+++ kernel-2.6.28/arch/arm/mach-omap2/board-n800-bt.c ++++ kernel-maemo-2.6.28/arch/arm/mach-omap2/board-n800-bt.c @@ -0,0 +1,42 @@ +/* + * Nokia N800 platform-specific data for Bluetooth @@ -26168,7 +26168,7 @@ +} + --- /dev/null -+++ kernel-2.6.28/arch/arm/mach-omap2/board-n800-camera.c ++++ kernel-maemo-2.6.28/arch/arm/mach-omap2/board-n800-camera.c @@ -0,0 +1,376 @@ +/* + * arch/arm/mach-omap2/board-n800-camera.c @@ -26547,7 +26547,7 @@ + +#endif --- /dev/null -+++ kernel-2.6.28/arch/arm/mach-omap2/board-n800-dsp.c ++++ kernel-maemo-2.6.28/arch/arm/mach-omap2/board-n800-dsp.c @@ -0,0 +1,155 @@ +/* + * linux/arch/arm/mach-omap2/board-n800-dsp.c @@ -26705,7 +26705,7 @@ +void __init n800_dsp_init(void) { } +#endif /* CONFIG_OMAP_DSP */ --- /dev/null -+++ kernel-2.6.28/arch/arm/mach-omap2/board-n800-flash.c ++++ kernel-maemo-2.6.28/arch/arm/mach-omap2/board-n800-flash.c @@ -0,0 +1,365 @@ +/* + * linux/arch/arm/mach-omap2/board-n800-flash.c @@ -27073,7 +27073,7 @@ + } +} --- /dev/null -+++ kernel-2.6.28/arch/arm/mach-omap2/board-n800-mmc.c ++++ kernel-maemo-2.6.28/arch/arm/mach-omap2/board-n800-mmc.c @@ -0,0 +1,374 @@ +/* + * linux/arch/arm/mach-omap2/board-n800-mmc.c @@ -27450,7 +27450,7 @@ + +#endif --- /dev/null -+++ kernel-2.6.28/arch/arm/mach-omap2/board-n800-usb.c ++++ kernel-maemo-2.6.28/arch/arm/mach-omap2/board-n800-usb.c @@ -0,0 +1,175 @@ +/* + * linux/arch/arm/mach-omap2/board-n800-usb.c @@ -27628,7 +27628,7 @@ + gpio_free(GPIO_TUSB_ENABLE); +} --- /dev/null -+++ kernel-2.6.28/arch/arm/mach-omap2/board-n800.c ++++ kernel-maemo-2.6.28/arch/arm/mach-omap2/board-n800.c @@ -0,0 +1,761 @@ +/* + * linux/arch/arm/mach-omap2/board-n800.c @@ -28392,7 +28392,7 @@ + .timer = &omap_timer, +MACHINE_END --- /dev/null -+++ kernel-2.6.28/arch/arm/mach-omap2/board-n800.h ++++ kernel-maemo-2.6.28/arch/arm/mach-omap2/board-n800.h @@ -0,0 +1,23 @@ +/* + * linux/arch/arm/mach-omap2/board-n800.h @@ -28418,7 +28418,7 @@ + +#endif --- /dev/null -+++ kernel-2.6.28/arch/arm/mach-omap2/board-n810.c ++++ kernel-maemo-2.6.28/arch/arm/mach-omap2/board-n810.c @@ -0,0 +1,47 @@ +/* + * linux/arch/arm/mach-omap2/board-n810.c @@ -28468,7 +28468,7 @@ + .timer = &omap_timer, +MACHINE_END --- /dev/null -+++ kernel-2.6.28/arch/arm/mach-omap2/board-omap-bt.c ++++ kernel-maemo-2.6.28/arch/arm/mach-omap2/board-omap-bt.c @@ -0,0 +1,98 @@ +/* + * Nokia RX-51 platform-specific data for Bluetooth @@ -28569,7 +28569,7 @@ + } +} --- /dev/null -+++ kernel-2.6.28/arch/arm/mach-omap2/board-omap2evm.c ++++ kernel-maemo-2.6.28/arch/arm/mach-omap2/board-omap2evm.c @@ -0,0 +1,382 @@ +/* + * linux/arch/arm/mach-omap2/board-omap2evm.c @@ -28953,8 +28953,8 @@ + .init_machine = omap2_evm_init, + .timer = &omap_timer, +MACHINE_END ---- kernel-2.6.28.orig/arch/arm/mach-omap2/board-omap3beagle.c -+++ kernel-2.6.28/arch/arm/mach-omap2/board-omap3beagle.c +--- kernel-maemo-2.6.28.orig/arch/arm/mach-omap2/board-omap3beagle.c ++++ kernel-maemo-2.6.28/arch/arm/mach-omap2/board-omap3beagle.c @@ -28,6 +28,8 @@ #include #include @@ -29163,7 +29163,7 @@ static void __init omap3_beagle_map_io(void) --- /dev/null -+++ kernel-2.6.28/arch/arm/mach-omap2/board-omap3evm-flash.c ++++ kernel-maemo-2.6.28/arch/arm/mach-omap2/board-omap3evm-flash.c @@ -0,0 +1,190 @@ +/* + * board-omap3evm-flash.c @@ -29356,7 +29356,7 @@ +} + --- /dev/null -+++ kernel-2.6.28/arch/arm/mach-omap2/board-omap3evm.c ++++ kernel-maemo-2.6.28/arch/arm/mach-omap2/board-omap3evm.c @@ -0,0 +1,283 @@ +/* + * linux/arch/arm/mach-omap2/board-omap3evm.c @@ -29642,7 +29642,7 @@ + .timer = &omap_timer, +MACHINE_END --- /dev/null -+++ kernel-2.6.28/arch/arm/mach-omap2/board-omap3pandora.c ++++ kernel-maemo-2.6.28/arch/arm/mach-omap2/board-omap3pandora.c @@ -0,0 +1,321 @@ +/* + * board-omap3pandora.c (Pandora Handheld Console) @@ -29965,8 +29965,8 @@ + .init_machine = omap3pandora_init, + .timer = &omap_timer, +MACHINE_END ---- kernel-2.6.28.orig/arch/arm/mach-omap2/board-overo.c -+++ kernel-2.6.28/arch/arm/mach-omap2/board-overo.c +--- kernel-maemo-2.6.28.orig/arch/arm/mach-omap2/board-overo.c ++++ kernel-maemo-2.6.28/arch/arm/mach-omap2/board-overo.c @@ -26,6 +26,7 @@ #include #include @@ -30079,7 +30079,7 @@ "OVERO_GPIO_W2W_NRESET") == 0) && (gpio_direction_output(OVERO_GPIO_W2W_NRESET, 1) == 0)) { --- /dev/null -+++ kernel-2.6.28/arch/arm/mach-omap2/board-rx51-audio.c ++++ kernel-maemo-2.6.28/arch/arm/mach-omap2/board-rx51-audio.c @@ -0,0 +1,165 @@ +/* + * linux/arch/arm/mach-omap2/board-rx51-audio.c @@ -30247,7 +30247,7 @@ + +subsys_initcall(rx51_audio_init); --- /dev/null -+++ kernel-2.6.28/arch/arm/mach-omap2/board-rx51-camera-base.c ++++ kernel-maemo-2.6.28/arch/arm/mach-omap2/board-rx51-camera-base.c @@ -0,0 +1,154 @@ +/* + * arch/arm/mach-omap2/board-rx51-camera-base.c @@ -30404,7 +30404,7 @@ + +#endif --- /dev/null -+++ kernel-2.6.28/arch/arm/mach-omap2/board-rx51-camera.c ++++ kernel-maemo-2.6.28/arch/arm/mach-omap2/board-rx51-camera.c @@ -0,0 +1,754 @@ +/* + * arch/arm/mach-omap2/board-rx51-camera.c @@ -31161,7 +31161,7 @@ + +MODULE_LICENSE("GPL"); --- /dev/null -+++ kernel-2.6.28/arch/arm/mach-omap2/board-rx51-camera.h ++++ kernel-maemo-2.6.28/arch/arm/mach-omap2/board-rx51-camera.h @@ -0,0 +1,33 @@ +/* + * arch/arm/mach-omap2/board-rx51-camera.h @@ -31197,7 +31197,7 @@ + +#endif --- /dev/null -+++ kernel-2.6.28/arch/arm/mach-omap2/board-rx51-flash.c ++++ kernel-maemo-2.6.28/arch/arm/mach-omap2/board-rx51-flash.c @@ -0,0 +1,100 @@ +/* + * linux/arch/arm/mach-omap2/board-rx51-flash.c @@ -31300,7 +31300,7 @@ + +subsys_initcall(rx51_flash_init); --- /dev/null -+++ kernel-2.6.28/arch/arm/mach-omap2/board-rx51-network.c ++++ kernel-maemo-2.6.28/arch/arm/mach-omap2/board-rx51-network.c @@ -0,0 +1,24 @@ +/* + * linux/arch/arm/mach-omap2/board-rx51-network.c @@ -31327,7 +31327,7 @@ + +subsys_initcall(rx51_network_init); --- /dev/null -+++ kernel-2.6.28/arch/arm/mach-omap2/board-rx51-peripherals.c ++++ kernel-maemo-2.6.28/arch/arm/mach-omap2/board-rx51-peripherals.c @@ -0,0 +1,616 @@ +/* + * linux/arch/arm/mach-omap2/board-rx51-flash.c @@ -31946,7 +31946,7 @@ + +subsys_initcall(rx51_peripherals_init); --- /dev/null -+++ kernel-2.6.28/arch/arm/mach-omap2/board-rx51-sdram.c ++++ kernel-maemo-2.6.28/arch/arm/mach-omap2/board-rx51-sdram.c @@ -0,0 +1,252 @@ +/* + * SDRC register values for the Nokia Memories @@ -32201,7 +32201,7 @@ +} + --- /dev/null -+++ kernel-2.6.28/arch/arm/mach-omap2/board-rx51-video.c ++++ kernel-maemo-2.6.28/arch/arm/mach-omap2/board-rx51-video.c @@ -0,0 +1,363 @@ +/* + * linux/arch/arm/mach-omap2/board-rx51-video.c @@ -32567,7 +32567,7 @@ +#endif /* CONFIG_FB_OMAP2 || CONFIG_FB_OMAP2_MODULE */ + --- /dev/null -+++ kernel-2.6.28/arch/arm/mach-omap2/board-rx51.c ++++ kernel-maemo-2.6.28/arch/arm/mach-omap2/board-rx51.c @@ -0,0 +1,199 @@ +/* + * linux/arch/arm/mach-omap2/board-rx51.c @@ -32769,7 +32769,7 @@ + .timer = &omap_timer, +MACHINE_END --- /dev/null -+++ kernel-2.6.28/arch/arm/mach-omap2/board-rx71-peripherals.c ++++ kernel-maemo-2.6.28/arch/arm/mach-omap2/board-rx71-peripherals.c @@ -0,0 +1,179 @@ +/* + * linux/arch/arm/mach-omap2/board-rx71-peripherals.c @@ -32951,7 +32951,7 @@ + +subsys_initcall(rx71_peripherals_init); --- /dev/null -+++ kernel-2.6.28/arch/arm/mach-omap2/board-rx71.c ++++ kernel-maemo-2.6.28/arch/arm/mach-omap2/board-rx71.c @@ -0,0 +1,140 @@ +/* + * linux/arch/arm/mach-omap2/board-rx71.c @@ -33093,8 +33093,8 @@ + .init_machine = rx71_init, + .timer = &omap_timer, +MACHINE_END ---- kernel-2.6.28.orig/arch/arm/mach-omap2/clock.c -+++ kernel-2.6.28/arch/arm/mach-omap2/clock.c +--- kernel-maemo-2.6.28.orig/arch/arm/mach-omap2/clock.c ++++ kernel-maemo-2.6.28/arch/arm/mach-omap2/clock.c @@ -28,9 +28,11 @@ #include #include @@ -34207,8 +34207,8 @@ + omap2_init_clk_clkdm(clk); + return 0; +} ---- kernel-2.6.28.orig/arch/arm/mach-omap2/clock.h -+++ kernel-2.6.28/arch/arm/mach-omap2/clock.h +--- kernel-maemo-2.6.28.orig/arch/arm/mach-omap2/clock.h ++++ kernel-maemo-2.6.28/arch/arm/mach-omap2/clock.h @@ -21,14 +21,32 @@ /* The maximum error between a target DPLL rate and the rounded rate in Hz */ #define DEFAULT_DPLL_RATE_TOLERANCE 50000 @@ -34270,8 +34270,8 @@ void omap2_clk_prepare_for_reboot(void); extern u8 cpu_mask; ---- kernel-2.6.28.orig/arch/arm/mach-omap2/clock24xx.c -+++ kernel-2.6.28/arch/arm/mach-omap2/clock24xx.c +--- kernel-maemo-2.6.28.orig/arch/arm/mach-omap2/clock24xx.c ++++ kernel-maemo-2.6.28/arch/arm/mach-omap2/clock24xx.c @@ -28,11 +28,12 @@ #include #include @@ -34748,8 +34748,8 @@ for (prcm = rate_table; prcm->mpu_speed; prcm++) { if (!(prcm->flags & cpu_mask)) continue; ---- kernel-2.6.28.orig/arch/arm/mach-omap2/clock24xx.h -+++ kernel-2.6.28/arch/arm/mach-omap2/clock24xx.h +--- kernel-maemo-2.6.28.orig/arch/arm/mach-omap2/clock24xx.h ++++ kernel-maemo-2.6.28/arch/arm/mach-omap2/clock24xx.h @@ -24,13 +24,16 @@ #include "cm-regbits-24xx.h" #include "sdrc.h" @@ -36909,8 +36909,8 @@ /* virtual meta-group clock */ &virt_prcm_set, /* general l4 interface ck, multi-parent functional clk */ ---- kernel-2.6.28.orig/arch/arm/mach-omap2/clock34xx.c -+++ kernel-2.6.28/arch/arm/mach-omap2/clock34xx.c +--- kernel-maemo-2.6.28.orig/arch/arm/mach-omap2/clock34xx.c ++++ kernel-maemo-2.6.28/arch/arm/mach-omap2/clock34xx.c @@ -26,18 +26,21 @@ #include #include @@ -37520,8 +37520,8 @@ - -#endif +#endif /* CONFIG_ARCH_OMAP3 */ ---- kernel-2.6.28.orig/arch/arm/mach-omap2/clock34xx.h -+++ kernel-2.6.28/arch/arm/mach-omap2/clock34xx.h +--- kernel-maemo-2.6.28.orig/arch/arm/mach-omap2/clock34xx.h ++++ kernel-maemo-2.6.28/arch/arm/mach-omap2/clock34xx.h @@ -20,6 +20,7 @@ #define __ARCH_ARM_MACH_OMAP2_CLOCK34XX_H @@ -41443,8 +41443,8 @@ &mcbsp4_fck, &emu_src_ck, &pclk_fck, ---- kernel-2.6.28.orig/arch/arm/mach-omap2/clockdomain.c -+++ kernel-2.6.28/arch/arm/mach-omap2/clockdomain.c +--- kernel-maemo-2.6.28.orig/arch/arm/mach-omap2/clockdomain.c ++++ kernel-maemo-2.6.28/arch/arm/mach-omap2/clockdomain.c @@ -71,14 +71,14 @@ if (!omap_chip_is(autodep->omap_chip)) return; @@ -41746,8 +41746,8 @@ return 0; } ---- kernel-2.6.28.orig/arch/arm/mach-omap2/clockdomains.h -+++ kernel-2.6.28/arch/arm/mach-omap2/clockdomains.h +--- kernel-maemo-2.6.28.orig/arch/arm/mach-omap2/clockdomains.h ++++ kernel-maemo-2.6.28/arch/arm/mach-omap2/clockdomains.h @@ -14,12 +14,32 @@ /* @@ -42072,8 +42072,8 @@ #endif NULL, ---- kernel-2.6.28.orig/arch/arm/mach-omap2/cm-regbits-24xx.h -+++ kernel-2.6.28/arch/arm/mach-omap2/cm-regbits-24xx.h +--- kernel-maemo-2.6.28.orig/arch/arm/mach-omap2/cm-regbits-24xx.h ++++ kernel-maemo-2.6.28/arch/arm/mach-omap2/cm-regbits-24xx.h @@ -110,35 +110,57 @@ #define OMAP24XX_EN_DES (1 << 0) @@ -42176,8 +42176,8 @@ /* CM_AUTOIDLE_WKUP */ #define OMAP24XX_AUTO_OMAPCTRL (1 << 5) ---- kernel-2.6.28.orig/arch/arm/mach-omap2/cm-regbits-34xx.h -+++ kernel-2.6.28/arch/arm/mach-omap2/cm-regbits-34xx.h +--- kernel-maemo-2.6.28.orig/arch/arm/mach-omap2/cm-regbits-34xx.h ++++ kernel-maemo-2.6.28/arch/arm/mach-omap2/cm-regbits-34xx.h @@ -145,6 +145,8 @@ #define OMAP3430_CLKACTIVITY_MPU_MASK (1 << 0) @@ -42438,8 +42438,8 @@ /* CM_AUTOIDLE_USBHOST */ #define OMAP3430ES2_AUTO_USBHOST_SHIFT 0 ---- kernel-2.6.28.orig/arch/arm/mach-omap2/cm.h -+++ kernel-2.6.28/arch/arm/mach-omap2/cm.h +--- kernel-maemo-2.6.28.orig/arch/arm/mach-omap2/cm.h ++++ kernel-maemo-2.6.28/arch/arm/mach-omap2/cm.h @@ -16,29 +16,24 @@ #include "prcm-common.h" @@ -42491,8 +42491,8 @@ #define OMAP3430_CM_AUTOIDLE_PLL CM_AUTOIDLE2 #define OMAP3430ES2_CM_AUTOIDLE2_PLL CM_AUTOIDLE2 #define OMAP3430_CM_CLKSEL1 CM_CLKSEL ---- kernel-2.6.28.orig/arch/arm/mach-omap2/control.c -+++ kernel-2.6.28/arch/arm/mach-omap2/control.c +--- kernel-maemo-2.6.28.orig/arch/arm/mach-omap2/control.c ++++ kernel-maemo-2.6.28/arch/arm/mach-omap2/control.c @@ -17,9 +17,127 @@ #include @@ -42880,7 +42880,7 @@ +} +#endif /* CONFIG_ARCH_OMAP3 && CONFIG_PM */ --- /dev/null -+++ kernel-2.6.28/arch/arm/mach-omap2/cpuidle34xx.c ++++ kernel-maemo-2.6.28/arch/arm/mach-omap2/cpuidle34xx.c @@ -0,0 +1,315 @@ +/* + * linux/arch/arm/mach-omap2/cpuidle34xx.c @@ -43198,7 +43198,7 @@ +} +#endif /* CONFIG_CPU_IDLE */ --- /dev/null -+++ kernel-2.6.28/arch/arm/mach-omap2/debobs.c ++++ kernel-maemo-2.6.28/arch/arm/mach-omap2/debobs.c @@ -0,0 +1,239 @@ +/* + * arch/arm/mach-omap2/debobs.c @@ -43439,8 +43439,8 @@ +} + +late_initcall_sync(init_debobs); ---- kernel-2.6.28.orig/arch/arm/mach-omap2/devices.c -+++ kernel-2.6.28/arch/arm/mach-omap2/devices.c +--- kernel-maemo-2.6.28.orig/arch/arm/mach-omap2/devices.c ++++ kernel-maemo-2.6.28/arch/arm/mach-omap2/devices.c @@ -14,24 +14,135 @@ #include #include @@ -43909,7 +43909,7 @@ omap_init_mcspi(); omap_hdq_init(); --- /dev/null -+++ kernel-2.6.28/arch/arm/mach-omap2/dspbridge.c ++++ kernel-maemo-2.6.28/arch/arm/mach-omap2/dspbridge.c @@ -0,0 +1,72 @@ +/* + * TI's dspbridge platform device registration @@ -43983,8 +43983,8 @@ +MODULE_AUTHOR("Hiroshi DOYU"); +MODULE_DESCRIPTION("TI's dspbridge platform device registration"); +MODULE_LICENSE("GPL v2"); ---- kernel-2.6.28.orig/arch/arm/mach-omap2/gpmc.c -+++ kernel-2.6.28/arch/arm/mach-omap2/gpmc.c +--- kernel-maemo-2.6.28.orig/arch/arm/mach-omap2/gpmc.c ++++ kernel-maemo-2.6.28/arch/arm/mach-omap2/gpmc.c @@ -54,10 +54,38 @@ #define GPMC_CHUNK_SHIFT 24 /* 16 MB */ #define GPMC_SECTION_SHIFT 28 /* 128 MB */ @@ -44093,8 +44093,8 @@ + } +} +#endif /* CONFIG_ARCH_OMAP3 */ ---- kernel-2.6.28.orig/arch/arm/mach-omap2/id.c -+++ kernel-2.6.28/arch/arm/mach-omap2/id.c +--- kernel-maemo-2.6.28.orig/arch/arm/mach-omap2/id.c ++++ kernel-maemo-2.6.28/arch/arm/mach-omap2/id.c @@ -22,40 +22,15 @@ #include #include @@ -44502,8 +44502,8 @@ +} + +late_initcall(export_omapid); ---- kernel-2.6.28.orig/arch/arm/mach-omap2/io.c -+++ kernel-2.6.28/arch/arm/mach-omap2/io.c +--- kernel-maemo-2.6.28.orig/arch/arm/mach-omap2/io.c ++++ kernel-maemo-2.6.28/arch/arm/mach-omap2/io.c @@ -19,16 +19,18 @@ #include #include @@ -44599,7 +44599,7 @@ gpmc_init(); } --- /dev/null -+++ kernel-2.6.28/arch/arm/mach-omap2/iommu2.c ++++ kernel-maemo-2.6.28/arch/arm/mach-omap2/iommu2.c @@ -0,0 +1,326 @@ +/* + * omap iommu: omap2/3 architecture specific functions @@ -44927,8 +44927,8 @@ +MODULE_AUTHOR("Hiroshi DOYU, Paul Mundt and Toshihiro Kobayashi"); +MODULE_DESCRIPTION("omap iommu: omap2/3 architecture specific functions"); +MODULE_LICENSE("GPL v2"); ---- kernel-2.6.28.orig/arch/arm/mach-omap2/irq.c -+++ kernel-2.6.28/arch/arm/mach-omap2/irq.c +--- kernel-maemo-2.6.28.orig/arch/arm/mach-omap2/irq.c ++++ kernel-maemo-2.6.28/arch/arm/mach-omap2/irq.c @@ -23,7 +23,12 @@ #define INTC_REVISION 0x0000 #define INTC_SYSCONFIG 0x0010 @@ -45119,8 +45119,8 @@ + /* MIRs are saved and restore with other PRCM registers */ +} +#endif /* CONFIG_ARCH_OMAP3 */ ---- kernel-2.6.28.orig/arch/arm/mach-omap2/mailbox.c -+++ kernel-2.6.28/arch/arm/mach-omap2/mailbox.c +--- kernel-maemo-2.6.28.orig/arch/arm/mach-omap2/mailbox.c ++++ kernel-maemo-2.6.28/arch/arm/mach-omap2/mailbox.c @@ -1,9 +1,9 @@ /* - * Mailbox reservation modules for OMAP2 @@ -45430,8 +45430,8 @@ +MODULE_DESCRIPTION("omap mailbox: omap2/3 architecture specific functions"); +MODULE_AUTHOR("Hiroshi DOYU , Paul Mundt"); +MODULE_ALIAS("platform:"DRV_NAME); ---- kernel-2.6.28.orig/arch/arm/mach-omap2/mcbsp.c -+++ kernel-2.6.28/arch/arm/mach-omap2/mcbsp.c +--- kernel-maemo-2.6.28.orig/arch/arm/mach-omap2/mcbsp.c ++++ kernel-maemo-2.6.28/arch/arm/mach-omap2/mcbsp.c @@ -22,106 +22,7 @@ #include #include @@ -45685,7 +45685,7 @@ omap_mcbsp_count = OMAP2420_MCBSP_PDATA_SZ; if (cpu_is_omap2430()) --- /dev/null -+++ kernel-2.6.28/arch/arm/mach-omap2/mmc-twl4030.c ++++ kernel-maemo-2.6.28/arch/arm/mach-omap2/mmc-twl4030.c @@ -0,0 +1,825 @@ +/* + * linux/arch/arm/mach-omap2/mmc-twl4030.c @@ -46513,7 +46513,7 @@ + +#endif --- /dev/null -+++ kernel-2.6.28/arch/arm/mach-omap2/mmc-twl4030.h ++++ kernel-maemo-2.6.28/arch/arm/mach-omap2/mmc-twl4030.h @@ -0,0 +1,36 @@ +/* + * MMC definitions for OMAP2 @@ -46552,7 +46552,7 @@ + +#endif --- /dev/null -+++ kernel-2.6.28/arch/arm/mach-omap2/mmu.c ++++ kernel-maemo-2.6.28/arch/arm/mach-omap2/mmu.c @@ -0,0 +1,330 @@ +/* + * linux/arch/arm/mach-omap2/mmu.c @@ -46885,7 +46885,7 @@ + +MODULE_LICENSE("GPL"); --- /dev/null -+++ kernel-2.6.28/arch/arm/mach-omap2/mmu.h ++++ kernel-maemo-2.6.28/arch/arm/mach-omap2/mmu.h @@ -0,0 +1,117 @@ +#ifndef __MACH_OMAP2_MMU_H +#define __MACH_OMAP2_MMU_H @@ -47004,8 +47004,8 @@ +} + +#endif /* __MACH_OMAP2_MMU_H */ ---- kernel-2.6.28.orig/arch/arm/mach-omap2/mux.c -+++ kernel-2.6.28/arch/arm/mach-omap2/mux.c +--- kernel-maemo-2.6.28.orig/arch/arm/mach-omap2/mux.c ++++ kernel-maemo-2.6.28/arch/arm/mach-omap2/mux.c @@ -203,6 +203,15 @@ MUX_CFG_24XX("AC7_2430_USB0HS_DATA7", 0x13E, 0, 0, 0, 1) @@ -47097,7 +47097,7 @@ static DEFINE_SPINLOCK(mux_spin_lock); unsigned long flags; --- /dev/null -+++ kernel-2.6.28/arch/arm/mach-omap2/omap3-iommu.c ++++ kernel-maemo-2.6.28/arch/arm/mach-omap2/omap3-iommu.c @@ -0,0 +1,108 @@ +/* + * omap iommu: omap3 device registration @@ -47208,7 +47208,7 @@ +MODULE_DESCRIPTION("omap iommu: omap3 device registration"); +MODULE_LICENSE("GPL v2"); --- /dev/null -+++ kernel-2.6.28/arch/arm/mach-omap2/omap3-opp.h ++++ kernel-maemo-2.6.28/arch/arm/mach-omap2/omap3-opp.h @@ -0,0 +1,62 @@ +#ifndef __OMAP3_OPP_H_ +#define __OMAP3_OPP_H_ @@ -47273,7 +47273,7 @@ + +#endif --- /dev/null -+++ kernel-2.6.28/arch/arm/mach-omap2/omapdev-common.h ++++ kernel-maemo-2.6.28/arch/arm/mach-omap2/omapdev-common.h @@ -0,0 +1,309 @@ +/* + * OMAP on-chip devices present on OMAP2/3 @@ -47585,7 +47585,7 @@ + +#endif --- /dev/null -+++ kernel-2.6.28/arch/arm/mach-omap2/omapdev.c ++++ kernel-maemo-2.6.28/arch/arm/mach-omap2/omapdev.c @@ -0,0 +1,177 @@ +/* + * omapdev device registration and handling code @@ -47765,7 +47765,7 @@ +} + --- /dev/null -+++ kernel-2.6.28/arch/arm/mach-omap2/omapdev242x.h ++++ kernel-maemo-2.6.28/arch/arm/mach-omap2/omapdev242x.h @@ -0,0 +1,581 @@ +/* + * TI OCP devices present on OMAP242x @@ -48349,7 +48349,7 @@ +#endif + --- /dev/null -+++ kernel-2.6.28/arch/arm/mach-omap2/omapdev243x.h ++++ kernel-maemo-2.6.28/arch/arm/mach-omap2/omapdev243x.h @@ -0,0 +1,661 @@ +/* + * TI OCP devices present on OMAP243x @@ -49013,7 +49013,7 @@ + +#endif --- /dev/null -+++ kernel-2.6.28/arch/arm/mach-omap2/omapdev3xxx.h ++++ kernel-maemo-2.6.28/arch/arm/mach-omap2/omapdev3xxx.h @@ -0,0 +1,804 @@ +/* + * TI OCP devices present on OMAP3xxx @@ -49820,7 +49820,7 @@ + +#endif --- /dev/null -+++ kernel-2.6.28/arch/arm/mach-omap2/pm-debug.c ++++ kernel-maemo-2.6.28/arch/arm/mach-omap2/pm-debug.c @@ -0,0 +1,594 @@ +/* + * linux/arch/arm/mach-omap2/pm_debug.c @@ -50416,8 +50416,8 @@ +#endif + +#endif ---- kernel-2.6.28.orig/arch/arm/mach-omap2/pm.c -+++ kernel-2.6.28/arch/arm/mach-omap2/pm.c +--- kernel-maemo-2.6.28.orig/arch/arm/mach-omap2/pm.c ++++ kernel-maemo-2.6.28/arch/arm/mach-omap2/pm.c @@ -1,13 +1,18 @@ /* * linux/arch/arm/mach-omap2/pm.c @@ -50783,7 +50783,7 @@ + +late_initcall(omap_pm_init); --- /dev/null -+++ kernel-2.6.28/arch/arm/mach-omap2/pm.h ++++ kernel-maemo-2.6.28/arch/arm/mach-omap2/pm.h @@ -0,0 +1,84 @@ +#ifndef __ARCH_ARM_MACH_OMAP2_PM_H +#define __ARCH_ARM_MACH_OMAP2_PM_H @@ -50870,7 +50870,7 @@ +#endif /* CONFIG_PM_DEBUG */ +#endif --- /dev/null -+++ kernel-2.6.28/arch/arm/mach-omap2/pm24xx.c ++++ kernel-maemo-2.6.28/arch/arm/mach-omap2/pm24xx.c @@ -0,0 +1,560 @@ +/* + * linux/arch/arm/mach-omap2/pm.c @@ -51433,7 +51433,7 @@ + return 0; +} --- /dev/null -+++ kernel-2.6.28/arch/arm/mach-omap2/pm34xx.c ++++ kernel-maemo-2.6.28/arch/arm/mach-omap2/pm34xx.c @@ -0,0 +1,1440 @@ +/* + * linux/arch/arm/mach-omap2/pm34xx.c @@ -52875,8 +52875,8 @@ +} + +arch_initcall(omap3_pm_early_init); ---- kernel-2.6.28.orig/arch/arm/mach-omap2/powerdomain.c -+++ kernel-2.6.28/arch/arm/mach-omap2/powerdomain.c +--- kernel-maemo-2.6.28.orig/arch/arm/mach-omap2/powerdomain.c ++++ kernel-maemo-2.6.28/arch/arm/mach-omap2/powerdomain.c @@ -35,6 +35,13 @@ #include #include @@ -53028,8 +53028,8 @@ + return 0; +} ---- kernel-2.6.28.orig/arch/arm/mach-omap2/powerdomains.h -+++ kernel-2.6.28/arch/arm/mach-omap2/powerdomains.h +--- kernel-maemo-2.6.28.orig/arch/arm/mach-omap2/powerdomains.h ++++ kernel-maemo-2.6.28/arch/arm/mach-omap2/powerdomains.h @@ -171,13 +171,19 @@ &iva2_pwrdm, &mpu_34xx_pwrdm, @@ -53051,8 +53051,8 @@ #endif NULL ---- kernel-2.6.28.orig/arch/arm/mach-omap2/powerdomains34xx.h -+++ kernel-2.6.28/arch/arm/mach-omap2/powerdomains34xx.h +--- kernel-maemo-2.6.28.orig/arch/arm/mach-omap2/powerdomains34xx.h ++++ kernel-maemo-2.6.28/arch/arm/mach-omap2/powerdomains34xx.h @@ -200,12 +200,33 @@ }; @@ -53169,8 +53169,8 @@ #endif /* CONFIG_ARCH_OMAP34XX */ ---- kernel-2.6.28.orig/arch/arm/mach-omap2/prcm-common.h -+++ kernel-2.6.28/arch/arm/mach-omap2/prcm-common.h +--- kernel-maemo-2.6.28.orig/arch/arm/mach-omap2/prcm-common.h ++++ kernel-maemo-2.6.28/arch/arm/mach-omap2/prcm-common.h @@ -113,33 +113,58 @@ #define OMAP2430_EN_USBHS (1 << 6) @@ -53414,8 +53414,8 @@ /* CM_SLEEPDEP_PER, PM_WKDEP_IVA2, PM_WKDEP_MPU, PM_WKDEP_PER shared bits */ #define OMAP3430_EN_CORE_SHIFT 0 ---- kernel-2.6.28.orig/arch/arm/mach-omap2/prcm.c -+++ kernel-2.6.28/arch/arm/mach-omap2/prcm.c +--- kernel-maemo-2.6.28.orig/arch/arm/mach-omap2/prcm.c ++++ kernel-maemo-2.6.28/arch/arm/mach-omap2/prcm.c @@ -7,6 +7,9 @@ * * Written by Tony Lindgren @@ -53886,8 +53886,8 @@ + return; +} +#endif ---- kernel-2.6.28.orig/arch/arm/mach-omap2/prm-regbits-34xx.h -+++ kernel-2.6.28/arch/arm/mach-omap2/prm-regbits-34xx.h +--- kernel-maemo-2.6.28.orig/arch/arm/mach-omap2/prm-regbits-34xx.h ++++ kernel-maemo-2.6.28/arch/arm/mach-omap2/prm-regbits-34xx.h @@ -365,13 +365,16 @@ /* PM_PREPWSTST_GFX specific bits */ @@ -53962,8 +53962,8 @@ /* PRM_SRAM_PCHARGE */ #define OMAP3430_PCHARGE_TIME_SHIFT 0 #define OMAP3430_PCHARGE_TIME_MASK (0xff << 0) ---- kernel-2.6.28.orig/arch/arm/mach-omap2/prm.h -+++ kernel-2.6.28/arch/arm/mach-omap2/prm.h +--- kernel-maemo-2.6.28.orig/arch/arm/mach-omap2/prm.h ++++ kernel-maemo-2.6.28/arch/arm/mach-omap2/prm.h @@ -4,8 +4,8 @@ /* * OMAP2/3 Power/Reset Management (PRM) register definitions @@ -54190,7 +54190,7 @@ /* Named RM_RSTCTRL_WKUP on the 24xx */ /* 2420 calls RST_DPLL3 'RST_DPLL' */ --- /dev/null -+++ kernel-2.6.28/arch/arm/mach-omap2/resource34xx.c ++++ kernel-maemo-2.6.28/arch/arm/mach-omap2/resource34xx.c @@ -0,0 +1,456 @@ +/* + * linux/arch/arm/mach-omap2/resource34xx.c @@ -54649,7 +54649,7 @@ + return 0; +} --- /dev/null -+++ kernel-2.6.28/arch/arm/mach-omap2/resource34xx.h ++++ kernel-maemo-2.6.28/arch/arm/mach-omap2/resource34xx.h @@ -0,0 +1,304 @@ +/* + * linux/arch/arm/mach-omap2/resource34xx.h @@ -54956,7 +54956,7 @@ + +#endif /* __ARCH_ARM_MACH_OMAP2_RESOURCE_H */ --- /dev/null -+++ kernel-2.6.28/arch/arm/mach-omap2/resource34xx_mutex.h ++++ kernel-maemo-2.6.28/arch/arm/mach-omap2/resource34xx_mutex.h @@ -0,0 +1,9 @@ +#ifndef __ARCH_ARM_MACH_OMAP2_RESOURCE_MUTEX_H +#define __ARCH_ARM_MACH_OMAP2_RESOURCE_MUTEX_H @@ -54968,7 +54968,7 @@ + + --- /dev/null -+++ kernel-2.6.28/arch/arm/mach-omap2/rx51_camera_btn.c ++++ kernel-maemo-2.6.28/arch/arm/mach-omap2/rx51_camera_btn.c @@ -0,0 +1,247 @@ +/** + * arch/arm/mach-omap2/rx51_camera_btn.c @@ -55218,7 +55218,7 @@ +MODULE_LICENSE("GPL"); +MODULE_AUTHOR("Nokia Corporation"); --- /dev/null -+++ kernel-2.6.28/arch/arm/mach-omap2/sdram-micron-mt46h32m32lf-6.h ++++ kernel-maemo-2.6.28/arch/arm/mach-omap2/sdram-micron-mt46h32m32lf-6.h @@ -0,0 +1,69 @@ +/* + * SDRC register values for the Micron MT46H32M32LF-6 @@ -55290,7 +55290,7 @@ + +#endif --- /dev/null -+++ kernel-2.6.28/arch/arm/mach-omap2/sdram-qimonda-hyb18m512160af-6.h ++++ kernel-maemo-2.6.28/arch/arm/mach-omap2/sdram-qimonda-hyb18m512160af-6.h @@ -0,0 +1,55 @@ +/* + * SDRC register values for the Qimonda HYB18M512160AF-6 @@ -55348,7 +55348,7 @@ + +#endif --- /dev/null -+++ kernel-2.6.28/arch/arm/mach-omap2/sdrc.c ++++ kernel-maemo-2.6.28/arch/arm/mach-omap2/sdrc.c @@ -0,0 +1,154 @@ +/* + * SMS/SDRC (SDRAM controller) common code for OMAP2/3 @@ -55505,7 +55505,7 @@ + omap2_sms_save_context(); +} --- /dev/null -+++ kernel-2.6.28/arch/arm/mach-omap2/sdrc2xxx.c ++++ kernel-maemo-2.6.28/arch/arm/mach-omap2/sdrc2xxx.c @@ -0,0 +1,166 @@ +/* + * linux/arch/arm/mach-omap2/memory.c @@ -55673,8 +55673,8 @@ + /* 90 degree phase for anything below 133Mhz + disable DLL filter */ + mem_timings.slow_dll_ctrl |= ((1 << 1) | (3 << 8)); +} ---- kernel-2.6.28.orig/arch/arm/mach-omap2/serial.c -+++ kernel-2.6.28/arch/arm/mach-omap2/serial.c +--- kernel-maemo-2.6.28.orig/arch/arm/mach-omap2/serial.c ++++ kernel-maemo-2.6.28/arch/arm/mach-omap2/serial.c @@ -6,6 +6,8 @@ * Copyright (C) 2005-2008 Nokia Corporation * Author: Paul Mundt @@ -56196,8 +56196,8 @@ + return ret; } arch_initcall(omap_init); ---- kernel-2.6.28.orig/arch/arm/mach-omap2/sleep24xx.S -+++ kernel-2.6.28/arch/arm/mach-omap2/sleep24xx.S +--- kernel-maemo-2.6.28.orig/arch/arm/mach-omap2/sleep24xx.S ++++ kernel-maemo-2.6.28/arch/arm/mach-omap2/sleep24xx.S @@ -93,9 +93,8 @@ orr r4, r4, #0x40 @ enable self refresh on idle req mov r5, #0x2000 @ set delay (DPLL relock + DLL relock) @@ -56210,7 +56210,7 @@ loop: subs r5, r5, #0x1 @ awake, wait just a bit --- /dev/null -+++ kernel-2.6.28/arch/arm/mach-omap2/sleep34xx.S ++++ kernel-maemo-2.6.28/arch/arm/mach-omap2/sleep34xx.S @@ -0,0 +1,811 @@ +/* + * linux/arch/arm/mach-omap2/sleep.S @@ -57024,7 +57024,7 @@ +ENTRY(omap34xx_cpu_suspend_sz) + .word . - omap34xx_cpu_suspend --- /dev/null -+++ kernel-2.6.28/arch/arm/mach-omap2/smartreflex.c ++++ kernel-maemo-2.6.28/arch/arm/mach-omap2/smartreflex.c @@ -0,0 +1,1093 @@ +/* + * linux/arch/arm/mach-omap3/smartreflex.c @@ -58120,7 +58120,7 @@ + +late_initcall(omap3_sr_init); --- /dev/null -+++ kernel-2.6.28/arch/arm/mach-omap2/smartreflex.h ++++ kernel-maemo-2.6.28/arch/arm/mach-omap2/smartreflex.h @@ -0,0 +1,285 @@ +#ifndef __ARCH_ARM_MACH_OMAP3_SMARTREFLEX_H +#define __ARCH_ARM_MACH_OMAP3_SMARTREFLEX_H @@ -58407,8 +58407,8 @@ +#endif + +#endif ---- kernel-2.6.28.orig/arch/arm/mach-omap2/sram242x.S -+++ kernel-2.6.28/arch/arm/mach-omap2/sram242x.S +--- kernel-maemo-2.6.28.orig/arch/arm/mach-omap2/sram242x.S ++++ kernel-maemo-2.6.28/arch/arm/mach-omap2/sram242x.S @@ -31,6 +31,11 @@ #include "cm.h" #include "sdrc.h" @@ -58421,8 +58421,8 @@ .text ENTRY(omap242x_sram_ddr_init) ---- kernel-2.6.28.orig/arch/arm/mach-omap2/sram243x.S -+++ kernel-2.6.28/arch/arm/mach-omap2/sram243x.S +--- kernel-maemo-2.6.28.orig/arch/arm/mach-omap2/sram243x.S ++++ kernel-maemo-2.6.28/arch/arm/mach-omap2/sram243x.S @@ -31,6 +31,11 @@ #include "cm.h" #include "sdrc.h" @@ -58435,8 +58435,8 @@ .text ENTRY(omap243x_sram_ddr_init) ---- kernel-2.6.28.orig/arch/arm/mach-omap2/sram34xx.S -+++ kernel-2.6.28/arch/arm/mach-omap2/sram34xx.S +--- kernel-maemo-2.6.28.orig/arch/arm/mach-omap2/sram34xx.S ++++ kernel-maemo-2.6.28/arch/arm/mach-omap2/sram34xx.S @@ -3,13 +3,12 @@ * * Omap3 specific functions that need to be run in internal SRAM @@ -58755,7 +58755,7 @@ .word . - omap3_sram_configure_core_dpll + --- /dev/null -+++ kernel-2.6.28/arch/arm/mach-omap2/ssi.c ++++ kernel-maemo-2.6.28/arch/arm/mach-omap2/ssi.c @@ -0,0 +1,497 @@ +/* + * arch/arm/mach-omap2/ssi.c @@ -59254,8 +59254,8 @@ + return 0; +} +subsys_initcall(omap_ssi_init); ---- kernel-2.6.28.orig/arch/arm/mach-omap2/timer-gp.c -+++ kernel-2.6.28/arch/arm/mach-omap2/timer-gp.c +--- kernel-maemo-2.6.28.orig/arch/arm/mach-omap2/timer-gp.c ++++ kernel-maemo-2.6.28/arch/arm/mach-omap2/timer-gp.c @@ -81,9 +81,21 @@ case CLOCK_EVT_MODE_ONESHOT: break; @@ -59309,7 +59309,7 @@ clockevent_gpt.cpumask = cpumask_of_cpu(0); clockevents_register_device(&clockevent_gpt); --- /dev/null -+++ kernel-2.6.28/arch/arm/mach-omap2/twl4030-generic-scripts.c ++++ kernel-maemo-2.6.28/arch/arm/mach-omap2/twl4030-generic-scripts.c @@ -0,0 +1,81 @@ +/* + * arch/arm/mach-omap2/twl4030-generic-scripts.c @@ -59393,7 +59393,7 @@ + +#endif /* CONFIG_TWL4030_POWER */ --- /dev/null -+++ kernel-2.6.28/arch/arm/mach-omap2/twl4030-generic-scripts.h ++++ kernel-maemo-2.6.28/arch/arm/mach-omap2/twl4030-generic-scripts.h @@ -0,0 +1,13 @@ +#ifndef __TWL4030_GENERIC_SCRIPTS_H +#define __TWL4030_GENERIC_SCRIPTS_H @@ -59409,7 +59409,7 @@ + +#endif --- /dev/null -+++ kernel-2.6.28/arch/arm/mach-omap2/usb-ehci.c ++++ kernel-maemo-2.6.28/arch/arm/mach-omap2/usb-ehci.c @@ -0,0 +1,165 @@ +/* + * linux/arch/arm/mach-omap2/usb-ehci.c @@ -59577,7 +59577,7 @@ +} + --- /dev/null -+++ kernel-2.6.28/arch/arm/mach-omap2/usb-musb.c ++++ kernel-maemo-2.6.28/arch/arm/mach-omap2/usb-musb.c @@ -0,0 +1,184 @@ +/* + * linux/arch/arm/mach-omap2/usb-musb.c @@ -59763,8 +59763,8 @@ +#endif +} + ---- kernel-2.6.28.orig/arch/arm/mach-omap2/usb-tusb6010.c -+++ kernel-2.6.28/arch/arm/mach-omap2/usb-tusb6010.c +--- kernel-maemo-2.6.28.orig/arch/arm/mach-omap2/usb-tusb6010.c ++++ kernel-maemo-2.6.28/arch/arm/mach-omap2/usb-tusb6010.c @@ -12,11 +12,11 @@ #include #include @@ -59802,8 +59802,8 @@ tusb_resources[2].start = irq + IH_GPIO_BASE; /* set up memory timings ... can speed them up later */ ---- kernel-2.6.28.orig/arch/arm/mm/cache-v6.S -+++ kernel-2.6.28/arch/arm/mm/cache-v6.S +--- kernel-maemo-2.6.28.orig/arch/arm/mm/cache-v6.S ++++ kernel-maemo-2.6.28/arch/arm/mm/cache-v6.S @@ -12,6 +12,7 @@ #include #include @@ -59837,8 +59837,8 @@ /* * v6_flush_kern_dcache_page(kaddr) * ---- kernel-2.6.28.orig/arch/arm/mm/cache-v7.S -+++ kernel-2.6.28/arch/arm/mm/cache-v7.S +--- kernel-maemo-2.6.28.orig/arch/arm/mm/cache-v7.S ++++ kernel-maemo-2.6.28/arch/arm/mm/cache-v7.S @@ -13,6 +13,7 @@ #include #include @@ -59887,8 +59887,8 @@ ENDPROC(v7_coherent_kern_range) ENDPROC(v7_coherent_user_range) ---- kernel-2.6.28.orig/arch/arm/mm/fault.c -+++ kernel-2.6.28/arch/arm/mm/fault.c +--- kernel-maemo-2.6.28.orig/arch/arm/mm/fault.c ++++ kernel-maemo-2.6.28/arch/arm/mm/fault.c @@ -22,6 +22,19 @@ #include "fault.h" @@ -60016,8 +60016,8 @@ + do_translation_fault(addr, FSR_LNX_PF, regs); } ---- kernel-2.6.28.orig/arch/arm/mm/ioremap.c -+++ kernel-2.6.28/arch/arm/mm/ioremap.c +--- kernel-maemo-2.6.28.orig/arch/arm/mm/ioremap.c ++++ kernel-maemo-2.6.28/arch/arm/mm/ioremap.c @@ -110,6 +110,17 @@ return err; } @@ -60077,8 +60077,8 @@ + vunmap(addr); } EXPORT_SYMBOL(__iounmap); ---- kernel-2.6.28.orig/arch/arm/mm/mmu.c -+++ kernel-2.6.28/arch/arm/mm/mmu.c +--- kernel-maemo-2.6.28.orig/arch/arm/mm/mmu.c ++++ kernel-maemo-2.6.28/arch/arm/mm/mmu.c @@ -242,6 +242,10 @@ .prot_sect = PMD_TYPE_SECT, .domain = DOMAIN_KERNEL, @@ -60119,8 +60119,8 @@ for (i = 0; i < 16; i++) { unsigned long v = pgprot_val(protection_map[i]); protection_map[i] = __pgprot(v | user_pgprot); ---- kernel-2.6.28.orig/arch/arm/oprofile/Makefile -+++ kernel-2.6.28/arch/arm/oprofile/Makefile +--- kernel-maemo-2.6.28.orig/arch/arm/oprofile/Makefile ++++ kernel-maemo-2.6.28/arch/arm/oprofile/Makefile @@ -8,6 +8,7 @@ oprofile-y := $(DRIVER_OBJS) common.o backtrace.o @@ -60129,8 +60129,8 @@ oprofile-$(CONFIG_OPROFILE_ARM11_CORE) += op_model_arm11_core.o oprofile-$(CONFIG_OPROFILE_ARMV6) += op_model_v6.o oprofile-$(CONFIG_OPROFILE_MPCORE) += op_model_mpcore.o ---- kernel-2.6.28.orig/arch/arm/oprofile/backtrace.c -+++ kernel-2.6.28/arch/arm/oprofile/backtrace.c +--- kernel-maemo-2.6.28.orig/arch/arm/oprofile/backtrace.c ++++ kernel-maemo-2.6.28/arch/arm/oprofile/backtrace.c @@ -33,41 +33,54 @@ return *depth == 0; } @@ -60218,8 +60218,8 @@ + while (depth-- && frame && !((unsigned long) frame & 3)) + frame = user_backtrace(regs, frame, step++); } ---- kernel-2.6.28.orig/arch/arm/oprofile/common.c -+++ kernel-2.6.28/arch/arm/oprofile/common.c +--- kernel-maemo-2.6.28.orig/arch/arm/oprofile/common.c ++++ kernel-maemo-2.6.28/arch/arm/oprofile/common.c @@ -133,6 +133,11 @@ ops->backtrace = arm_backtrace; @@ -60246,8 +60246,8 @@ if (spec) { ret = spec->init(); if (ret < 0) ---- kernel-2.6.28.orig/arch/arm/oprofile/op_arm_model.h -+++ kernel-2.6.28/arch/arm/oprofile/op_arm_model.h +--- kernel-maemo-2.6.28.orig/arch/arm/oprofile/op_arm_model.h ++++ kernel-maemo-2.6.28/arch/arm/oprofile/op_arm_model.h @@ -24,6 +24,8 @@ extern struct op_arm_model_spec op_xscale_spec; #endif @@ -60258,7 +60258,7 @@ extern struct op_arm_model_spec op_mpcore_spec; extern struct op_arm_model_spec op_armv7_spec; --- /dev/null -+++ kernel-2.6.28/arch/arm/oprofile/op_model_omap_gptimer.c ++++ kernel-maemo-2.6.28/arch/arm/oprofile/op_model_omap_gptimer.c @@ -0,0 +1,93 @@ +/** + * OMAP gptimer based event monitor driver for oprofile @@ -60353,8 +60353,8 @@ + .stop = gptimer_stop, + .name = "arm/omap-gptimer", +}; ---- kernel-2.6.28.orig/arch/arm/plat-omap/Kconfig -+++ kernel-2.6.28/arch/arm/plat-omap/Kconfig +--- kernel-maemo-2.6.28.orig/arch/arm/plat-omap/Kconfig ++++ kernel-maemo-2.6.28/arch/arm/plat-omap/Kconfig @@ -56,6 +56,37 @@ for every clockdomain register write. However, the extra detail costs some memory. @@ -60531,8 +60531,8 @@ endmenu endif ---- kernel-2.6.28.orig/arch/arm/plat-omap/Makefile -+++ kernel-2.6.28/arch/arm/plat-omap/Makefile +--- kernel-maemo-2.6.28.orig/arch/arm/plat-omap/Makefile ++++ kernel-maemo-2.6.28/arch/arm/plat-omap/Makefile @@ -4,7 +4,7 @@ # Common support @@ -60570,7 +60570,7 @@ +obj-$(CONFIG_OMAP_PM_SRF) += omap-pm-srf.o \ + resource.o --- /dev/null -+++ kernel-2.6.28/arch/arm/plat-omap/bootreason.c ++++ kernel-maemo-2.6.28/arch/arm/plat-omap/bootreason.c @@ -0,0 +1,79 @@ +/* + * linux/arch/arm/plat-omap/bootreason.c @@ -60651,8 +60651,8 @@ +} + +late_initcall(bootreason_init); ---- kernel-2.6.28.orig/arch/arm/plat-omap/clock.c -+++ kernel-2.6.28/arch/arm/plat-omap/clock.c +--- kernel-maemo-2.6.28.orig/arch/arm/plat-omap/clock.c ++++ kernel-maemo-2.6.28/arch/arm/plat-omap/clock.c @@ -21,8 +21,11 @@ #include #include @@ -61321,8 +61321,8 @@ continue; spin_lock_irqsave(&clockfw_lock, flags); ---- kernel-2.6.28.orig/arch/arm/plat-omap/common.c -+++ kernel-2.6.28/arch/arm/plat-omap/common.c +--- kernel-maemo-2.6.28.orig/arch/arm/plat-omap/common.c ++++ kernel-maemo-2.6.28/arch/arm/plat-omap/common.c @@ -40,12 +40,38 @@ #define NO_LENGTH_CHECK 0xffffffff @@ -61399,7 +61399,7 @@ omap2_set_globals_prcm(omap2_globals); } --- /dev/null -+++ kernel-2.6.28/arch/arm/plat-omap/component-version.c ++++ kernel-maemo-2.6.28/arch/arm/plat-omap/component-version.c @@ -0,0 +1,65 @@ +/* + * linux/arch/arm/plat-omap/component-version.c @@ -61466,8 +61466,8 @@ +MODULE_AUTHOR("Juha Yrjölä "); +MODULE_DESCRIPTION("Component version driver"); +MODULE_LICENSE("GPL"); ---- kernel-2.6.28.orig/arch/arm/plat-omap/cpu-omap.c -+++ kernel-2.6.28/arch/arm/plat-omap/cpu-omap.c +--- kernel-maemo-2.6.28.orig/arch/arm/plat-omap/cpu-omap.c ++++ kernel-maemo-2.6.28/arch/arm/plat-omap/cpu-omap.c @@ -8,6 +8,10 @@ * * Based on cpu-sa1110.c, Copyright (C) 2001 Russell King @@ -61628,8 +61628,8 @@ + * cpufreq_frequency_table_put_attr() + */ + ---- kernel-2.6.28.orig/arch/arm/plat-omap/debug-devices.c -+++ kernel-2.6.28/arch/arm/plat-omap/debug-devices.c +--- kernel-maemo-2.6.28.orig/arch/arm/plat-omap/debug-devices.c ++++ kernel-maemo-2.6.28/arch/arm/plat-omap/debug-devices.c @@ -69,15 +69,15 @@ smc91x_resources[0].start = addr + 0x300; smc91x_resources[0].end = addr + 0x30f; @@ -61650,8 +61650,8 @@ led_resources[0].start = addr; led_resources[0].end = addr + SZ_4K - 1; ---- kernel-2.6.28.orig/arch/arm/plat-omap/debug-leds.c -+++ kernel-2.6.28/arch/arm/plat-omap/debug-leds.c +--- kernel-maemo-2.6.28.orig/arch/arm/plat-omap/debug-leds.c ++++ kernel-maemo-2.6.28/arch/arm/plat-omap/debug-leds.c @@ -83,8 +83,8 @@ /* all leds off during suspend or shutdown */ @@ -61690,8 +61690,8 @@ goto done; } ---- kernel-2.6.28.orig/arch/arm/plat-omap/devices.c -+++ kernel-2.6.28/arch/arm/plat-omap/devices.c +--- kernel-maemo-2.6.28.orig/arch/arm/plat-omap/devices.c ++++ kernel-maemo-2.6.28/arch/arm/plat-omap/devices.c @@ -14,20 +14,20 @@ #include #include @@ -62000,8 +62000,8 @@ omap_init_uwire(); omap_init_wdt(); omap_init_rng(); ---- kernel-2.6.28.orig/arch/arm/plat-omap/dma.c -+++ kernel-2.6.28/arch/arm/plat-omap/dma.c +--- kernel-maemo-2.6.28.orig/arch/arm/plat-omap/dma.c ++++ kernel-maemo-2.6.28/arch/arm/plat-omap/dma.c @@ -51,6 +51,12 @@ static int enable_1510_mode; @@ -62296,8 +62296,8 @@ /* FIXME: Update LCD DMA to work on 24xx */ if (cpu_class_is_omap1()) { r = request_irq(INT_DMA_LCD, lcd_dma_irq_handler, 0, ---- kernel-2.6.28.orig/arch/arm/plat-omap/dmtimer.c -+++ kernel-2.6.28/arch/arm/plat-omap/dmtimer.c +--- kernel-maemo-2.6.28.orig/arch/arm/plat-omap/dmtimer.c ++++ kernel-maemo-2.6.28/arch/arm/plat-omap/dmtimer.c @@ -33,6 +33,7 @@ #include #include @@ -62547,7 +62547,7 @@ int __init omap_dm_timer_init(void) { --- /dev/null -+++ kernel-2.6.28/arch/arm/plat-omap/dss_boottime.c ++++ kernel-maemo-2.6.28/arch/arm/plat-omap/dss_boottime.c @@ -0,0 +1,421 @@ +/* + * File: arch/arm/plat-omap/dss.c @@ -62970,8 +62970,8 @@ + return -ENODEV; +} + ---- kernel-2.6.28.orig/arch/arm/plat-omap/fb.c -+++ kernel-2.6.28/arch/arm/plat-omap/fb.c +--- kernel-maemo-2.6.28.orig/arch/arm/plat-omap/fb.c ++++ kernel-maemo-2.6.28/arch/arm/plat-omap/fb.c @@ -27,14 +27,43 @@ #include #include @@ -63327,7 +63327,7 @@ +arch_initcall(omap_init_fb); + --- /dev/null -+++ kernel-2.6.28/arch/arm/plat-omap/gpio-switch.c ++++ kernel-maemo-2.6.28/arch/arm/plat-omap/gpio-switch.c @@ -0,0 +1,603 @@ +/* + * linux/arch/arm/plat-omap/gpio-switch.c @@ -63932,8 +63932,8 @@ +MODULE_AUTHOR("Juha Yrjölä , Paul Mundt @@ -64763,8 +64763,8 @@ label, is_in ? "in " : "out", value ? "hi" : "lo"); ---- kernel-2.6.28.orig/arch/arm/plat-omap/i2c.c -+++ kernel-2.6.28/arch/arm/plat-omap/i2c.c +--- kernel-maemo-2.6.28.orig/arch/arm/plat-omap/i2c.c ++++ kernel-maemo-2.6.28/arch/arm/plat-omap/i2c.c @@ -79,26 +79,43 @@ #endif }; @@ -64836,7 +64836,7 @@ return platform_device_register(pdev); } --- /dev/null -+++ kernel-2.6.28/arch/arm/plat-omap/include/dspbridge/_chnl_sm.h ++++ kernel-maemo-2.6.28/arch/arm/plat-omap/include/dspbridge/_chnl_sm.h @@ -0,0 +1,212 @@ +/* + * _chnl_sm.h @@ -65051,7 +65051,7 @@ + +#endif /* _CHNL_SM_ */ --- /dev/null -+++ kernel-2.6.28/arch/arm/plat-omap/include/dspbridge/_dcd.h ++++ kernel-maemo-2.6.28/arch/arm/plat-omap/include/dspbridge/_dcd.h @@ -0,0 +1,212 @@ +/* + * _dcd.h @@ -65266,7 +65266,7 @@ + +#endif /* _WCD_ */ --- /dev/null -+++ kernel-2.6.28/arch/arm/plat-omap/include/dspbridge/brddefs.h ++++ kernel-maemo-2.6.28/arch/arm/plat-omap/include/dspbridge/brddefs.h @@ -0,0 +1,54 @@ +/* + * brddefs.h @@ -65323,7 +65323,7 @@ + +#endif /* BRDDEFS_ */ --- /dev/null -+++ kernel-2.6.28/arch/arm/plat-omap/include/dspbridge/cfg.h ++++ kernel-maemo-2.6.28/arch/arm/plat-omap/include/dspbridge/cfg.h @@ -0,0 +1,339 @@ +/* + * cfg.h @@ -65665,7 +65665,7 @@ + +#endif /* CFG_ */ --- /dev/null -+++ kernel-2.6.28/arch/arm/plat-omap/include/dspbridge/cfgdefs.h ++++ kernel-maemo-2.6.28/arch/arm/plat-omap/include/dspbridge/cfgdefs.h @@ -0,0 +1,116 @@ +/* + * cfgdefs.h @@ -65784,7 +65784,7 @@ + +#endif /* CFGDEFS_ */ --- /dev/null -+++ kernel-2.6.28/arch/arm/plat-omap/include/dspbridge/chnl.h ++++ kernel-maemo-2.6.28/arch/arm/plat-omap/include/dspbridge/chnl.h @@ -0,0 +1,170 @@ +/* + * chnl.h @@ -65957,7 +65957,7 @@ + +#endif /* CHNL_ */ --- /dev/null -+++ kernel-2.6.28/arch/arm/plat-omap/include/dspbridge/chnl_sm.h ++++ kernel-maemo-2.6.28/arch/arm/plat-omap/include/dspbridge/chnl_sm.h @@ -0,0 +1,168 @@ +/* + * chnl_sm.h @@ -66128,7 +66128,7 @@ + +#endif /* CHNLSM_ */ --- /dev/null -+++ kernel-2.6.28/arch/arm/plat-omap/include/dspbridge/chnldefs.h ++++ kernel-maemo-2.6.28/arch/arm/plat-omap/include/dspbridge/chnldefs.h @@ -0,0 +1,92 @@ +/* + * chnldefs.h @@ -66223,7 +66223,7 @@ + +#endif /* CHNLDEFS_ */ --- /dev/null -+++ kernel-2.6.28/arch/arm/plat-omap/include/dspbridge/chnlpriv.h ++++ kernel-maemo-2.6.28/arch/arm/plat-omap/include/dspbridge/chnlpriv.h @@ -0,0 +1,136 @@ +/* + * chnlpriv.h @@ -66362,7 +66362,7 @@ + +#endif /* CHNLPRIV_ */ --- /dev/null -+++ kernel-2.6.28/arch/arm/plat-omap/include/dspbridge/clk.h ++++ kernel-maemo-2.6.28/arch/arm/plat-omap/include/dspbridge/clk.h @@ -0,0 +1,155 @@ +/* + * clk.h @@ -66520,7 +66520,7 @@ + +#endif /* _SYNC_H */ --- /dev/null -+++ kernel-2.6.28/arch/arm/plat-omap/include/dspbridge/cmm.h ++++ kernel-maemo-2.6.28/arch/arm/plat-omap/include/dspbridge/cmm.h @@ -0,0 +1,420 @@ +/* + * cmm.h @@ -66943,7 +66943,7 @@ + +#endif /* CMM_ */ --- /dev/null -+++ kernel-2.6.28/arch/arm/plat-omap/include/dspbridge/cmmdefs.h ++++ kernel-maemo-2.6.28/arch/arm/plat-omap/include/dspbridge/cmmdefs.h @@ -0,0 +1,135 @@ +/* + * cmmdefs.h @@ -67081,7 +67081,7 @@ + +#endif /* CMMDEFS_ */ --- /dev/null -+++ kernel-2.6.28/arch/arm/plat-omap/include/dspbridge/cod.h ++++ kernel-maemo-2.6.28/arch/arm/plat-omap/include/dspbridge/cod.h @@ -0,0 +1,433 @@ +/* + * cod.h @@ -67517,7 +67517,7 @@ + +#endif /* COD_ */ --- /dev/null -+++ kernel-2.6.28/arch/arm/plat-omap/include/dspbridge/csl.h ++++ kernel-maemo-2.6.28/arch/arm/plat-omap/include/dspbridge/csl.h @@ -0,0 +1,135 @@ +/* + * csl.h @@ -67655,7 +67655,7 @@ + +#endif /* CSL_ */ --- /dev/null -+++ kernel-2.6.28/arch/arm/plat-omap/include/dspbridge/dbc.h ++++ kernel-maemo-2.6.28/arch/arm/plat-omap/include/dspbridge/dbc.h @@ -0,0 +1,66 @@ +/* + * dbc.h @@ -67724,7 +67724,7 @@ + +#endif /* DBC_ */ --- /dev/null -+++ kernel-2.6.28/arch/arm/plat-omap/include/dspbridge/dbdcd.h ++++ kernel-maemo-2.6.28/arch/arm/plat-omap/include/dspbridge/dbdcd.h @@ -0,0 +1,388 @@ +/* + * dbdcd.h @@ -68115,7 +68115,7 @@ + +#endif /* _DBDCD_H */ --- /dev/null -+++ kernel-2.6.28/arch/arm/plat-omap/include/dspbridge/dbdcddef.h ++++ kernel-maemo-2.6.28/arch/arm/plat-omap/include/dspbridge/dbdcddef.h @@ -0,0 +1,94 @@ +/* + * dbdcddef.h @@ -68212,7 +68212,7 @@ +#endif /* DBDCDDEF_ */ + --- /dev/null -+++ kernel-2.6.28/arch/arm/plat-omap/include/dspbridge/dbdefs.h ++++ kernel-maemo-2.6.28/arch/arm/plat-omap/include/dspbridge/dbdefs.h @@ -0,0 +1,583 @@ +/* + * dbdefs.h @@ -68798,7 +68798,7 @@ + +#endif /* DBDEFS_ */ --- /dev/null -+++ kernel-2.6.28/arch/arm/plat-omap/include/dspbridge/dbg.h ++++ kernel-maemo-2.6.28/arch/arm/plat-omap/include/dspbridge/dbg.h @@ -0,0 +1,110 @@ +/* + * dbg.h @@ -68911,7 +68911,7 @@ + +#endif /* DBG_ */ --- /dev/null -+++ kernel-2.6.28/arch/arm/plat-omap/include/dspbridge/dbl.h ++++ kernel-maemo-2.6.28/arch/arm/plat-omap/include/dspbridge/dbl.h @@ -0,0 +1,354 @@ +/* + * dbl.h @@ -69268,7 +69268,7 @@ + +#endif /* DBL_ */ --- /dev/null -+++ kernel-2.6.28/arch/arm/plat-omap/include/dspbridge/dbldefs.h ++++ kernel-maemo-2.6.28/arch/arm/plat-omap/include/dspbridge/dbldefs.h @@ -0,0 +1,155 @@ +/* + * dbldefs.h @@ -69426,7 +69426,7 @@ + +#endif /* DBLDEFS_ */ --- /dev/null -+++ kernel-2.6.28/arch/arm/plat-omap/include/dspbridge/dbll.h ++++ kernel-maemo-2.6.28/arch/arm/plat-omap/include/dspbridge/dbll.h @@ -0,0 +1,70 @@ +/* + * dbll.h @@ -69499,7 +69499,7 @@ +#endif /* DBLL_ */ + --- /dev/null -+++ kernel-2.6.28/arch/arm/plat-omap/include/dspbridge/dblldefs.h ++++ kernel-maemo-2.6.28/arch/arm/plat-omap/include/dspbridge/dblldefs.h @@ -0,0 +1,509 @@ +/* + * dblldefs.h @@ -70011,7 +70011,7 @@ + +#endif /* DBLDEFS_ */ --- /dev/null -+++ kernel-2.6.28/arch/arm/plat-omap/include/dspbridge/dbof.h ++++ kernel-maemo-2.6.28/arch/arm/plat-omap/include/dspbridge/dbof.h @@ -0,0 +1,117 @@ +/* + * dbof.h @@ -70131,7 +70131,7 @@ +#endif /* DBOF_ */ + --- /dev/null -+++ kernel-2.6.28/arch/arm/plat-omap/include/dspbridge/dbreg.h ++++ kernel-maemo-2.6.28/arch/arm/plat-omap/include/dspbridge/dbreg.h @@ -0,0 +1,113 @@ +/* + * dbreg.h @@ -70247,7 +70247,7 @@ + +#endif /* DBREG_ */ --- /dev/null -+++ kernel-2.6.28/arch/arm/plat-omap/include/dspbridge/dbtype.h ++++ kernel-maemo-2.6.28/arch/arm/plat-omap/include/dspbridge/dbtype.h @@ -0,0 +1,103 @@ +/* + * dbtype.h @@ -70353,7 +70353,7 @@ + +#endif /* DBTYPE_ */ --- /dev/null -+++ kernel-2.6.28/arch/arm/plat-omap/include/dspbridge/dehdefs.h ++++ kernel-maemo-2.6.28/arch/arm/plat-omap/include/dspbridge/dehdefs.h @@ -0,0 +1,42 @@ +/* + * dehdefs.h @@ -70398,7 +70398,7 @@ + +#endif /* _DEHDEFS_H */ --- /dev/null -+++ kernel-2.6.28/arch/arm/plat-omap/include/dspbridge/dev.h ++++ kernel-maemo-2.6.28/arch/arm/plat-omap/include/dspbridge/dev.h @@ -0,0 +1,785 @@ +/* + * dev.h @@ -71186,7 +71186,7 @@ + +#endif /* DEV_ */ --- /dev/null -+++ kernel-2.6.28/arch/arm/plat-omap/include/dspbridge/devdefs.h ++++ kernel-maemo-2.6.28/arch/arm/plat-omap/include/dspbridge/devdefs.h @@ -0,0 +1,35 @@ +/* + * devdefs.h @@ -71224,7 +71224,7 @@ + +#endif /* DEVDEFS_ */ --- /dev/null -+++ kernel-2.6.28/arch/arm/plat-omap/include/dspbridge/disp.h ++++ kernel-maemo-2.6.28/arch/arm/plat-omap/include/dspbridge/disp.h @@ -0,0 +1,236 @@ +/* + * disp.h @@ -71463,7 +71463,7 @@ + +#endif /* DISP_ */ --- /dev/null -+++ kernel-2.6.28/arch/arm/plat-omap/include/dspbridge/dispdefs.h ++++ kernel-maemo-2.6.28/arch/arm/plat-omap/include/dspbridge/dispdefs.h @@ -0,0 +1,45 @@ +/* + * dispdefs.h @@ -71511,7 +71511,7 @@ + +#endif /* DISPDEFS_ */ --- /dev/null -+++ kernel-2.6.28/arch/arm/plat-omap/include/dspbridge/dmm.h ++++ kernel-maemo-2.6.28/arch/arm/plat-omap/include/dspbridge/dmm.h @@ -0,0 +1,84 @@ +/* + * dmm.h @@ -71598,7 +71598,7 @@ + u32 addr, u32 size); +#endif /* DMM_ */ --- /dev/null -+++ kernel-2.6.28/arch/arm/plat-omap/include/dspbridge/dpc.h ++++ kernel-maemo-2.6.28/arch/arm/plat-omap/include/dspbridge/dpc.h @@ -0,0 +1,167 @@ +/* + * dpc.h @@ -71768,7 +71768,7 @@ + +#endif /* DPC_ */ --- /dev/null -+++ kernel-2.6.28/arch/arm/plat-omap/include/dspbridge/drv.h ++++ kernel-maemo-2.6.28/arch/arm/plat-omap/include/dspbridge/drv.h @@ -0,0 +1,450 @@ +/* + * drv.h @@ -72221,7 +72221,7 @@ + +#endif /* DRV_ */ --- /dev/null -+++ kernel-2.6.28/arch/arm/plat-omap/include/dspbridge/drvdefs.h ++++ kernel-maemo-2.6.28/arch/arm/plat-omap/include/dspbridge/drvdefs.h @@ -0,0 +1,34 @@ +/* + * drvdefs.h @@ -72258,7 +72258,7 @@ + +#endif /* DRVDEFS_ */ --- /dev/null -+++ kernel-2.6.28/arch/arm/plat-omap/include/dspbridge/dspdrv.h ++++ kernel-maemo-2.6.28/arch/arm/plat-omap/include/dspbridge/dspdrv.h @@ -0,0 +1,89 @@ +/* + * dspdrv.h @@ -72350,7 +72350,7 @@ + +#endif --- /dev/null -+++ kernel-2.6.28/arch/arm/plat-omap/include/dspbridge/dynamic_loader.h ++++ kernel-maemo-2.6.28/arch/arm/plat-omap/include/dspbridge/dynamic_loader.h @@ -0,0 +1,505 @@ +/* + * dynamic_loader.h @@ -72858,7 +72858,7 @@ + +#endif /* _DYNAMIC_LOADER_H_ */ --- /dev/null -+++ kernel-2.6.28/arch/arm/plat-omap/include/dspbridge/errbase.h ++++ kernel-maemo-2.6.28/arch/arm/plat-omap/include/dspbridge/errbase.h @@ -0,0 +1,509 @@ +/* + * errbase.h @@ -73370,7 +73370,7 @@ + +#endif /* ERRBASE_ */ --- /dev/null -+++ kernel-2.6.28/arch/arm/plat-omap/include/dspbridge/gb.h ++++ kernel-maemo-2.6.28/arch/arm/plat-omap/include/dspbridge/gb.h @@ -0,0 +1,85 @@ +/* + * gb.h @@ -73458,7 +73458,7 @@ + +#endif /*GB_ */ --- /dev/null -+++ kernel-2.6.28/arch/arm/plat-omap/include/dspbridge/getsection.h ++++ kernel-maemo-2.6.28/arch/arm/plat-omap/include/dspbridge/getsection.h @@ -0,0 +1,118 @@ +/* + * getsection.h @@ -73579,7 +73579,7 @@ + +#endif /* _GETSECTION_H_ */ --- /dev/null -+++ kernel-2.6.28/arch/arm/plat-omap/include/dspbridge/gh.h ++++ kernel-maemo-2.6.28/arch/arm/plat-omap/include/dspbridge/gh.h @@ -0,0 +1,37 @@ +/* + * gh.h @@ -73619,7 +73619,7 @@ +extern void *GH_insert(struct GH_THashTab *hashTab, void *key, void *value); +#endif /* GH_ */ --- /dev/null -+++ kernel-2.6.28/arch/arm/plat-omap/include/dspbridge/gs.h ++++ kernel-maemo-2.6.28/arch/arm/plat-omap/include/dspbridge/gs.h @@ -0,0 +1,64 @@ +/* + * gs.h @@ -73686,7 +73686,7 @@ + +#endif /*GS_ */ --- /dev/null -+++ kernel-2.6.28/arch/arm/plat-omap/include/dspbridge/gt.h ++++ kernel-maemo-2.6.28/arch/arm/plat-omap/include/dspbridge/gt.h @@ -0,0 +1,317 @@ +/* + * gt.h @@ -74006,7 +74006,7 @@ + +#endif /* GTCE_ */ --- /dev/null -+++ kernel-2.6.28/arch/arm/plat-omap/include/dspbridge/host_os.h ++++ kernel-maemo-2.6.28/arch/arm/plat-omap/include/dspbridge/host_os.h @@ -0,0 +1,90 @@ +/* + * host_os.h @@ -74099,7 +74099,7 @@ +#endif + --- /dev/null -+++ kernel-2.6.28/arch/arm/plat-omap/include/dspbridge/io.h ++++ kernel-maemo-2.6.28/arch/arm/plat-omap/include/dspbridge/io.h @@ -0,0 +1,132 @@ +/* + * io.h @@ -74234,7 +74234,7 @@ + +#endif /* CHNL_ */ --- /dev/null -+++ kernel-2.6.28/arch/arm/plat-omap/include/dspbridge/io_sm.h ++++ kernel-maemo-2.6.28/arch/arm/plat-omap/include/dspbridge/io_sm.h @@ -0,0 +1,335 @@ +/* + * io_sm.h @@ -74572,7 +74572,7 @@ + +#endif /* IOSM_ */ --- /dev/null -+++ kernel-2.6.28/arch/arm/plat-omap/include/dspbridge/iodefs.h ++++ kernel-maemo-2.6.28/arch/arm/plat-omap/include/dspbridge/iodefs.h @@ -0,0 +1,45 @@ +/* + * iodefs.h @@ -74620,7 +74620,7 @@ + +#endif /* IODEFS_ */ --- /dev/null -+++ kernel-2.6.28/arch/arm/plat-omap/include/dspbridge/kfile.h ++++ kernel-maemo-2.6.28/arch/arm/plat-omap/include/dspbridge/kfile.h @@ -0,0 +1,216 @@ +/* + * kfile.h @@ -74839,7 +74839,7 @@ + +#endif /* KFILE_ */ --- /dev/null -+++ kernel-2.6.28/arch/arm/plat-omap/include/dspbridge/ldr.h ++++ kernel-maemo-2.6.28/arch/arm/plat-omap/include/dspbridge/ldr.h @@ -0,0 +1,51 @@ +/* + * ldr.h @@ -74893,7 +74893,7 @@ + +#endif /* LDR_ */ --- /dev/null -+++ kernel-2.6.28/arch/arm/plat-omap/include/dspbridge/list.h ++++ kernel-maemo-2.6.28/arch/arm/plat-omap/include/dspbridge/list.h @@ -0,0 +1,296 @@ +/* + * list.h @@ -75192,7 +75192,7 @@ + +#endif /* LIST_ */ --- /dev/null -+++ kernel-2.6.28/arch/arm/plat-omap/include/dspbridge/mbx_sh.h ++++ kernel-maemo-2.6.28/arch/arm/plat-omap/include/dspbridge/mbx_sh.h @@ -0,0 +1,213 @@ +/* + * mbx_sh.h @@ -75408,7 +75408,7 @@ + +#endif /* _MBX_SH_H */ --- /dev/null -+++ kernel-2.6.28/arch/arm/plat-omap/include/dspbridge/mem.h ++++ kernel-maemo-2.6.28/arch/arm/plat-omap/include/dspbridge/mem.h @@ -0,0 +1,357 @@ +/* + * mem.h @@ -75768,7 +75768,7 @@ + +#endif /* MEM_ */ --- /dev/null -+++ kernel-2.6.28/arch/arm/plat-omap/include/dspbridge/memdefs.h ++++ kernel-maemo-2.6.28/arch/arm/plat-omap/include/dspbridge/memdefs.h @@ -0,0 +1,52 @@ +/* + * memdefs.h @@ -75823,7 +75823,7 @@ + +#endif /* MEMDEFS_ */ --- /dev/null -+++ kernel-2.6.28/arch/arm/plat-omap/include/dspbridge/mgr.h ++++ kernel-maemo-2.6.28/arch/arm/plat-omap/include/dspbridge/mgr.h @@ -0,0 +1,234 @@ +/* + * mgr.h @@ -76060,7 +76060,7 @@ + +#endif /* MGR_ */ --- /dev/null -+++ kernel-2.6.28/arch/arm/plat-omap/include/dspbridge/mgrpriv.h ++++ kernel-maemo-2.6.28/arch/arm/plat-omap/include/dspbridge/mgrpriv.h @@ -0,0 +1,55 @@ +/* + * mgrpriv.h @@ -76118,7 +76118,7 @@ + +#endif /* MGRPRIV_ */ --- /dev/null -+++ kernel-2.6.28/arch/arm/plat-omap/include/dspbridge/msg.h ++++ kernel-maemo-2.6.28/arch/arm/plat-omap/include/dspbridge/msg.h @@ -0,0 +1,106 @@ +/* + * msg.h @@ -76227,7 +76227,7 @@ + +#endif /* MSG_ */ --- /dev/null -+++ kernel-2.6.28/arch/arm/plat-omap/include/dspbridge/msgdefs.h ++++ kernel-maemo-2.6.28/arch/arm/plat-omap/include/dspbridge/msgdefs.h @@ -0,0 +1,43 @@ +/* + * msgdefs.h @@ -76273,7 +76273,7 @@ +#endif /* MSGDEFS_ */ + --- /dev/null -+++ kernel-2.6.28/arch/arm/plat-omap/include/dspbridge/nldr.h ++++ kernel-maemo-2.6.28/arch/arm/plat-omap/include/dspbridge/nldr.h @@ -0,0 +1,81 @@ +/* + * nldr.h @@ -76357,7 +76357,7 @@ + +#endif /* NLDR_ */ --- /dev/null -+++ kernel-2.6.28/arch/arm/plat-omap/include/dspbridge/nldrdefs.h ++++ kernel-maemo-2.6.28/arch/arm/plat-omap/include/dspbridge/nldrdefs.h @@ -0,0 +1,307 @@ +/* + * nldrdefs.h @@ -76667,7 +76667,7 @@ + +#endif /* NLDRDEFS_ */ --- /dev/null -+++ kernel-2.6.28/arch/arm/plat-omap/include/dspbridge/node.h ++++ kernel-maemo-2.6.28/arch/arm/plat-omap/include/dspbridge/node.h @@ -0,0 +1,622 @@ +/* + * node.h @@ -77292,7 +77292,7 @@ + +#endif /* NODE_ */ --- /dev/null -+++ kernel-2.6.28/arch/arm/plat-omap/include/dspbridge/nodedefs.h ++++ kernel-maemo-2.6.28/arch/arm/plat-omap/include/dspbridge/nodedefs.h @@ -0,0 +1,40 @@ +/* + * nodedefs.h @@ -77335,7 +77335,7 @@ + +#endif /* NODEDEFS_ */ --- /dev/null -+++ kernel-2.6.28/arch/arm/plat-omap/include/dspbridge/nodepriv.h ++++ kernel-maemo-2.6.28/arch/arm/plat-omap/include/dspbridge/nodepriv.h @@ -0,0 +1,202 @@ +/* + * nodepriv.h @@ -77540,7 +77540,7 @@ + +#endif /* NODEPRIV_ */ --- /dev/null -+++ kernel-2.6.28/arch/arm/plat-omap/include/dspbridge/ntfy.h ++++ kernel-maemo-2.6.28/arch/arm/plat-omap/include/dspbridge/ntfy.h @@ -0,0 +1,146 @@ +/* + * ntfy.h @@ -77689,7 +77689,7 @@ + +#endif /* NTFY_ */ --- /dev/null -+++ kernel-2.6.28/arch/arm/plat-omap/include/dspbridge/proc.h ++++ kernel-maemo-2.6.28/arch/arm/plat-omap/include/dspbridge/proc.h @@ -0,0 +1,676 @@ +/* + * proc.h @@ -78368,7 +78368,7 @@ + +#endif /* PROC_ */ --- /dev/null -+++ kernel-2.6.28/arch/arm/plat-omap/include/dspbridge/procpriv.h ++++ kernel-maemo-2.6.28/arch/arm/plat-omap/include/dspbridge/procpriv.h @@ -0,0 +1,35 @@ +/* + * procpriv.h @@ -78406,7 +78406,7 @@ +#endif /* PROCPRIV_ */ + --- /dev/null -+++ kernel-2.6.28/arch/arm/plat-omap/include/dspbridge/pwr.h ++++ kernel-maemo-2.6.28/arch/arm/plat-omap/include/dspbridge/pwr.h @@ -0,0 +1,129 @@ +/* + * pwr.h @@ -78538,7 +78538,7 @@ + +#endif /* PWR_ */ --- /dev/null -+++ kernel-2.6.28/arch/arm/plat-omap/include/dspbridge/pwr_sh.h ++++ kernel-maemo-2.6.28/arch/arm/plat-omap/include/dspbridge/pwr_sh.h @@ -0,0 +1,41 @@ +/* + * pwr_sh.h @@ -78582,7 +78582,7 @@ + +#endif /* PWR_SH_ */ --- /dev/null -+++ kernel-2.6.28/arch/arm/plat-omap/include/dspbridge/reg.h ++++ kernel-maemo-2.6.28/arch/arm/plat-omap/include/dspbridge/reg.h @@ -0,0 +1,257 @@ +/* + * reg.h @@ -78842,7 +78842,7 @@ + +#endif /* _REG_H */ --- /dev/null -+++ kernel-2.6.28/arch/arm/plat-omap/include/dspbridge/resourcecleanup.h ++++ kernel-maemo-2.6.28/arch/arm/plat-omap/include/dspbridge/resourcecleanup.h @@ -0,0 +1,83 @@ +/* + * resourcecleanup.h @@ -78928,7 +78928,7 @@ + +#endif --- /dev/null -+++ kernel-2.6.28/arch/arm/plat-omap/include/dspbridge/rmm.h ++++ kernel-maemo-2.6.28/arch/arm/plat-omap/include/dspbridge/rmm.h @@ -0,0 +1,199 @@ +/* + * rmm.h @@ -79130,7 +79130,7 @@ + +#endif /* RMM_ */ --- /dev/null -+++ kernel-2.6.28/arch/arm/plat-omap/include/dspbridge/rms_sh.h ++++ kernel-maemo-2.6.28/arch/arm/plat-omap/include/dspbridge/rms_sh.h @@ -0,0 +1,125 @@ +/* + * rms_sh.h @@ -79258,7 +79258,7 @@ +#endif /* RMS_SH_ */ + --- /dev/null -+++ kernel-2.6.28/arch/arm/plat-omap/include/dspbridge/rmstypes.h ++++ kernel-maemo-2.6.28/arch/arm/plat-omap/include/dspbridge/rmstypes.h @@ -0,0 +1,40 @@ +/* + * rmstypes.h @@ -79301,7 +79301,7 @@ + +#endif /* RMSTYPES_ */ --- /dev/null -+++ kernel-2.6.28/arch/arm/plat-omap/include/dspbridge/services.h ++++ kernel-maemo-2.6.28/arch/arm/plat-omap/include/dspbridge/services.h @@ -0,0 +1,63 @@ +/* + * services.h @@ -79367,7 +79367,7 @@ + +#endif /* SERVICES_ */ --- /dev/null -+++ kernel-2.6.28/arch/arm/plat-omap/include/dspbridge/std.h ++++ kernel-maemo-2.6.28/arch/arm/plat-omap/include/dspbridge/std.h @@ -0,0 +1,143 @@ +/* + * std.h @@ -79513,7 +79513,7 @@ + +#endif /* STD_ */ --- /dev/null -+++ kernel-2.6.28/arch/arm/plat-omap/include/dspbridge/strm.h ++++ kernel-maemo-2.6.28/arch/arm/plat-omap/include/dspbridge/strm.h @@ -0,0 +1,446 @@ +/* + * strm.h @@ -79962,7 +79962,7 @@ + +#endif /* STRM_ */ --- /dev/null -+++ kernel-2.6.28/arch/arm/plat-omap/include/dspbridge/strmdefs.h ++++ kernel-maemo-2.6.28/arch/arm/plat-omap/include/dspbridge/strmdefs.h @@ -0,0 +1,57 @@ +/* + * strmdefs.h @@ -80022,7 +80022,7 @@ +#endif /* STRMDEFS_ */ + --- /dev/null -+++ kernel-2.6.28/arch/arm/plat-omap/include/dspbridge/sync.h ++++ kernel-maemo-2.6.28/arch/arm/plat-omap/include/dspbridge/sync.h @@ -0,0 +1,340 @@ +/* + * sync.h @@ -80365,7 +80365,7 @@ + +#endif /* _SYNC_H */ --- /dev/null -+++ kernel-2.6.28/arch/arm/plat-omap/include/dspbridge/util.h ++++ kernel-maemo-2.6.28/arch/arm/plat-omap/include/dspbridge/util.h @@ -0,0 +1,122 @@ +/* + * util.h @@ -80490,7 +80490,7 @@ + +#endif /* _UTIL_H */ --- /dev/null -+++ kernel-2.6.28/arch/arm/plat-omap/include/dspbridge/utildefs.h ++++ kernel-maemo-2.6.28/arch/arm/plat-omap/include/dspbridge/utildefs.h @@ -0,0 +1,51 @@ +/* + * utildefs.h @@ -80544,7 +80544,7 @@ + +#endif /* UTILDEFS_ */ --- /dev/null -+++ kernel-2.6.28/arch/arm/plat-omap/include/dspbridge/uuidutil.h ++++ kernel-maemo-2.6.28/arch/arm/plat-omap/include/dspbridge/uuidutil.h @@ -0,0 +1,74 @@ +/* + * uuidutil.h @@ -80621,7 +80621,7 @@ + +#endif /* UUIDUTIL_ */ --- /dev/null -+++ kernel-2.6.28/arch/arm/plat-omap/include/dspbridge/wcd.h ++++ kernel-maemo-2.6.28/arch/arm/plat-omap/include/dspbridge/wcd.h @@ -0,0 +1,61 @@ +/* + * wcd.h @@ -80685,7 +80685,7 @@ + +#endif /* WCD_ */ --- /dev/null -+++ kernel-2.6.28/arch/arm/plat-omap/include/dspbridge/wcdioctl.h ++++ kernel-maemo-2.6.28/arch/arm/plat-omap/include/dspbridge/wcdioctl.h @@ -0,0 +1,519 @@ +/* + * wcdioctl.h @@ -81207,7 +81207,7 @@ +#define CMD_BASE_END_OFFSET CMD_CMM_END_OFFSET +#endif /* WCDIOCTL_ */ --- /dev/null -+++ kernel-2.6.28/arch/arm/plat-omap/include/dspbridge/wmd.h ++++ kernel-maemo-2.6.28/arch/arm/plat-omap/include/dspbridge/wmd.h @@ -0,0 +1,1193 @@ +/* + * wmd.h @@ -82403,7 +82403,7 @@ + +#endif /* WMD_ */ --- /dev/null -+++ kernel-2.6.28/arch/arm/plat-omap/include/dspbridge/wmdchnl.h ++++ kernel-maemo-2.6.28/arch/arm/plat-omap/include/dspbridge/wmdchnl.h @@ -0,0 +1,90 @@ +/* + * wmdchnl.h @@ -82496,7 +82496,7 @@ + +#endif /* WMDCHNL_ */ --- /dev/null -+++ kernel-2.6.28/arch/arm/plat-omap/include/dspbridge/wmddeh.h ++++ kernel-maemo-2.6.28/arch/arm/plat-omap/include/dspbridge/wmddeh.h @@ -0,0 +1,66 @@ +/* + * wmddeh.h @@ -82565,7 +82565,7 @@ + extern void WMD_DEH_ReleaseDummyMem(void); +#endif /* WMDDEH_ */ --- /dev/null -+++ kernel-2.6.28/arch/arm/plat-omap/include/dspbridge/wmdio.h ++++ kernel-maemo-2.6.28/arch/arm/plat-omap/include/dspbridge/wmdio.h @@ -0,0 +1,53 @@ +/* + * wmdio.h @@ -82621,7 +82621,7 @@ + +#endif /* WMDIO_ */ --- /dev/null -+++ kernel-2.6.28/arch/arm/plat-omap/include/dspbridge/wmdioctl.h ++++ kernel-maemo-2.6.28/arch/arm/plat-omap/include/dspbridge/wmdioctl.h @@ -0,0 +1,91 @@ +/* + * wmdioctl.h @@ -82715,7 +82715,7 @@ +#endif /* WMDIOCTL_ */ + --- /dev/null -+++ kernel-2.6.28/arch/arm/plat-omap/include/dspbridge/wmdmsg.h ++++ kernel-maemo-2.6.28/arch/arm/plat-omap/include/dspbridge/wmdmsg.h @@ -0,0 +1,70 @@ +/* + * wmdmsg.h @@ -82788,7 +82788,7 @@ + +#endif /* WMDMSG_ */ --- /dev/null -+++ kernel-2.6.28/arch/arm/plat-omap/include/mach/board-3430sdp.h ++++ kernel-maemo-2.6.28/arch/arm/plat-omap/include/mach/board-3430sdp.h @@ -0,0 +1,72 @@ +/* + * arch/arm/plat-omap/include/mach/board-3430sdp.h @@ -82862,8 +82862,8 @@ + +#endif /* __ASM_ARCH_OMAP_3430SDP_H */ + ---- kernel-2.6.28.orig/arch/arm/plat-omap/include/mach/board-apollon.h -+++ kernel-2.6.28/arch/arm/plat-omap/include/mach/board-apollon.h +--- kernel-maemo-2.6.28.orig/arch/arm/plat-omap/include/mach/board-apollon.h ++++ kernel-maemo-2.6.28/arch/arm/plat-omap/include/mach/board-apollon.h @@ -29,12 +29,14 @@ #ifndef __ASM_ARCH_OMAP_APOLLON_H #define __ASM_ARCH_OMAP_APOLLON_H @@ -82880,8 +82880,8 @@ } /* Placeholder for APOLLON specific defines */ ---- kernel-2.6.28.orig/arch/arm/plat-omap/include/mach/board-h2.h -+++ kernel-2.6.28/arch/arm/plat-omap/include/mach/board-h2.h +--- kernel-maemo-2.6.28.orig/arch/arm/plat-omap/include/mach/board-h2.h ++++ kernel-maemo-2.6.28/arch/arm/plat-omap/include/mach/board-h2.h @@ -29,13 +29,13 @@ #ifndef __ASM_ARCH_OMAP_H2_H #define __ASM_ARCH_OMAP_H2_H @@ -82899,8 +82899,8 @@ #endif /* __ASM_ARCH_OMAP_H2_H */ ---- kernel-2.6.28.orig/arch/arm/plat-omap/include/mach/board-h3.h -+++ kernel-2.6.28/arch/arm/plat-omap/include/mach/board-h3.h +--- kernel-maemo-2.6.28.orig/arch/arm/plat-omap/include/mach/board-h3.h ++++ kernel-maemo-2.6.28/arch/arm/plat-omap/include/mach/board-h3.h @@ -30,7 +30,9 @@ /* In OMAP1710 H3 the Ethernet is directly connected to CS1 */ #define OMAP1710_ETHR_START 0x04000300 @@ -82912,8 +82912,8 @@ -extern void h3_mmc_slot_cover_handler(void *arg, int state); #endif /* __ASM_ARCH_OMAP_H3_H */ ---- kernel-2.6.28.orig/arch/arm/plat-omap/include/mach/board-h4.h -+++ kernel-2.6.28/arch/arm/plat-omap/include/mach/board-h4.h +--- kernel-maemo-2.6.28.orig/arch/arm/plat-omap/include/mach/board-h4.h ++++ kernel-maemo-2.6.28/arch/arm/plat-omap/include/mach/board-h4.h @@ -34,5 +34,47 @@ /* Placeholder for H4 specific defines */ @@ -82962,8 +82962,8 @@ + #endif /* __ASM_ARCH_OMAP_H4_H */ ---- kernel-2.6.28.orig/arch/arm/plat-omap/include/mach/board-ldp.h -+++ kernel-2.6.28/arch/arm/plat-omap/include/mach/board-ldp.h +--- kernel-maemo-2.6.28.orig/arch/arm/plat-omap/include/mach/board-ldp.h ++++ kernel-maemo-2.6.28/arch/arm/plat-omap/include/mach/board-ldp.h @@ -32,5 +32,8 @@ extern void twl4030_bci_battery_init(void); @@ -82974,8 +82974,8 @@ +#define DEBUG_BASE 0x08000000 +#define OMAP34XX_ETHR_START DEBUG_BASE #endif /* __ASM_ARCH_OMAP_LDP_H */ ---- kernel-2.6.28.orig/arch/arm/plat-omap/include/mach/board-nokia.h -+++ kernel-2.6.28/arch/arm/plat-omap/include/mach/board-nokia.h +--- kernel-maemo-2.6.28.orig/arch/arm/plat-omap/include/mach/board-nokia.h ++++ kernel-maemo-2.6.28/arch/arm/plat-omap/include/mach/board-nokia.h @@ -6,19 +6,33 @@ * Copyright (C) 2005 Nokia Corporation */ @@ -83014,7 +83014,7 @@ #define BT_SYSCLK_12 1 #define BT_SYSCLK_38_4 2 --- /dev/null -+++ kernel-2.6.28/arch/arm/plat-omap/include/mach/board-omap2evm.h ++++ kernel-maemo-2.6.28/arch/arm/plat-omap/include/mach/board-omap2evm.h @@ -0,0 +1,38 @@ +/* + * arch/arm/plat-omap/include/mach/board-omap2evm.h @@ -83055,7 +83055,7 @@ + +#endif /* __ASM_ARCH_OMAP2_EVM_H */ --- /dev/null -+++ kernel-2.6.28/arch/arm/plat-omap/include/mach/board-omap3evm.h ++++ kernel-maemo-2.6.28/arch/arm/plat-omap/include/mach/board-omap3evm.h @@ -0,0 +1,44 @@ +/* + * arch/arm/plat-omap/include/mach/board-omap3evm.h @@ -83102,7 +83102,7 @@ +#endif /* __ASM_ARCH_OMAP3_EVM_H */ + --- /dev/null -+++ kernel-2.6.28/arch/arm/plat-omap/include/mach/board-rx51.h ++++ kernel-maemo-2.6.28/arch/arm/plat-omap/include/mach/board-rx51.h @@ -0,0 +1,47 @@ +/* + * linux/include/asm-arm/arch-omap/board-rx51.h @@ -83152,7 +83152,7 @@ +#endif /* __ASM_ARCH_OMAP_BOARD_RX51_H */ + --- /dev/null -+++ kernel-2.6.28/arch/arm/plat-omap/include/mach/board-rx71.h ++++ kernel-maemo-2.6.28/arch/arm/plat-omap/include/mach/board-rx71.h @@ -0,0 +1,41 @@ +/* + * linux/include/asm-arm/arch-omap/board-rx71.h @@ -83195,8 +83195,8 @@ + +#endif /* __ASM_ARCH_OMAP_BOARD_RX71_H */ + ---- kernel-2.6.28.orig/arch/arm/plat-omap/include/mach/board.h -+++ kernel-2.6.28/arch/arm/plat-omap/include/mach/board.h +--- kernel-maemo-2.6.28.orig/arch/arm/plat-omap/include/mach/board.h ++++ kernel-maemo-2.6.28/arch/arm/plat-omap/include/mach/board.h @@ -16,7 +16,6 @@ /* Different peripheral ids */ @@ -83310,8 +83310,8 @@ struct omap_board_config_entry { u16 tag; u16 len; ---- kernel-2.6.28.orig/arch/arm/plat-omap/include/mach/clock.h -+++ kernel-2.6.28/arch/arm/plat-omap/include/mach/clock.h +--- kernel-maemo-2.6.28.orig/arch/arm/plat-omap/include/mach/clock.h ++++ kernel-maemo-2.6.28/arch/arm/plat-omap/include/mach/clock.h @@ -10,6 +10,8 @@ * published by the Free Software Foundation. */ @@ -83594,8 +83594,8 @@ +#define CLK_POST_RATE_CHANGE 3 #endif ---- kernel-2.6.28.orig/arch/arm/plat-omap/include/mach/clockdomain.h -+++ kernel-2.6.28/arch/arm/plat-omap/include/mach/clockdomain.h +--- kernel-maemo-2.6.28.orig/arch/arm/plat-omap/include/mach/clockdomain.h ++++ kernel-maemo-2.6.28/arch/arm/plat-omap/include/mach/clockdomain.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-omap/clockdomain.h @@ -83658,8 +83658,8 @@ struct powerdomain *clkdm_get_pwrdm(struct clockdomain *clkdm); void omap2_clkdm_allow_idle(struct clockdomain *clkdm); ---- kernel-2.6.28.orig/arch/arm/plat-omap/include/mach/common.h -+++ kernel-2.6.28/arch/arm/plat-omap/include/mach/common.h +--- kernel-maemo-2.6.28.orig/arch/arm/plat-omap/include/mach/common.h ++++ kernel-maemo-2.6.28/arch/arm/plat-omap/include/mach/common.h @@ -33,9 +33,7 @@ extern void omap_map_common_io(void); @@ -83686,8 +83686,8 @@ +#endif #endif /* __ARCH_ARM_MACH_OMAP_COMMON_H */ ---- kernel-2.6.28.orig/arch/arm/plat-omap/include/mach/control.h -+++ kernel-2.6.28/arch/arm/plat-omap/include/mach/control.h +--- kernel-maemo-2.6.28.orig/arch/arm/plat-omap/include/mach/control.h ++++ kernel-maemo-2.6.28/arch/arm/plat-omap/include/mach/control.h @@ -74,6 +74,7 @@ #define OMAP243X_CONTROL_IVA2_BOOTADDR (OMAP2_CONTROL_GENERAL + 0x0190) #define OMAP243X_CONTROL_IVA2_BOOTMOD (OMAP2_CONTROL_GENERAL + 0x0194) @@ -83842,8 +83842,8 @@ #else #define omap_ctrl_base_get() 0 #define omap_ctrl_readb(x) 0 ---- kernel-2.6.28.orig/arch/arm/plat-omap/include/mach/cpu.h -+++ kernel-2.6.28/arch/arm/plat-omap/include/mach/cpu.h +--- kernel-maemo-2.6.28.orig/arch/arm/plat-omap/include/mach/cpu.h ++++ kernel-maemo-2.6.28/arch/arm/plat-omap/include/mach/cpu.h @@ -28,13 +28,18 @@ struct omap_chip_id { @@ -84012,7 +84012,7 @@ void omap2_check_revision(void); --- /dev/null -+++ kernel-2.6.28/arch/arm/plat-omap/include/mach/debobs.h ++++ kernel-maemo-2.6.28/arch/arm/plat-omap/include/mach/debobs.h @@ -0,0 +1,7 @@ +#ifndef __DEBOBS_H +#define __DEBOBS_H @@ -84022,7 +84022,7 @@ + +#endif --- /dev/null -+++ kernel-2.6.28/arch/arm/plat-omap/include/mach/display.h ++++ kernel-maemo-2.6.28/arch/arm/plat-omap/include/mach/display.h @@ -0,0 +1,588 @@ +/* + * linux/include/asm-arm/arch-omap/display.h @@ -84612,8 +84612,8 @@ +void omap_dss_unlock(void); + +#endif ---- kernel-2.6.28.orig/arch/arm/plat-omap/include/mach/dma.h -+++ kernel-2.6.28/arch/arm/plat-omap/include/mach/dma.h +--- kernel-maemo-2.6.28.orig/arch/arm/plat-omap/include/mach/dma.h ++++ kernel-maemo-2.6.28/arch/arm/plat-omap/include/mach/dma.h @@ -144,6 +144,7 @@ #define OMAP_DMA4_CSSA_U(n) 0 #define OMAP_DMA4_CDSA_L(n) 0 @@ -84657,7 +84657,7 @@ #ifndef CONFIG_ARCH_OMAP1 extern int omap_request_dma_chain(int dev_id, const char *dev_name, --- /dev/null -+++ kernel-2.6.28/arch/arm/plat-omap/include/mach/dsp.h ++++ kernel-maemo-2.6.28/arch/arm/plat-omap/include/mach/dsp.h @@ -0,0 +1,118 @@ +/* + * This file is part of OMAP DSP driver (DSP Gateway version 3.3.1) @@ -84777,8 +84777,8 @@ +#define TADD_ABORTADR 0xffffffff + +#endif /* __ARCH_OMAP_DSP_H */ ---- kernel-2.6.28.orig/arch/arm/plat-omap/include/mach/dsp_common.h -+++ kernel-2.6.28/arch/arm/plat-omap/include/mach/dsp_common.h +--- kernel-maemo-2.6.28.orig/arch/arm/plat-omap/include/mach/dsp_common.h ++++ kernel-maemo-2.6.28/arch/arm/plat-omap/include/mach/dsp_common.h @@ -5,25 +5,50 @@ * * Contact: Toshihiro Kobayashi @@ -84845,7 +84845,7 @@ extern void omap_dsp_request_mpui(void); extern void omap_dsp_release_mpui(void); --- /dev/null -+++ kernel-2.6.28/arch/arm/plat-omap/include/mach/dss_boottime.h ++++ kernel-maemo-2.6.28/arch/arm/plat-omap/include/mach/dss_boottime.h @@ -0,0 +1,16 @@ +#ifndef _DSS_BOOTTIME_H +#define _DSS_BOOTTIME_H @@ -84863,8 +84863,8 @@ + +#endif + ---- kernel-2.6.28.orig/arch/arm/plat-omap/include/mach/gpio-switch.h -+++ kernel-2.6.28/arch/arm/plat-omap/include/mach/gpio-switch.h +--- kernel-maemo-2.6.28.orig/arch/arm/plat-omap/include/mach/gpio-switch.h ++++ kernel-maemo-2.6.28/arch/arm/plat-omap/include/mach/gpio-switch.h @@ -24,11 +24,12 @@ * low -> inactive * @@ -84895,8 +84895,8 @@ +#endif #endif ---- kernel-2.6.28.orig/arch/arm/plat-omap/include/mach/gpio.h -+++ kernel-2.6.28/arch/arm/plat-omap/include/mach/gpio.h +--- kernel-maemo-2.6.28.orig/arch/arm/plat-omap/include/mach/gpio.h ++++ kernel-maemo-2.6.28/arch/arm/plat-omap/include/mach/gpio.h @@ -71,16 +71,13 @@ IH_GPIO_BASE + (nr)) @@ -84948,8 +84948,8 @@ } #endif ---- kernel-2.6.28.orig/arch/arm/plat-omap/include/mach/gpmc.h -+++ kernel-2.6.28/arch/arm/plat-omap/include/mach/gpmc.h +--- kernel-maemo-2.6.28.orig/arch/arm/plat-omap/include/mach/gpmc.h ++++ kernel-maemo-2.6.28/arch/arm/plat-omap/include/mach/gpmc.h @@ -25,8 +25,18 @@ #define GPMC_CS_NAND_ADDRESS 0x20 #define GPMC_CS_NAND_DATA 0x24 @@ -84987,8 +84987,8 @@ +extern void __init gpmc_init(void); #endif ---- kernel-2.6.28.orig/arch/arm/plat-omap/include/mach/hardware.h -+++ kernel-2.6.28/arch/arm/plat-omap/include/mach/hardware.h +--- kernel-maemo-2.6.28.orig/arch/arm/plat-omap/include/mach/hardware.h ++++ kernel-maemo-2.6.28/arch/arm/plat-omap/include/mach/hardware.h @@ -318,10 +318,35 @@ #include "board-h4.h" #endif @@ -85025,8 +85025,8 @@ #ifdef CONFIG_MACH_OMAP3_BEAGLE #include "board-omap3beagle.h" #endif ---- kernel-2.6.28.orig/arch/arm/plat-omap/include/mach/io.h -+++ kernel-2.6.28/arch/arm/plat-omap/include/mach/io.h +--- kernel-maemo-2.6.28.orig/arch/arm/plat-omap/include/mach/io.h ++++ kernel-maemo-2.6.28/arch/arm/plat-omap/include/mach/io.h @@ -187,11 +187,18 @@ #define omap_writew(v,a) __raw_writew(v, IO_ADDRESS(a)) #define omap_writel(v,a) __raw_writel(v, IO_ADDRESS(a)) @@ -85048,7 +85048,7 @@ #define __arch_ioremap(p,s,t) omap_ioremap(p,s,t) #define __arch_iounmap(v) omap_iounmap(v) --- /dev/null -+++ kernel-2.6.28/arch/arm/plat-omap/include/mach/iommu.h ++++ kernel-maemo-2.6.28/arch/arm/plat-omap/include/mach/iommu.h @@ -0,0 +1,164 @@ +/* + * omap iommu: main structures @@ -85215,7 +85215,7 @@ + +#endif /* __MACH_IOMMU_H */ --- /dev/null -+++ kernel-2.6.28/arch/arm/plat-omap/include/mach/iommu2.h ++++ kernel-maemo-2.6.28/arch/arm/plat-omap/include/mach/iommu2.h @@ -0,0 +1,94 @@ +/* + * omap iommu: omap2 architecture specific definitions @@ -85312,7 +85312,7 @@ + +#endif /* __MACH_IOMMU2_H */ --- /dev/null -+++ kernel-2.6.28/arch/arm/plat-omap/include/mach/iovmm.h ++++ kernel-maemo-2.6.28/arch/arm/plat-omap/include/mach/iovmm.h @@ -0,0 +1,94 @@ +/* + * omap iommu: simple virtual address space management @@ -85408,8 +85408,8 @@ +extern void *da_to_va(struct iommu *obj, u32 da); + +#endif /* __IOMMU_MMAP_H */ ---- kernel-2.6.28.orig/arch/arm/plat-omap/include/mach/irqs.h -+++ kernel-2.6.28/arch/arm/plat-omap/include/mach/irqs.h +--- kernel-maemo-2.6.28.orig/arch/arm/plat-omap/include/mach/irqs.h ++++ kernel-maemo-2.6.28/arch/arm/plat-omap/include/mach/irqs.h @@ -339,8 +339,6 @@ #define INT_34XX_MMC3_IRQ 94 #define INT_34XX_GPT12_IRQ 95 @@ -85435,7 +85435,7 @@ #include --- /dev/null -+++ kernel-2.6.28/arch/arm/plat-omap/include/mach/isp_user.h ++++ kernel-maemo-2.6.28/arch/arm/plat-omap/include/mach/isp_user.h @@ -0,0 +1,692 @@ +/* + * isp_user.h @@ -86129,8 +86129,8 @@ +}; + +#endif /* OMAP_ISP_USER_H */ ---- kernel-2.6.28.orig/arch/arm/plat-omap/include/mach/keypad.h -+++ kernel-2.6.28/arch/arm/plat-omap/include/mach/keypad.h +--- kernel-maemo-2.6.28.orig/arch/arm/plat-omap/include/mach/keypad.h ++++ kernel-maemo-2.6.28/arch/arm/plat-omap/include/mach/keypad.h @@ -14,6 +14,7 @@ int rows; int cols; @@ -86152,8 +86152,8 @@ #endif ---- kernel-2.6.28.orig/arch/arm/plat-omap/include/mach/lcd_mipid.h -+++ kernel-2.6.28/arch/arm/plat-omap/include/mach/lcd_mipid.h +--- kernel-maemo-2.6.28.orig/arch/arm/plat-omap/include/mach/lcd_mipid.h ++++ kernel-maemo-2.6.28/arch/arm/plat-omap/include/mach/lcd_mipid.h @@ -16,7 +16,15 @@ struct mipid_platform_data { int nreset_gpio; @@ -86170,8 +86170,8 @@ }; #endif ---- kernel-2.6.28.orig/arch/arm/plat-omap/include/mach/mailbox.h -+++ kernel-2.6.28/arch/arm/plat-omap/include/mach/mailbox.h +--- kernel-maemo-2.6.28.orig/arch/arm/plat-omap/include/mach/mailbox.h ++++ kernel-maemo-2.6.28/arch/arm/plat-omap/include/mach/mailbox.h @@ -33,6 +33,9 @@ void (*disable_irq)(struct omap_mbox *mbox, omap_mbox_irq_t irq); void (*ack_irq)(struct omap_mbox *mbox, omap_mbox_irq_t irq); @@ -86220,8 +86220,8 @@ +} + #endif /* MAILBOX_H */ ---- kernel-2.6.28.orig/arch/arm/plat-omap/include/mach/mcbsp.h -+++ kernel-2.6.28/arch/arm/plat-omap/include/mach/mcbsp.h +--- kernel-maemo-2.6.28.orig/arch/arm/plat-omap/include/mach/mcbsp.h ++++ kernel-maemo-2.6.28/arch/arm/plat-omap/include/mach/mcbsp.h @@ -49,7 +49,9 @@ #define OMAP34XX_MCBSP1_BASE 0x48074000 @@ -86399,8 +86399,8 @@ void omap_mcbsp_xmit_word(unsigned int id, u32 word); u32 omap_mcbsp_recv_word(unsigned int id); ---- kernel-2.6.28.orig/arch/arm/plat-omap/include/mach/mmc.h -+++ kernel-2.6.28/arch/arm/plat-omap/include/mach/mmc.h +--- kernel-maemo-2.6.28.orig/arch/arm/plat-omap/include/mach/mmc.h ++++ kernel-maemo-2.6.28/arch/arm/plat-omap/include/mach/mmc.h @@ -17,12 +17,28 @@ #include @@ -86525,7 +86525,7 @@ +#endif #endif --- /dev/null -+++ kernel-2.6.28/arch/arm/plat-omap/include/mach/mmu.h ++++ kernel-maemo-2.6.28/arch/arm/plat-omap/include/mach/mmu.h @@ -0,0 +1,211 @@ +#ifndef __ARCH_OMAP_MMU_H +#define __ARCH_OMAP_MMU_H @@ -86738,8 +86738,8 @@ + char *buf, loff_t offset, size_t count); + +#endif /* __ARCH_OMAP_MMU_H */ ---- kernel-2.6.28.orig/arch/arm/plat-omap/include/mach/mux.h -+++ kernel-2.6.28/arch/arm/plat-omap/include/mach/mux.h +--- kernel-maemo-2.6.28.orig/arch/arm/plat-omap/include/mach/mux.h ++++ kernel-maemo-2.6.28/arch/arm/plat-omap/include/mach/mux.h @@ -632,6 +632,15 @@ AC7_2430_USB0HS_DATA7, @@ -86812,8 +86812,8 @@ }; struct omap_mux_cfg { ---- kernel-2.6.28.orig/arch/arm/plat-omap/include/mach/omap-alsa.h -+++ kernel-2.6.28/arch/arm/plat-omap/include/mach/omap-alsa.h +--- kernel-maemo-2.6.28.orig/arch/arm/plat-omap/include/mach/omap-alsa.h ++++ kernel-maemo-2.6.28/arch/arm/plat-omap/include/mach/omap-alsa.h @@ -45,6 +45,33 @@ #include #include @@ -86875,7 +86875,7 @@ #ifdef CONFIG_PM int snd_omap_alsa_suspend(struct platform_device *pdev, pm_message_t state); --- /dev/null -+++ kernel-2.6.28/arch/arm/plat-omap/include/mach/omap-pm.h ++++ kernel-maemo-2.6.28/arch/arm/plat-omap/include/mach/omap-pm.h @@ -0,0 +1,406 @@ +/* + * omap-pm.h - OMAP power management interface @@ -87283,8 +87283,8 @@ +#endif + +#endif ---- kernel-2.6.28.orig/arch/arm/plat-omap/include/mach/omap34xx.h -+++ kernel-2.6.28/arch/arm/plat-omap/include/mach/omap34xx.h +--- kernel-maemo-2.6.28.orig/arch/arm/plat-omap/include/mach/omap34xx.h ++++ kernel-maemo-2.6.28/arch/arm/plat-omap/include/mach/omap34xx.h @@ -47,12 +47,44 @@ #define OMAP34XX_GPMC_BASE 0x6E000000 #define OMAP343X_SCM_BASE 0x48002000 @@ -87355,7 +87355,7 @@ #endif /* __ASM_ARCH_OMAP34XX_H */ --- /dev/null -+++ kernel-2.6.28/arch/arm/plat-omap/include/mach/omapdev.h ++++ kernel-maemo-2.6.28/arch/arm/plat-omap/include/mach/omapdev.h @@ -0,0 +1,58 @@ +/* + * OMAP on-chip device: structure and function call definitions @@ -87415,8 +87415,8 @@ + + +#endif ---- kernel-2.6.28.orig/arch/arm/plat-omap/include/mach/pm.h -+++ kernel-2.6.28/arch/arm/plat-omap/include/mach/pm.h +--- kernel-maemo-2.6.28.orig/arch/arm/plat-omap/include/mach/pm.h ++++ kernel-maemo-2.6.28/arch/arm/plat-omap/include/mach/pm.h @@ -107,7 +107,8 @@ #if !defined(CONFIG_ARCH_OMAP730) && \ !defined(CONFIG_ARCH_OMAP15XX) && \ @@ -87551,8 +87551,8 @@ - #endif /* ASSEMBLER */ #endif /* __ASM_ARCH_OMAP_PM_H */ ---- kernel-2.6.28.orig/arch/arm/plat-omap/include/mach/powerdomain.h -+++ kernel-2.6.28/arch/arm/plat-omap/include/mach/powerdomain.h +--- kernel-maemo-2.6.28.orig/arch/arm/plat-omap/include/mach/powerdomain.h ++++ kernel-maemo-2.6.28/arch/arm/plat-omap/include/mach/powerdomain.h @@ -50,9 +50,9 @@ /* @@ -87607,8 +87607,8 @@ +int pwrdm_post_transition(void); + #endif ---- kernel-2.6.28.orig/arch/arm/plat-omap/include/mach/prcm.h -+++ kernel-2.6.28/arch/arm/plat-omap/include/mach/prcm.h +--- kernel-maemo-2.6.28.orig/arch/arm/plat-omap/include/mach/prcm.h ++++ kernel-maemo-2.6.28/arch/arm/plat-omap/include/mach/prcm.h @@ -20,11 +20,21 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ @@ -87634,7 +87634,7 @@ --- /dev/null -+++ kernel-2.6.28/arch/arm/plat-omap/include/mach/resource.h ++++ kernel-maemo-2.6.28/arch/arm/plat-omap/include/mach/resource.h @@ -0,0 +1,84 @@ +/* + * linux/include/asm-arm/arch-omap/resource.h @@ -87720,8 +87720,8 @@ +int resource_get_level(const char *name); + +#endif /* __ARCH_ARM_OMAP_RESOURCE_H */ ---- kernel-2.6.28.orig/arch/arm/plat-omap/include/mach/sdrc.h -+++ kernel-2.6.28/arch/arm/plat-omap/include/mach/sdrc.h +--- kernel-maemo-2.6.28.orig/arch/arm/plat-omap/include/mach/sdrc.h ++++ kernel-maemo-2.6.28/arch/arm/plat-omap/include/mach/sdrc.h @@ -4,10 +4,12 @@ /* * OMAP2/3 SDRC/SMS register definitions @@ -87841,8 +87841,8 @@ +#endif /* __ASSEMBLER__ */ + #endif ---- kernel-2.6.28.orig/arch/arm/plat-omap/include/mach/serial.h -+++ kernel-2.6.28/arch/arm/plat-omap/include/mach/serial.h +--- kernel-maemo-2.6.28.orig/arch/arm/plat-omap/include/mach/serial.h ++++ kernel-maemo-2.6.28/arch/arm/plat-omap/include/mach/serial.h @@ -40,4 +40,14 @@ __ret; \ }) @@ -87858,8 +87858,8 @@ +#endif + #endif ---- kernel-2.6.28.orig/arch/arm/plat-omap/include/mach/sram.h -+++ kernel-2.6.28/arch/arm/plat-omap/include/mach/sram.h +--- kernel-maemo-2.6.28.orig/arch/arm/plat-omap/include/mach/sram.h ++++ kernel-maemo-2.6.28/arch/arm/plat-omap/include/mach/sram.h @@ -21,9 +21,12 @@ u32 mem_type); extern u32 omap2_set_prcm(u32 dpll_ctrl_val, u32 sdrc_rfr_val, int bypass); @@ -87899,7 +87899,7 @@ + #endif --- /dev/null -+++ kernel-2.6.28/arch/arm/plat-omap/include/mach/ssi.h ++++ kernel-maemo-2.6.28/arch/arm/plat-omap/include/mach/ssi.h @@ -0,0 +1,303 @@ +/* + * mach/ssi.h @@ -88205,7 +88205,7 @@ +extern int omap_ssi_config(struct omap_ssi_board_config *ssi_config); +#endif --- /dev/null -+++ kernel-2.6.28/arch/arm/plat-omap/include/mach/sti.h ++++ kernel-maemo-2.6.28/arch/arm/plat-omap/include/mach/sti.h @@ -0,0 +1,172 @@ +#ifndef __ASM_ARCH_OMAP_STI_H +#define __ASM_ARCH_OMAP_STI_H @@ -88379,8 +88379,8 @@ + sti_channel_writeb(channel, STI_TRACE_CONTROL_CHANNEL); +} +#endif /* __ASM_ARCH_OMAP_STI_H */ ---- kernel-2.6.28.orig/arch/arm/plat-omap/include/mach/system.h -+++ kernel-2.6.28/arch/arm/plat-omap/include/mach/system.h +--- kernel-maemo-2.6.28.orig/arch/arm/plat-omap/include/mach/system.h ++++ kernel-maemo-2.6.28/arch/arm/plat-omap/include/mach/system.h @@ -9,12 +9,12 @@ #include #include @@ -88396,8 +88396,8 @@ static inline void arch_idle(void) { cpu_do_idle(); ---- kernel-2.6.28.orig/arch/arm/plat-omap/include/mach/timex.h -+++ kernel-2.6.28/arch/arm/plat-omap/include/mach/timex.h +--- kernel-maemo-2.6.28.orig/arch/arm/plat-omap/include/mach/timex.h ++++ kernel-maemo-2.6.28/arch/arm/plat-omap/include/mach/timex.h @@ -38,4 +38,6 @@ #define CLOCK_TICK_RATE (HZ * 100000UL) #endif @@ -88406,7 +88406,7 @@ + #endif /* __ASM_ARCH_OMAP_TIMEX_H */ --- /dev/null -+++ kernel-2.6.28/arch/arm/plat-omap/include/mach/usb-ehci.h ++++ kernel-maemo-2.6.28/arch/arm/plat-omap/include/mach/usb-ehci.h @@ -0,0 +1,35 @@ +/* + * arch/arm/plat-omap/include/mach/usb-ehci.h @@ -88444,7 +88444,7 @@ +#endif /* __ASM_ARCH_OMAP_USB_EHCI_H */ + --- /dev/null -+++ kernel-2.6.28/arch/arm/plat-omap/include/mach/usb-musb.h ++++ kernel-maemo-2.6.28/arch/arm/plat-omap/include/mach/usb-musb.h @@ -0,0 +1,36 @@ +/* + * arch/arm/plat-omap/include/mach/usb-musb.h @@ -88482,8 +88482,8 @@ + +#endif /* __ASM_ARCH_OMAP_USB_MUSB_H */ + ---- kernel-2.6.28.orig/arch/arm/plat-omap/include/mach/usb.h -+++ kernel-2.6.28/arch/arm/plat-omap/include/mach/usb.h +--- kernel-maemo-2.6.28.orig/arch/arm/plat-omap/include/mach/usb.h ++++ kernel-maemo-2.6.28/arch/arm/plat-omap/include/mach/usb.h @@ -27,6 +27,10 @@ #define UDC_BASE OMAP2_UDC_BASE #define OMAP_OHCI_BASE OMAP2_OHCI_BASE @@ -88495,8 +88495,8 @@ #endif /*-------------------------------------------------------------------------*/ ---- kernel-2.6.28.orig/arch/arm/plat-omap/include/mach/vmalloc.h -+++ kernel-2.6.28/arch/arm/plat-omap/include/mach/vmalloc.h +--- kernel-maemo-2.6.28.orig/arch/arm/plat-omap/include/mach/vmalloc.h ++++ kernel-maemo-2.6.28/arch/arm/plat-omap/include/mach/vmalloc.h @@ -17,5 +17,5 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA @@ -88505,7 +88505,7 @@ +#define VMALLOC_END (PAGE_OFFSET + 0x18000000) --- /dev/null -+++ kernel-2.6.28/arch/arm/plat-omap/include/mach/vram.h ++++ kernel-maemo-2.6.28/arch/arm/plat-omap/include/mach/vram.h @@ -0,0 +1,36 @@ +/* + * File: arch/arm/plat-omap/include/mach/vram.h @@ -88544,7 +88544,7 @@ + +#endif --- /dev/null -+++ kernel-2.6.28/arch/arm/plat-omap/include/mach/vrfb.h ++++ kernel-maemo-2.6.28/arch/arm/plat-omap/include/mach/vrfb.h @@ -0,0 +1,56 @@ +/* + * File: arch/arm/plat-omap/include/mach/vrfb.h @@ -88603,7 +88603,7 @@ + +#endif /* __VRFB_H */ --- /dev/null -+++ kernel-2.6.28/arch/arm/plat-omap/iommu-debug.c ++++ kernel-maemo-2.6.28/arch/arm/plat-omap/iommu-debug.c @@ -0,0 +1,334 @@ +/* + * omap iommu: debugfs interface @@ -88940,7 +88940,7 @@ +MODULE_AUTHOR("Hiroshi DOYU "); +MODULE_LICENSE("GPL v2"); --- /dev/null -+++ kernel-2.6.28/arch/arm/plat-omap/iommu.c ++++ kernel-maemo-2.6.28/arch/arm/plat-omap/iommu.c @@ -0,0 +1,998 @@ +/* + * omap iommu: tlb and pagetable primitives @@ -89941,7 +89941,7 @@ +MODULE_AUTHOR("Hiroshi DOYU, Paul Mundt and Toshihiro Kobayashi"); +MODULE_LICENSE("GPL v2"); --- /dev/null -+++ kernel-2.6.28/arch/arm/plat-omap/iopgtable.h ++++ kernel-maemo-2.6.28/arch/arm/plat-omap/iopgtable.h @@ -0,0 +1,72 @@ +/* + * omap iommu: pagetable definitions @@ -90016,7 +90016,7 @@ + +#endif /* __PLAT_OMAP_IOMMU_H */ --- /dev/null -+++ kernel-2.6.28/arch/arm/plat-omap/iovmm.c ++++ kernel-maemo-2.6.28/arch/arm/plat-omap/iovmm.c @@ -0,0 +1,890 @@ +/* + * omap iommu: simple virtual address space management @@ -90908,8 +90908,8 @@ +MODULE_DESCRIPTION("omap iommu: simple virtual address space management"); +MODULE_AUTHOR("Hiroshi DOYU "); +MODULE_LICENSE("GPL v2"); ---- kernel-2.6.28.orig/arch/arm/plat-omap/mailbox.c -+++ kernel-2.6.28/arch/arm/plat-omap/mailbox.c +--- kernel-maemo-2.6.28.orig/arch/arm/plat-omap/mailbox.c ++++ kernel-maemo-2.6.28/arch/arm/plat-omap/mailbox.c @@ -1,10 +1,9 @@ /* * OMAP mailbox driver @@ -91158,8 +91158,8 @@ +MODULE_LICENSE("GPL v2"); +MODULE_DESCRIPTION("omap mailbox: interrupt driven messaging"); +MODULE_AUTHOR("Toshihiro Kobayashi and Hiroshi DOYU"); ---- kernel-2.6.28.orig/arch/arm/plat-omap/mcbsp.c -+++ kernel-2.6.28/arch/arm/plat-omap/mcbsp.c +--- kernel-maemo-2.6.28.orig/arch/arm/plat-omap/mcbsp.c ++++ kernel-maemo-2.6.28/arch/arm/plat-omap/mcbsp.c @@ -26,6 +26,9 @@ #include @@ -92181,7 +92181,7 @@ mcbsp->dev = NULL; } --- /dev/null -+++ kernel-2.6.28/arch/arm/plat-omap/mmu.c ++++ kernel-maemo-2.6.28/arch/arm/plat-omap/mmu.c @@ -0,0 +1,1563 @@ +/* + * linux/arch/arm/plat-omap/mmu.c @@ -93747,7 +93747,7 @@ + +MODULE_LICENSE("GPL"); --- /dev/null -+++ kernel-2.6.28/arch/arm/plat-omap/omap-pm-noop.c ++++ kernel-maemo-2.6.28/arch/arm/plat-omap/omap-pm-noop.c @@ -0,0 +1,355 @@ +/* + * omap-pm-noop.c - OMAP power management interface - dummy version @@ -94105,7 +94105,7 @@ +} + --- /dev/null -+++ kernel-2.6.28/arch/arm/plat-omap/omap-pm-srf.c ++++ kernel-maemo-2.6.28/arch/arm/plat-omap/omap-pm-srf.c @@ -0,0 +1,357 @@ +/* + * omap-pm-srf.c - OMAP power management interface implemented @@ -94465,7 +94465,7 @@ + /* Deallocate CPUFreq frequency table here */ +} --- /dev/null -+++ kernel-2.6.28/arch/arm/plat-omap/resource.c ++++ kernel-maemo-2.6.28/arch/arm/plat-omap/resource.c @@ -0,0 +1,492 @@ +/* + * linux/arch/arm/plat-omap/resource.c @@ -94959,8 +94959,8 @@ + return 0; +} +#endif ---- kernel-2.6.28.orig/arch/arm/plat-omap/sram.c -+++ kernel-2.6.28/arch/arm/plat-omap/sram.c +--- kernel-maemo-2.6.28.orig/arch/arm/plat-omap/sram.c ++++ kernel-maemo-2.6.28/arch/arm/plat-omap/sram.c @@ -24,6 +24,7 @@ #include @@ -95100,8 +95100,8 @@ return 0; } ---- kernel-2.6.28.orig/arch/arm/plat-omap/usb.c -+++ kernel-2.6.28/arch/arm/plat-omap/usb.c +--- kernel-maemo-2.6.28.orig/arch/arm/plat-omap/usb.c ++++ kernel-maemo-2.6.28/arch/arm/plat-omap/usb.c @@ -77,38 +77,6 @@ /*-------------------------------------------------------------------------*/ @@ -95142,7 +95142,7 @@ static void omap2_usb_devconf_clear(u8 port, u32 mask) --- /dev/null -+++ kernel-2.6.28/arch/arm/plat-omap/vram.c ++++ kernel-maemo-2.6.28/arch/arm/plat-omap/vram.c @@ -0,0 +1,705 @@ +/* + * linux/arch/arm/plat-omap/vram.c @@ -95850,7 +95850,7 @@ +#endif + --- /dev/null -+++ kernel-2.6.28/arch/arm/plat-omap/vrfb.c ++++ kernel-maemo-2.6.28/arch/arm/plat-omap/vrfb.c @@ -0,0 +1,311 @@ +#include +#include @@ -96163,8 +96163,8 @@ +} +EXPORT_SYMBOL(omap_vrfb_request_ctx); + ---- kernel-2.6.28.orig/arch/arm/tools/mach-types -+++ kernel-2.6.28/arch/arm/tools/mach-types +--- kernel-maemo-2.6.28.orig/arch/arm/tools/mach-types ++++ kernel-maemo-2.6.28/arch/arm/tools/mach-types @@ -12,10 +12,11 @@ # # http://www.arm.linux.org.uk/developer/machines/?action=new @@ -96295,8 +96295,8 @@ +blaze MACH_BLAZE BLAZE 2004 +linkstation_ls_hgl MACH_LINKSTATION_LS_HGL LINKSTATION_LS_HGL 2005 +htcvenus MACH_HTCVENUS HTCVENUS 2006 ---- kernel-2.6.28.orig/arch/arm/vfp/entry.S -+++ kernel-2.6.28/arch/arm/vfp/entry.S +--- kernel-maemo-2.6.28.orig/arch/arm/vfp/entry.S ++++ kernel-maemo-2.6.28/arch/arm/vfp/entry.S @@ -15,13 +15,16 @@ * r10 = thread_info structure * lr = failure return @@ -96344,8 +96344,8 @@ ldr r0, VFP_arch_address str r5, [r0] @ known non-zero value mov pc, r9 @ we have handled the fault ---- kernel-2.6.28.orig/arch/arm/vfp/vfp.h -+++ kernel-2.6.28/arch/arm/vfp/vfp.h +--- kernel-maemo-2.6.28.orig/arch/arm/vfp/vfp.h ++++ kernel-maemo-2.6.28/arch/arm/vfp/vfp.h @@ -377,6 +377,7 @@ u32 flags; }; @@ -96355,8 +96355,8 @@ extern void vfp_save_state(void *location, u32 fpexc); +extern void vfp_pm_save_context(void); #endif ---- kernel-2.6.28.orig/arch/arm/vfp/vfphw.S -+++ kernel-2.6.28/arch/arm/vfp/vfphw.S +--- kernel-maemo-2.6.28.orig/arch/arm/vfp/vfphw.S ++++ kernel-maemo-2.6.28/arch/arm/vfp/vfphw.S @@ -101,9 +101,12 @@ VFPFSTMIA r4, r5 @ save the working registers VFPFMRX r5, FPSCR @ current status @@ -96443,8 +96443,8 @@ last_VFP_context_address: .word last_VFP_context ---- kernel-2.6.28.orig/arch/arm/vfp/vfpmodule.c -+++ kernel-2.6.28/arch/arm/vfp/vfpmodule.c +--- kernel-maemo-2.6.28.orig/arch/arm/vfp/vfpmodule.c ++++ kernel-maemo-2.6.28/arch/arm/vfp/vfpmodule.c @@ -266,7 +266,7 @@ * on VFP subarch 1. */ @@ -96645,8 +96645,8 @@ } return 0; } ---- kernel-2.6.28.orig/block/blk-core.c -+++ kernel-2.6.28/block/blk-core.c +--- kernel-maemo-2.6.28.orig/block/blk-core.c ++++ kernel-maemo-2.6.28/block/blk-core.c @@ -1246,7 +1246,7 @@ blk_plug_device(q); add_request(q, req); @@ -96656,8 +96656,8 @@ __generic_unplug_device(q); spin_unlock_irq(q->queue_lock); return 0; ---- kernel-2.6.28.orig/block/genhd.c -+++ kernel-2.6.28/block/genhd.c +--- kernel-maemo-2.6.28.orig/block/genhd.c ++++ kernel-maemo-2.6.28/block/genhd.c @@ -692,6 +692,20 @@ } } @@ -96688,8 +96688,8 @@ .show = diskstats_show }; ---- kernel-2.6.28.orig/crypto/lzo.c -+++ kernel-2.6.28/crypto/lzo.c +--- kernel-maemo-2.6.28.orig/crypto/lzo.c ++++ kernel-maemo-2.6.28/crypto/lzo.c @@ -37,6 +37,17 @@ return 0; } @@ -96772,8 +96772,8 @@ crypto_unregister_alg(&alg); } ---- kernel-2.6.28.orig/drivers/Makefile -+++ kernel-2.6.28/drivers/Makefile +--- kernel-maemo-2.6.28.orig/drivers/Makefile ++++ kernel-maemo-2.6.28/drivers/Makefile @@ -18,6 +18,9 @@ obj-$(CONFIG_XEN) += xen/ @@ -96825,8 +96825,8 @@ obj-$(CONFIG_VIRTIO) += virtio/ -obj-$(CONFIG_REGULATOR) += regulator/ obj-$(CONFIG_STAGING) += staging/ ---- kernel-2.6.28.orig/drivers/bluetooth/Kconfig -+++ kernel-2.6.28/drivers/bluetooth/Kconfig +--- kernel-maemo-2.6.28.orig/drivers/bluetooth/Kconfig ++++ kernel-maemo-2.6.28/drivers/bluetooth/Kconfig @@ -181,6 +181,27 @@ Say Y here to compile support for HCI UART devices into the kernel or say M to compile it as module (btuart_cs). @@ -96855,8 +96855,8 @@ config BT_HCIVHCI tristate "HCI VHCI (Virtual HCI device) driver" help ---- kernel-2.6.28.orig/drivers/bluetooth/Makefile -+++ kernel-2.6.28/drivers/bluetooth/Makefile +--- kernel-maemo-2.6.28.orig/drivers/bluetooth/Makefile ++++ kernel-maemo-2.6.28/drivers/bluetooth/Makefile @@ -12,6 +12,8 @@ obj-$(CONFIG_BT_HCIBT3C) += bt3c_cs.o obj-$(CONFIG_BT_HCIBLUECARD) += bluecard_cs.o @@ -96866,8 +96866,8 @@ obj-$(CONFIG_BT_HCIBTUSB) += btusb.o obj-$(CONFIG_BT_HCIBTSDIO) += btsdio.o ---- kernel-2.6.28.orig/drivers/bluetooth/bcm203x.c -+++ kernel-2.6.28/drivers/bluetooth/bcm203x.c +--- kernel-maemo-2.6.28.orig/drivers/bluetooth/bcm203x.c ++++ kernel-maemo-2.6.28/drivers/bluetooth/bcm203x.c @@ -37,11 +37,6 @@ #include @@ -96898,8 +96898,8 @@ data->fw_data = kmalloc(firmware->size, GFP_KERNEL); if (!data->fw_data) { ---- kernel-2.6.28.orig/drivers/bluetooth/bfusb.c -+++ kernel-2.6.28/drivers/bluetooth/bfusb.c +--- kernel-maemo-2.6.28.orig/drivers/bluetooth/bfusb.c ++++ kernel-maemo-2.6.28/drivers/bluetooth/bfusb.c @@ -38,11 +38,6 @@ #include #include @@ -96949,8 +96949,8 @@ if (bfusb_load_firmware(data, firmware->data, firmware->size) < 0) { BT_ERR("Firmware loading failed"); ---- kernel-2.6.28.orig/drivers/bluetooth/bpa10x.c -+++ kernel-2.6.28/drivers/bluetooth/bpa10x.c +--- kernel-maemo-2.6.28.orig/drivers/bluetooth/bpa10x.c ++++ kernel-maemo-2.6.28/drivers/bluetooth/bpa10x.c @@ -35,11 +35,6 @@ #include #include @@ -96973,7 +96973,7 @@ if (err < 0) { hci_free_dev(hdev); --- /dev/null -+++ kernel-2.6.28/drivers/bluetooth/brf6150.c ++++ kernel-maemo-2.6.28/drivers/bluetooth/brf6150.c @@ -0,0 +1,1050 @@ +/* + * linux/drivers/bluetooth/brf6150/brf6150.c @@ -98026,7 +98026,7 @@ +MODULE_LICENSE("GPL"); +MODULE_AUTHOR("Ville Tervo "); --- /dev/null -+++ kernel-2.6.28/drivers/bluetooth/brf6150.h ++++ kernel-maemo-2.6.28/drivers/bluetooth/brf6150.h @@ -0,0 +1,91 @@ +/* + * linux/drivers/bluetooth/brf6150/brf6150.h @@ -98119,8 +98119,8 @@ +} __attribute__ ((packed)); + +#endif /* __DRIVERS_BLUETOOTH_BRF6150_H */ ---- kernel-2.6.28.orig/drivers/bluetooth/btsdio.c -+++ kernel-2.6.28/drivers/bluetooth/btsdio.c +--- kernel-maemo-2.6.28.orig/drivers/bluetooth/btsdio.c ++++ kernel-maemo-2.6.28/drivers/bluetooth/btsdio.c @@ -37,11 +37,6 @@ #include #include @@ -98133,8 +98133,8 @@ #define VERSION "0.1" static const struct sdio_device_id btsdio_table[] = { ---- kernel-2.6.28.orig/drivers/bluetooth/btusb.c -+++ kernel-2.6.28/drivers/bluetooth/btusb.c +--- kernel-maemo-2.6.28.orig/drivers/bluetooth/btusb.c ++++ kernel-maemo-2.6.28/drivers/bluetooth/btusb.c @@ -35,31 +35,25 @@ #include #include @@ -98333,8 +98333,8 @@ if (le16_to_cpu(udev->descriptor.bcdDevice) > 0x997) set_bit(HCI_QUIRK_RAW_DEVICE, &hdev->quirks); ---- kernel-2.6.28.orig/drivers/bluetooth/hci_bcsp.c -+++ kernel-2.6.28/drivers/bluetooth/hci_bcsp.c +--- kernel-maemo-2.6.28.orig/drivers/bluetooth/hci_bcsp.c ++++ kernel-maemo-2.6.28/drivers/bluetooth/hci_bcsp.c @@ -47,11 +47,6 @@ #include "hci_uart.h" @@ -98347,8 +98347,8 @@ #define VERSION "0.3" static int txcrc = 1; ---- kernel-2.6.28.orig/drivers/bluetooth/hci_h4.c -+++ kernel-2.6.28/drivers/bluetooth/hci_h4.c +--- kernel-maemo-2.6.28.orig/drivers/bluetooth/hci_h4.c ++++ kernel-maemo-2.6.28/drivers/bluetooth/hci_h4.c @@ -46,11 +46,6 @@ #include "hci_uart.h" @@ -98372,7 +98372,7 @@ hu->priv = NULL; kfree(h4); --- /dev/null -+++ kernel-2.6.28/drivers/bluetooth/hci_h4p/Makefile ++++ kernel-maemo-2.6.28/drivers/bluetooth/hci_h4p/Makefile @@ -0,0 +1,7 @@ +# +# Makefile for the Linux Bluetooth HCI device drivers. @@ -98382,7 +98382,7 @@ + +hci_h4p-objs := core.o fw.o uart.o fw-ti.o fw-csr.o fw-bcm.o --- /dev/null -+++ kernel-2.6.28/drivers/bluetooth/hci_h4p/core.c ++++ kernel-maemo-2.6.28/drivers/bluetooth/hci_h4p/core.c @@ -0,0 +1,1090 @@ +/* + * This file is part of hci_h4p bluetooth driver @@ -99475,7 +99475,7 @@ +MODULE_LICENSE("GPL"); +MODULE_AUTHOR("Ville Tervo"); --- /dev/null -+++ kernel-2.6.28/drivers/bluetooth/hci_h4p/fw-bcm.c ++++ kernel-maemo-2.6.28/drivers/bluetooth/hci_h4p/fw-bcm.c @@ -0,0 +1,161 @@ +/* + * This file is part of hci_h4p bluetooth driver @@ -99639,7 +99639,7 @@ + return 0; +} --- /dev/null -+++ kernel-2.6.28/drivers/bluetooth/hci_h4p/fw-csr.c ++++ kernel-maemo-2.6.28/drivers/bluetooth/hci_h4p/fw-csr.c @@ -0,0 +1,152 @@ +/* + * This file is part of hci_h4p bluetooth driver @@ -99794,7 +99794,7 @@ + return 0; +} --- /dev/null -+++ kernel-2.6.28/drivers/bluetooth/hci_h4p/fw-ti.c ++++ kernel-maemo-2.6.28/drivers/bluetooth/hci_h4p/fw-ti.c @@ -0,0 +1,97 @@ +/* + * This file is part of hci_h4p bluetooth driver @@ -99894,7 +99894,7 @@ + return 0; +} --- /dev/null -+++ kernel-2.6.28/drivers/bluetooth/hci_h4p/fw.c ++++ kernel-maemo-2.6.28/drivers/bluetooth/hci_h4p/fw.c @@ -0,0 +1,167 @@ +/* + * This file is part of hci_h4p bluetooth driver @@ -100064,7 +100064,7 @@ + return; +} --- /dev/null -+++ kernel-2.6.28/drivers/bluetooth/hci_h4p/hci_h4p.h ++++ kernel-maemo-2.6.28/drivers/bluetooth/hci_h4p/hci_h4p.h @@ -0,0 +1,209 @@ +/* + * This file is part of hci_h4p bluetooth driver @@ -100276,7 +100276,7 @@ + +#endif /* __DRIVERS_BLUETOOTH_HCI_H4P_H */ --- /dev/null -+++ kernel-2.6.28/drivers/bluetooth/hci_h4p/uart.c ++++ kernel-maemo-2.6.28/drivers/bluetooth/hci_h4p/uart.c @@ -0,0 +1,197 @@ +/* + * This file is part of hci_h4p bluetooth driver @@ -100475,8 +100475,8 @@ + hci_h4p_outb(info, UART_IER, UART_IER_RDI); + hci_h4p_outb(info, UART_OMAP_SYSC, (1 << 0) | (1 << 2) | (2 << 3)); +} ---- kernel-2.6.28.orig/drivers/bluetooth/hci_ldisc.c -+++ kernel-2.6.28/drivers/bluetooth/hci_ldisc.c +--- kernel-maemo-2.6.28.orig/drivers/bluetooth/hci_ldisc.c ++++ kernel-maemo-2.6.28/drivers/bluetooth/hci_ldisc.c @@ -46,11 +46,6 @@ #include "hci_uart.h" @@ -100500,8 +100500,8 @@ if (hci_register_dev(hdev) < 0) { BT_ERR("Can't register HCI device"); ---- kernel-2.6.28.orig/drivers/bluetooth/hci_ll.c -+++ kernel-2.6.28/drivers/bluetooth/hci_ll.c +--- kernel-maemo-2.6.28.orig/drivers/bluetooth/hci_ll.c ++++ kernel-maemo-2.6.28/drivers/bluetooth/hci_ll.c @@ -163,8 +163,7 @@ skb_queue_purge(&ll->tx_wait_q); skb_queue_purge(&ll->txq); @@ -100512,8 +100512,8 @@ hu->priv = NULL; ---- kernel-2.6.28.orig/drivers/bluetooth/hci_vhci.c -+++ kernel-2.6.28/drivers/bluetooth/hci_vhci.c +--- kernel-maemo-2.6.28.orig/drivers/bluetooth/hci_vhci.c ++++ kernel-maemo-2.6.28/drivers/bluetooth/hci_vhci.c @@ -40,11 +40,6 @@ #include #include @@ -100527,7 +100527,7 @@ static int minor = MISC_DYNAMIC_MINOR; --- /dev/null -+++ kernel-2.6.28/drivers/cbus/Kconfig ++++ kernel-maemo-2.6.28/drivers/cbus/Kconfig @@ -0,0 +1,89 @@ +# +# CBUS device configuration @@ -100619,7 +100619,7 @@ + +endmenu --- /dev/null -+++ kernel-2.6.28/drivers/cbus/Makefile ++++ kernel-maemo-2.6.28/drivers/cbus/Makefile @@ -0,0 +1,14 @@ +# +# Makefile for CBUS. @@ -100636,7 +100636,7 @@ +obj-$(CONFIG_CBUS_RETU_USER) += retu-user.o +obj-$(CONFIG_CBUS_RETU_HEADSET) += retu-headset.o --- /dev/null -+++ kernel-2.6.28/drivers/cbus/cbus.c ++++ kernel-maemo-2.6.28/drivers/cbus/cbus.c @@ -0,0 +1,293 @@ +/* + * drivers/cbus/cbus.c @@ -100932,7 +100932,7 @@ +MODULE_LICENSE("GPL"); +MODULE_AUTHOR("Juha Yrjölä, David Weinehall, and Mikko Ylinen"); --- /dev/null -+++ kernel-2.6.28/drivers/cbus/cbus.h ++++ kernel-maemo-2.6.28/drivers/cbus/cbus.h @@ -0,0 +1,36 @@ +/* + * drivers/cbus/cbus.h @@ -100971,7 +100971,7 @@ + +#endif /* __DRIVERS_CBUS_CBUS_H */ --- /dev/null -+++ kernel-2.6.28/drivers/cbus/retu-headset.c ++++ kernel-maemo-2.6.28/drivers/cbus/retu-headset.c @@ -0,0 +1,355 @@ +/** + * Retu/Vilma headset detection @@ -101329,7 +101329,7 @@ +MODULE_LICENSE("GPL"); +MODULE_AUTHOR("Juha Yrjölä"); --- /dev/null -+++ kernel-2.6.28/drivers/cbus/retu-pwrbutton.c ++++ kernel-maemo-2.6.28/drivers/cbus/retu-pwrbutton.c @@ -0,0 +1,118 @@ +/** + * drivers/cbus/retu-pwrbutton.c @@ -101450,7 +101450,7 @@ +MODULE_LICENSE("GPL"); +MODULE_AUTHOR("Ari Saastamoinen"); --- /dev/null -+++ kernel-2.6.28/drivers/cbus/retu-rtc.c ++++ kernel-maemo-2.6.28/drivers/cbus/retu-rtc.c @@ -0,0 +1,477 @@ +/** + * drivers/cbus/retu-rtc.c @@ -101930,7 +101930,7 @@ +MODULE_LICENSE("GPL"); +MODULE_AUTHOR("Paul Mundt and Igor Stoppa"); --- /dev/null -+++ kernel-2.6.28/drivers/cbus/retu-user.c ++++ kernel-maemo-2.6.28/drivers/cbus/retu-user.c @@ -0,0 +1,423 @@ +/** + * drivers/cbus/retu-user.c @@ -102356,7 +102356,7 @@ +MODULE_LICENSE("GPL"); +MODULE_AUTHOR("Mikko Ylinen"); --- /dev/null -+++ kernel-2.6.28/drivers/cbus/retu-wdt.c ++++ kernel-maemo-2.6.28/drivers/cbus/retu-wdt.c @@ -0,0 +1,202 @@ +/** + * drivers/cbus/retu-wdt.c @@ -102561,7 +102561,7 @@ +MODULE_LICENSE("GPL"); + --- /dev/null -+++ kernel-2.6.28/drivers/cbus/retu.c ++++ kernel-maemo-2.6.28/drivers/cbus/retu.c @@ -0,0 +1,467 @@ +/** + * drivers/cbus/retu.c @@ -103031,7 +103031,7 @@ +MODULE_LICENSE("GPL"); +MODULE_AUTHOR("Juha Yrjölä, David Weinehall, and Mikko Ylinen"); --- /dev/null -+++ kernel-2.6.28/drivers/cbus/retu.h ++++ kernel-maemo-2.6.28/drivers/cbus/retu.h @@ -0,0 +1,77 @@ +/** + * drivers/cbus/retu.h @@ -103111,7 +103111,7 @@ + +#endif /* __DRIVERS_CBUS_RETU_H */ --- /dev/null -+++ kernel-2.6.28/drivers/cbus/tahvo-usb.c ++++ kernel-maemo-2.6.28/drivers/cbus/tahvo-usb.c @@ -0,0 +1,777 @@ +/** + * drivers/cbus/tahvo-usb.c @@ -103891,7 +103891,7 @@ +MODULE_LICENSE("GPL"); +MODULE_AUTHOR("Juha Yrjölä, Tony Lindgren, and Timo Teräs"); --- /dev/null -+++ kernel-2.6.28/drivers/cbus/tahvo-user.c ++++ kernel-maemo-2.6.28/drivers/cbus/tahvo-user.c @@ -0,0 +1,405 @@ +/** + * drivers/cbus/tahvo-user.c @@ -104299,7 +104299,7 @@ +MODULE_LICENSE("GPL"); +MODULE_AUTHOR("Mikko Ylinen"); --- /dev/null -+++ kernel-2.6.28/drivers/cbus/tahvo.c ++++ kernel-maemo-2.6.28/drivers/cbus/tahvo.c @@ -0,0 +1,442 @@ +/** + * drivers/cbus/tahvo.c @@ -104744,7 +104744,7 @@ +MODULE_LICENSE("GPL"); +MODULE_AUTHOR("Juha Yrjölä, David Weinehall, and Mikko Ylinen"); --- /dev/null -+++ kernel-2.6.28/drivers/cbus/tahvo.h ++++ kernel-maemo-2.6.28/drivers/cbus/tahvo.h @@ -0,0 +1,61 @@ +/* + * drivers/cbus/tahvo.h @@ -104808,7 +104808,7 @@ + +#endif /* __DRIVERS_CBUS_TAHVO_H */ --- /dev/null -+++ kernel-2.6.28/drivers/cbus/user_retu_tahvo.h ++++ kernel-maemo-2.6.28/drivers/cbus/user_retu_tahvo.h @@ -0,0 +1,75 @@ +/** + * drivers/cbus/user_retu_tahvo.h @@ -104885,8 +104885,8 @@ +}; + +#endif ---- kernel-2.6.28.orig/drivers/char/hw_random/Kconfig -+++ kernel-2.6.28/drivers/char/hw_random/Kconfig +--- kernel-maemo-2.6.28.orig/drivers/char/hw_random/Kconfig ++++ kernel-maemo-2.6.28/drivers/char/hw_random/Kconfig @@ -134,3 +134,16 @@ To compile this driver as a module, choose M here: the @@ -104904,16 +104904,16 @@ + module will be called omap3-rom-rng. + + If unsure, say Y. ---- kernel-2.6.28.orig/drivers/char/hw_random/Makefile -+++ kernel-2.6.28/drivers/char/hw_random/Makefile +--- kernel-maemo-2.6.28.orig/drivers/char/hw_random/Makefile ++++ kernel-maemo-2.6.28/drivers/char/hw_random/Makefile @@ -14,3 +14,5 @@ obj-$(CONFIG_HW_RANDOM_OMAP) += omap-rng.o obj-$(CONFIG_HW_RANDOM_PASEMI) += pasemi-rng.o obj-$(CONFIG_HW_RANDOM_VIRTIO) += virtio-rng.o +obj-$(CONFIG_HW_RANDOM_OMAP3_ROM) += omap3-rom-rng.o +omap3-rom-rng-y := omap3-rom-drv.o omap3-rom-asm.o ---- kernel-2.6.28.orig/drivers/char/hw_random/omap-rng.c -+++ kernel-2.6.28/drivers/char/hw_random/omap-rng.c +--- kernel-maemo-2.6.28.orig/drivers/char/hw_random/omap-rng.c ++++ kernel-maemo-2.6.28/drivers/char/hw_random/omap-rng.c @@ -205,7 +205,6 @@ .name = "omap_rng", .owner = THIS_MODULE, @@ -104932,7 +104932,7 @@ static void __exit omap_rng_exit(void) --- /dev/null -+++ kernel-2.6.28/drivers/char/hw_random/omap3-rom-asm.S ++++ kernel-maemo-2.6.28/drivers/char/hw_random/omap3-rom-asm.S @@ -0,0 +1,26 @@ +/* + * Copyright (C) 2009 Nokia Corporation @@ -104961,7 +104961,7 @@ + mov r0, r12 + ldmfd sp!, {r4-r12, pc} --- /dev/null -+++ kernel-2.6.28/drivers/char/hw_random/omap3-rom-drv.c ++++ kernel-maemo-2.6.28/drivers/char/hw_random/omap3-rom-drv.c @@ -0,0 +1,156 @@ +/* + * omap3-rom-drv.c - RNG driver for TI OMAP3 CPU family @@ -105119,8 +105119,8 @@ + +MODULE_AUTHOR("Juha Yrjola"); +MODULE_LICENSE("GPL"); ---- kernel-2.6.28.orig/drivers/char/keyboard.c -+++ kernel-2.6.28/drivers/char/keyboard.c +--- kernel-maemo-2.6.28.orig/drivers/char/keyboard.c ++++ kernel-maemo-2.6.28/drivers/char/keyboard.c @@ -1035,6 +1035,7 @@ defined(CONFIG_MIPS) || defined(CONFIG_PPC) || defined(CONFIG_SPARC) ||\ defined(CONFIG_PARISC) || defined(CONFIG_SUPERH) ||\ @@ -105129,8 +105129,8 @@ defined(CONFIG_AVR32) #define HW_RAW(dev) (test_bit(EV_MSC, dev->evbit) && test_bit(MSC_RAW, dev->mscbit) &&\ ---- kernel-2.6.28.orig/drivers/char/n_tty.c -+++ kernel-2.6.28/drivers/char/n_tty.c +--- kernel-maemo-2.6.28.orig/drivers/char/n_tty.c ++++ kernel-maemo-2.6.28/drivers/char/n_tty.c @@ -942,7 +942,7 @@ * calls one at a time and in order (or using flush_to_ldisc) */ @@ -105193,8 +105193,8 @@ } int is_ignored(int sig) ---- kernel-2.6.28.orig/drivers/char/random.c -+++ kernel-2.6.28/drivers/char/random.c +--- kernel-maemo-2.6.28.orig/drivers/char/random.c ++++ kernel-maemo-2.6.28/drivers/char/random.c @@ -1469,7 +1469,8 @@ keyptr->count = (ip_cnt & COUNT_MASK) << HASH_BITS; smp_wmb(); @@ -105205,8 +105205,8 @@ } static inline struct keydata *get_keyptr(void) ---- kernel-2.6.28.orig/drivers/char/tty_buffer.c -+++ kernel-2.6.28/drivers/char/tty_buffer.c +--- kernel-maemo-2.6.28.orig/drivers/char/tty_buffer.c ++++ kernel-maemo-2.6.28/drivers/char/tty_buffer.c @@ -58,7 +58,7 @@ { struct tty_buffer *p; @@ -105238,8 +105238,8 @@ } /* Restore the queue head */ tty->buf.head = head; ---- kernel-2.6.28.orig/drivers/cpufreq/cpufreq_ondemand.c -+++ kernel-2.6.28/drivers/cpufreq/cpufreq_ondemand.c +--- kernel-maemo-2.6.28.orig/drivers/cpufreq/cpufreq_ondemand.c ++++ kernel-maemo-2.6.28/drivers/cpufreq/cpufreq_ondemand.c @@ -21,6 +21,8 @@ #include #include @@ -105354,8 +105354,8 @@ mutex_unlock(&dbs_mutex); break; ---- kernel-2.6.28.orig/drivers/cpuidle/governors/menu.c -+++ kernel-2.6.28/drivers/cpuidle/governors/menu.c +--- kernel-maemo-2.6.28.orig/drivers/cpuidle/governors/menu.c ++++ kernel-maemo-2.6.28/drivers/cpuidle/governors/menu.c @@ -13,6 +13,7 @@ #include #include @@ -105396,8 +105396,8 @@ break; if (s->exit_latency > latency_req) break; ---- kernel-2.6.28.orig/drivers/crypto/Kconfig -+++ kernel-2.6.28/drivers/crypto/Kconfig +--- kernel-maemo-2.6.28.orig/drivers/crypto/Kconfig ++++ kernel-maemo-2.6.28/drivers/crypto/Kconfig @@ -83,6 +83,13 @@ that contains all parts of the crypto device driver (ap bus, request router and all the card drivers). @@ -105412,8 +105412,8 @@ config CRYPTO_SHA1_S390 tristate "SHA1 digest algorithm" depends on S390 ---- kernel-2.6.28.orig/drivers/crypto/Makefile -+++ kernel-2.6.28/drivers/crypto/Makefile +--- kernel-maemo-2.6.28.orig/drivers/crypto/Makefile ++++ kernel-maemo-2.6.28/drivers/crypto/Makefile @@ -1,6 +1,7 @@ obj-$(CONFIG_CRYPTO_DEV_PADLOCK_AES) += padlock-aes.o obj-$(CONFIG_CRYPTO_DEV_PADLOCK_SHA) += padlock-sha.o @@ -105423,7 +105423,7 @@ obj-$(CONFIG_CRYPTO_DEV_TALITOS) += talitos.o obj-$(CONFIG_CRYPTO_DEV_IXP4XX) += ixp4xx_crypto.o --- /dev/null -+++ kernel-2.6.28/drivers/crypto/omap-sha1-md5.c ++++ kernel-maemo-2.6.28/drivers/crypto/omap-sha1-md5.c @@ -0,0 +1,575 @@ +/* + * Cryptographic API. @@ -106001,7 +106001,7 @@ +MODULE_LICENSE("GPL"); +MODULE_AUTHOR("David Cohen"); --- /dev/null -+++ kernel-2.6.28/drivers/dsp/bridge/Kbuild ++++ kernel-maemo-2.6.28/drivers/dsp/bridge/Kbuild @@ -0,0 +1,39 @@ +obj-$(CONFIG_MPU_BRIDGE) += bridgedriver.o + @@ -106043,7 +106043,7 @@ +ccflags-y += -Idrivers/dsp/bridge/hw +ccflags-y += -Iarch/arm --- /dev/null -+++ kernel-2.6.28/drivers/dsp/bridge/Kconfig ++++ kernel-maemo-2.6.28/drivers/dsp/bridge/Kconfig @@ -0,0 +1,36 @@ +# +# DSP Bridge Driver Support @@ -106082,7 +106082,7 @@ + help + Say Y to enable Bridge debugging capabilities --- /dev/null -+++ kernel-2.6.28/drivers/dsp/bridge/dynload/cload.c ++++ kernel-maemo-2.6.28/drivers/dsp/bridge/dynload/cload.c @@ -0,0 +1,1851 @@ +/* + * cload.c @@ -107936,7 +107936,7 @@ +} /* unpack_name */ +#endif --- /dev/null -+++ kernel-2.6.28/drivers/dsp/bridge/dynload/dlclasses_hdr.h ++++ kernel-maemo-2.6.28/drivers/dsp/bridge/dynload/dlclasses_hdr.h @@ -0,0 +1,41 @@ +/* + * dlclasses_hdr.h @@ -107980,7 +107980,7 @@ + +#endif /* _DLCLASSES_HDR_H */ --- /dev/null -+++ kernel-2.6.28/drivers/dsp/bridge/dynload/dload_internal.h ++++ kernel-maemo-2.6.28/drivers/dsp/bridge/dynload/dload_internal.h @@ -0,0 +1,237 @@ +/* + * dload_internal.h @@ -108220,7 +108220,7 @@ + +#endif /* __DLOAD_INTERNAL__ */ --- /dev/null -+++ kernel-2.6.28/drivers/dsp/bridge/dynload/doff.h ++++ kernel-maemo-2.6.28/drivers/dsp/bridge/dynload/doff.h @@ -0,0 +1,347 @@ +/* + * doff.h @@ -108570,7 +108570,7 @@ + +#endif /* _DOFF_H */ --- /dev/null -+++ kernel-2.6.28/drivers/dsp/bridge/dynload/getsection.c ++++ kernel-maemo-2.6.28/drivers/dsp/bridge/dynload/getsection.c @@ -0,0 +1,412 @@ +/* + * getsection.c @@ -108985,7 +108985,7 @@ + dlthis->mysym->Deallocate(dlthis->mysym, dlthis); +} --- /dev/null -+++ kernel-2.6.28/drivers/dsp/bridge/dynload/header.h ++++ kernel-maemo-2.6.28/drivers/dsp/bridge/dynload/header.h @@ -0,0 +1,59 @@ +/* + * header.h @@ -109047,7 +109047,7 @@ +#define ALIGN_COFF_ENDIANNESS 7 +#define ENDIANNESS_MASK (DF_BYTE_ORDER >> ALIGN_COFF_ENDIANNESS) --- /dev/null -+++ kernel-2.6.28/drivers/dsp/bridge/dynload/module_list.h ++++ kernel-maemo-2.6.28/drivers/dsp/bridge/dynload/module_list.h @@ -0,0 +1,161 @@ +/* + * dspbridge/mpu_driver/src/dynload/module_list.h @@ -109211,7 +109211,7 @@ + +#endif /* _MODULE_LIST_H_ */ --- /dev/null -+++ kernel-2.6.28/drivers/dsp/bridge/dynload/params.h ++++ kernel-maemo-2.6.28/drivers/dsp/bridge/dynload/params.h @@ -0,0 +1,231 @@ +/* + * params.h @@ -109445,7 +109445,7 @@ +#define LOG_TGTAU_BITS LOG_TARGET_AU_BITS +#endif --- /dev/null -+++ kernel-2.6.28/drivers/dsp/bridge/dynload/reloc.c ++++ kernel-maemo-2.6.28/drivers/dsp/bridge/dynload/reloc.c @@ -0,0 +1,425 @@ +/* + * reloc.c @@ -109873,7 +109873,7 @@ +} /* reloc_value */ + --- /dev/null -+++ kernel-2.6.28/drivers/dsp/bridge/dynload/reloc_table.h ++++ kernel-maemo-2.6.28/drivers/dsp/bridge/dynload/reloc_table.h @@ -0,0 +1,102 @@ +/* + * reloc_table.h @@ -109978,7 +109978,7 @@ + +#endif /* __RELOC_TABLE_H__ */ --- /dev/null -+++ kernel-2.6.28/drivers/dsp/bridge/dynload/reloc_table_c6000.c ++++ kernel-maemo-2.6.28/drivers/dsp/bridge/dynload/reloc_table_c6000.c @@ -0,0 +1,258 @@ +/* + * reloc_table_c6000.c @@ -110239,7 +110239,7 @@ + 66 +}; --- /dev/null -+++ kernel-2.6.28/drivers/dsp/bridge/gen/_gt_para.c ++++ kernel-maemo-2.6.28/drivers/dsp/bridge/gen/_gt_para.c @@ -0,0 +1,107 @@ +/* + * _gt_para.c @@ -110349,7 +110349,7 @@ +#endif +} --- /dev/null -+++ kernel-2.6.28/drivers/dsp/bridge/gen/gb.c ++++ kernel-maemo-2.6.28/drivers/dsp/bridge/gen/gb.c @@ -0,0 +1,182 @@ +/* + * gb.c @@ -110534,7 +110534,7 @@ + return state; +} --- /dev/null -+++ kernel-2.6.28/drivers/dsp/bridge/gen/gh.c ++++ kernel-maemo-2.6.28/drivers/dsp/bridge/gen/gh.c @@ -0,0 +1,191 @@ +/* + * gh.c @@ -110728,7 +110728,7 @@ + GS_free(ptr); +} --- /dev/null -+++ kernel-2.6.28/drivers/dsp/bridge/gen/gs.c ++++ kernel-maemo-2.6.28/drivers/dsp/bridge/gen/gs.c @@ -0,0 +1,106 @@ +/* + * gs.c @@ -110837,7 +110837,7 @@ + } +} --- /dev/null -+++ kernel-2.6.28/drivers/dsp/bridge/gen/gt.c ++++ kernel-maemo-2.6.28/drivers/dsp/bridge/gen/gt.c @@ -0,0 +1,348 @@ +/* + * gt.c @@ -111188,7 +111188,7 @@ + } +} --- /dev/null -+++ kernel-2.6.28/drivers/dsp/bridge/gen/uuidutil.c ++++ kernel-maemo-2.6.28/drivers/dsp/bridge/gen/uuidutil.c @@ -0,0 +1,238 @@ +/* + * uuidutil.c @@ -111429,7 +111429,7 @@ + } +} --- /dev/null -+++ kernel-2.6.28/drivers/dsp/bridge/hw/EasiGlobal.h ++++ kernel-maemo-2.6.28/drivers/dsp/bridge/hw/EasiGlobal.h @@ -0,0 +1,42 @@ +/* + * EasiGlobal.h @@ -111474,7 +111474,7 @@ +#endif /* __EASIGLOBAL_H */ + --- /dev/null -+++ kernel-2.6.28/drivers/dsp/bridge/hw/GlobalTypes.h ++++ kernel-maemo-2.6.28/drivers/dsp/bridge/hw/GlobalTypes.h @@ -0,0 +1,325 @@ +/* + * GlobalTypes.h @@ -111802,7 +111802,7 @@ + +#endif /* __GLOBALTYPES_H */ --- /dev/null -+++ kernel-2.6.28/drivers/dsp/bridge/hw/IPIAccInt.h ++++ kernel-maemo-2.6.28/drivers/dsp/bridge/hw/IPIAccInt.h @@ -0,0 +1,41 @@ +/* + * IPIAccInt.h @@ -111846,7 +111846,7 @@ +#endif /* _IPI_ACC_INT_H */ +/* EOF */ --- /dev/null -+++ kernel-2.6.28/drivers/dsp/bridge/hw/IVA2RegAcM.h ++++ kernel-maemo-2.6.28/drivers/dsp/bridge/hw/IVA2RegAcM.h @@ -0,0 +1,28 @@ +/* + * IVA1RegAcM.h @@ -111877,7 +111877,7 @@ + +#endif --- /dev/null -+++ kernel-2.6.28/drivers/dsp/bridge/hw/MLBAccInt.h ++++ kernel-maemo-2.6.28/drivers/dsp/bridge/hw/MLBAccInt.h @@ -0,0 +1,132 @@ +/* + * MLBAccInt.h @@ -112012,7 +112012,7 @@ + +#endif /* _MLB_ACC_INT_H */ --- /dev/null -+++ kernel-2.6.28/drivers/dsp/bridge/hw/MLBRegAcM.h ++++ kernel-maemo-2.6.28/drivers/dsp/bridge/hw/MLBRegAcM.h @@ -0,0 +1,201 @@ +/* + * MLBRegAcM.h @@ -112216,7 +112216,7 @@ + +#endif /* _MLB_REG_ACM_H */ --- /dev/null -+++ kernel-2.6.28/drivers/dsp/bridge/hw/MMUAccInt.h ++++ kernel-maemo-2.6.28/drivers/dsp/bridge/hw/MMUAccInt.h @@ -0,0 +1,76 @@ +/* + * MMUAccInt.h @@ -112295,7 +112295,7 @@ + +#endif /* _MMU_ACC_INT_H */ --- /dev/null -+++ kernel-2.6.28/drivers/dsp/bridge/hw/MMURegAcM.h ++++ kernel-maemo-2.6.28/drivers/dsp/bridge/hw/MMURegAcM.h @@ -0,0 +1,253 @@ +/* + * MMURegAcM.h @@ -112551,7 +112551,7 @@ + +#endif /* _MMU_REG_ACM_H */ --- /dev/null -+++ kernel-2.6.28/drivers/dsp/bridge/hw/PRCMAccInt.h ++++ kernel-maemo-2.6.28/drivers/dsp/bridge/hw/PRCMAccInt.h @@ -0,0 +1,300 @@ +/* + * PRCMAccInt.h @@ -112854,7 +112854,7 @@ + +#endif /* _PRCM_ACC_INT_H */ --- /dev/null -+++ kernel-2.6.28/drivers/dsp/bridge/hw/PRCMRegAcM.h ++++ kernel-maemo-2.6.28/drivers/dsp/bridge/hw/PRCMRegAcM.h @@ -0,0 +1,670 @@ +/* + * PRCMRegAcM.h @@ -113527,7 +113527,7 @@ + +#endif /* _PRCM_REG_ACM_H */ --- /dev/null -+++ kernel-2.6.28/drivers/dsp/bridge/hw/hw_defs.h ++++ kernel-maemo-2.6.28/drivers/dsp/bridge/hw/hw_defs.h @@ -0,0 +1,73 @@ +/* + * hw_defs.h @@ -113603,7 +113603,7 @@ + +#endif /* __HW_DEFS_H */ --- /dev/null -+++ kernel-2.6.28/drivers/dsp/bridge/hw/hw_dspssC64P.c ++++ kernel-maemo-2.6.28/drivers/dsp/bridge/hw/hw_dspssC64P.c @@ -0,0 +1,56 @@ +/* + * hw_dspss64P.c @@ -113662,7 +113662,7 @@ + return status; +} --- /dev/null -+++ kernel-2.6.28/drivers/dsp/bridge/hw/hw_dspssC64P.h ++++ kernel-maemo-2.6.28/drivers/dsp/bridge/hw/hw_dspssC64P.h @@ -0,0 +1,48 @@ +/* + * hw_dspssC64P.h @@ -113713,7 +113713,7 @@ + +#endif /* __HW_DSPSS_H */ --- /dev/null -+++ kernel-2.6.28/drivers/dsp/bridge/hw/hw_mbox.c ++++ kernel-maemo-2.6.28/drivers/dsp/bridge/hw/hw_mbox.c @@ -0,0 +1,247 @@ +/* + * hw_mbox.c @@ -113963,7 +113963,7 @@ + return status; +} --- /dev/null -+++ kernel-2.6.28/drivers/dsp/bridge/hw/hw_mbox.h ++++ kernel-maemo-2.6.28/drivers/dsp/bridge/hw/hw_mbox.h @@ -0,0 +1,328 @@ +/* + * hw_mbox.h @@ -114294,7 +114294,7 @@ + +#endif /* __MBOX_H */ --- /dev/null -+++ kernel-2.6.28/drivers/dsp/bridge/hw/hw_mmu.c ++++ kernel-maemo-2.6.28/drivers/dsp/bridge/hw/hw_mmu.c @@ -0,0 +1,599 @@ +/* + * hw_mmu.c @@ -114896,7 +114896,7 @@ + +} --- /dev/null -+++ kernel-2.6.28/drivers/dsp/bridge/hw/hw_mmu.h ++++ kernel-maemo-2.6.28/drivers/dsp/bridge/hw/hw_mmu.h @@ -0,0 +1,177 @@ +/* + * hw_mmu.h @@ -115076,7 +115076,7 @@ + +#endif /* __HW_MMU_H */ --- /dev/null -+++ kernel-2.6.28/drivers/dsp/bridge/hw/hw_prcm.c ++++ kernel-maemo-2.6.28/drivers/dsp/bridge/hw/hw_prcm.c @@ -0,0 +1,167 @@ +/* + * hw_prcm.c @@ -115246,7 +115246,7 @@ + return status; +} --- /dev/null -+++ kernel-2.6.28/drivers/dsp/bridge/hw/hw_prcm.h ++++ kernel-maemo-2.6.28/drivers/dsp/bridge/hw/hw_prcm.h @@ -0,0 +1,169 @@ +/* + * hw_prcm.h @@ -115418,7 +115418,7 @@ + +#endif /* __HW_PRCM_H */ --- /dev/null -+++ kernel-2.6.28/drivers/dsp/bridge/pmgr/chnl.c ++++ kernel-maemo-2.6.28/drivers/dsp/bridge/pmgr/chnl.c @@ -0,0 +1,260 @@ +/* + * chnl.c @@ -115681,7 +115681,7 @@ + + --- /dev/null -+++ kernel-2.6.28/drivers/dsp/bridge/pmgr/chnlobj.h ++++ kernel-maemo-2.6.28/drivers/dsp/bridge/pmgr/chnlobj.h @@ -0,0 +1,71 @@ +/* + * chnlobj.h @@ -115755,7 +115755,7 @@ +#endif /* CHNLOBJ_ */ + --- /dev/null -+++ kernel-2.6.28/drivers/dsp/bridge/pmgr/cmm.c ++++ kernel-maemo-2.6.28/drivers/dsp/bridge/pmgr/cmm.c @@ -0,0 +1,1291 @@ +/* + * cmm.c @@ -117049,7 +117049,7 @@ + return (void *)dwAddrXlate; +} --- /dev/null -+++ kernel-2.6.28/drivers/dsp/bridge/pmgr/cod.c ++++ kernel-maemo-2.6.28/drivers/dsp/bridge/pmgr/cod.c @@ -0,0 +1,684 @@ +/* + * cod.c @@ -117736,7 +117736,7 @@ +} + --- /dev/null -+++ kernel-2.6.28/drivers/dsp/bridge/pmgr/dbl.c ++++ kernel-maemo-2.6.28/drivers/dsp/bridge/pmgr/dbl.c @@ -0,0 +1,1385 @@ +/* + * dbl.c @@ -119124,7 +119124,7 @@ +} + --- /dev/null -+++ kernel-2.6.28/drivers/dsp/bridge/pmgr/dbll.c ++++ kernel-maemo-2.6.28/drivers/dsp/bridge/pmgr/dbll.c @@ -0,0 +1,1572 @@ +/* + * dbll.c @@ -120699,7 +120699,7 @@ +} + --- /dev/null -+++ kernel-2.6.28/drivers/dsp/bridge/pmgr/dev.c ++++ kernel-maemo-2.6.28/drivers/dsp/bridge/pmgr/dev.c @@ -0,0 +1,1476 @@ +/* + * dev.c @@ -122178,7 +122178,7 @@ +} + --- /dev/null -+++ kernel-2.6.28/drivers/dsp/bridge/pmgr/dmm.c ++++ kernel-maemo-2.6.28/drivers/dsp/bridge/pmgr/dmm.c @@ -0,0 +1,657 @@ +/* + * dmm.c @@ -122838,7 +122838,7 @@ +} +#endif --- /dev/null -+++ kernel-2.6.28/drivers/dsp/bridge/pmgr/io.c ++++ kernel-maemo-2.6.28/drivers/dsp/bridge/pmgr/io.c @@ -0,0 +1,205 @@ +/* + * io.c @@ -123046,7 +123046,7 @@ + return fRetval; +} --- /dev/null -+++ kernel-2.6.28/drivers/dsp/bridge/pmgr/ioobj.h ++++ kernel-maemo-2.6.28/drivers/dsp/bridge/pmgr/ioobj.h @@ -0,0 +1,52 @@ +/* + * ioobj.h @@ -123101,7 +123101,7 @@ + +#endif /* IOOBJ_ */ --- /dev/null -+++ kernel-2.6.28/drivers/dsp/bridge/pmgr/msg.c ++++ kernel-maemo-2.6.28/drivers/dsp/bridge/pmgr/msg.c @@ -0,0 +1,173 @@ +/* + * msg.c @@ -123277,7 +123277,7 @@ +} + --- /dev/null -+++ kernel-2.6.28/drivers/dsp/bridge/pmgr/msgobj.h ++++ kernel-maemo-2.6.28/drivers/dsp/bridge/pmgr/msgobj.h @@ -0,0 +1,52 @@ +/* + * msgobj.h @@ -123332,7 +123332,7 @@ +#endif /* MSGOBJ_ */ + --- /dev/null -+++ kernel-2.6.28/drivers/dsp/bridge/pmgr/wcd.c ++++ kernel-maemo-2.6.28/drivers/dsp/bridge/pmgr/wcd.c @@ -0,0 +1,1747 @@ +/* + * wcd.c @@ -125082,7 +125082,7 @@ + return status; +} --- /dev/null -+++ kernel-2.6.28/drivers/dsp/bridge/rmgr/dbdcd.c ++++ kernel-maemo-2.6.28/drivers/dsp/bridge/rmgr/dbdcd.c @@ -0,0 +1,1573 @@ +/* + * dbdcd.c @@ -126658,7 +126658,7 @@ +} + --- /dev/null -+++ kernel-2.6.28/drivers/dsp/bridge/rmgr/disp.c ++++ kernel-maemo-2.6.28/drivers/dsp/bridge/rmgr/disp.c @@ -0,0 +1,916 @@ +/* + * disp.c @@ -127577,7 +127577,7 @@ + return status; +} --- /dev/null -+++ kernel-2.6.28/drivers/dsp/bridge/rmgr/drv.c ++++ kernel-maemo-2.6.28/drivers/dsp/bridge/rmgr/drv.c @@ -0,0 +1,1840 @@ +/* + * drv.c @@ -129420,7 +129420,7 @@ + return status; +} --- /dev/null -+++ kernel-2.6.28/drivers/dsp/bridge/rmgr/drv_interface.c ++++ kernel-maemo-2.6.28/drivers/dsp/bridge/rmgr/drv_interface.c @@ -0,0 +1,739 @@ +/* + * drv_interface.c @@ -130162,7 +130162,7 @@ +module_exit(bridge_exit); + --- /dev/null -+++ kernel-2.6.28/drivers/dsp/bridge/rmgr/drv_interface.h ++++ kernel-maemo-2.6.28/drivers/dsp/bridge/rmgr/drv_interface.h @@ -0,0 +1,40 @@ +/* + * drv_interface.h @@ -130205,7 +130205,7 @@ +static int bridge_mmap(struct file *filp, struct vm_area_struct *vma); +#endif /* ifndef _DRV_INTERFACE_H_ */ --- /dev/null -+++ kernel-2.6.28/drivers/dsp/bridge/rmgr/dspdrv.c ++++ kernel-maemo-2.6.28/drivers/dsp/bridge/rmgr/dspdrv.c @@ -0,0 +1,250 @@ +/* + * dspdrv.c @@ -130458,7 +130458,7 @@ + return retVal; +} --- /dev/null -+++ kernel-2.6.28/drivers/dsp/bridge/rmgr/mgr.c ++++ kernel-maemo-2.6.28/drivers/dsp/bridge/rmgr/mgr.c @@ -0,0 +1,491 @@ +/* + * mgr.c @@ -130952,7 +130952,7 @@ +} + --- /dev/null -+++ kernel-2.6.28/drivers/dsp/bridge/rmgr/nldr.c ++++ kernel-maemo-2.6.28/drivers/dsp/bridge/rmgr/nldr.c @@ -0,0 +1,1967 @@ +/* + * nldr.c @@ -132922,7 +132922,7 @@ +} + --- /dev/null -+++ kernel-2.6.28/drivers/dsp/bridge/rmgr/node.c ++++ kernel-maemo-2.6.28/drivers/dsp/bridge/rmgr/node.c @@ -0,0 +1,3504 @@ +/* + * node.c @@ -136429,7 +136429,7 @@ +} + --- /dev/null -+++ kernel-2.6.28/drivers/dsp/bridge/rmgr/proc.c ++++ kernel-maemo-2.6.28/drivers/dsp/bridge/rmgr/proc.c @@ -0,0 +1,2061 @@ +/* + * proc.c @@ -138493,7 +138493,7 @@ +} + --- /dev/null -+++ kernel-2.6.28/drivers/dsp/bridge/rmgr/pwr.c ++++ kernel-maemo-2.6.28/drivers/dsp/bridge/rmgr/pwr.c @@ -0,0 +1,184 @@ +/* + * pwr.c @@ -138680,7 +138680,7 @@ + + --- /dev/null -+++ kernel-2.6.28/drivers/dsp/bridge/rmgr/rmm.c ++++ kernel-maemo-2.6.28/drivers/dsp/bridge/rmgr/rmm.c @@ -0,0 +1,604 @@ +/* + * rmm.c @@ -139287,7 +139287,7 @@ +} + --- /dev/null -+++ kernel-2.6.28/drivers/dsp/bridge/rmgr/strm.c ++++ kernel-maemo-2.6.28/drivers/dsp/bridge/rmgr/strm.c @@ -0,0 +1,1006 @@ +/* + * strm.c @@ -140296,7 +140296,7 @@ +} + --- /dev/null -+++ kernel-2.6.28/drivers/dsp/bridge/services/cfg.c ++++ kernel-maemo-2.6.28/drivers/dsp/bridge/services/cfg.c @@ -0,0 +1,483 @@ +/* + * cfg.c @@ -140782,7 +140782,7 @@ + return status; +} --- /dev/null -+++ kernel-2.6.28/drivers/dsp/bridge/services/clk.c ++++ kernel-maemo-2.6.28/drivers/dsp/bridge/services/clk.c @@ -0,0 +1,375 @@ +/* + * clk.c @@ -141160,7 +141160,7 @@ + __raw_writel((u32)ssi_sysconfig, SSI_BASE + 0x10); +} --- /dev/null -+++ kernel-2.6.28/drivers/dsp/bridge/services/csl.c ++++ kernel-maemo-2.6.28/drivers/dsp/bridge/services/csl.c @@ -0,0 +1,173 @@ +/* + * csl.c @@ -141336,7 +141336,7 @@ + return pstrToken; +} --- /dev/null -+++ kernel-2.6.28/drivers/dsp/bridge/services/dbg.c ++++ kernel-maemo-2.6.28/drivers/dsp/bridge/services/dbg.c @@ -0,0 +1,119 @@ +/* + * dbg.c @@ -141458,7 +141458,7 @@ + +#endif /* (defined(DEBUG) || defined(DDSP_DEBUG_PRODUCT)) && GT_TRACE */ --- /dev/null -+++ kernel-2.6.28/drivers/dsp/bridge/services/dpc.c ++++ kernel-maemo-2.6.28/drivers/dsp/bridge/services/dpc.c @@ -0,0 +1,274 @@ +/* + * dpc.c @@ -141735,7 +141735,7 @@ +} + --- /dev/null -+++ kernel-2.6.28/drivers/dsp/bridge/services/kfile.c ++++ kernel-maemo-2.6.28/drivers/dsp/bridge/services/kfile.c @@ -0,0 +1,335 @@ +/* + * kfile.c @@ -142073,7 +142073,7 @@ +} + --- /dev/null -+++ kernel-2.6.28/drivers/dsp/bridge/services/list.c ++++ kernel-maemo-2.6.28/drivers/dsp/bridge/services/list.c @@ -0,0 +1,285 @@ +/* + * list.c @@ -142361,7 +142361,7 @@ +} + --- /dev/null -+++ kernel-2.6.28/drivers/dsp/bridge/services/mem.c ++++ kernel-maemo-2.6.28/drivers/dsp/bridge/services/mem.c @@ -0,0 +1,628 @@ +/* + * mem.c @@ -142992,7 +142992,7 @@ + return true; +} --- /dev/null -+++ kernel-2.6.28/drivers/dsp/bridge/services/ntfy.c ++++ kernel-maemo-2.6.28/drivers/dsp/bridge/services/ntfy.c @@ -0,0 +1,329 @@ +/* + * ntfy.c @@ -143324,7 +143324,7 @@ +} + --- /dev/null -+++ kernel-2.6.28/drivers/dsp/bridge/services/reg.c ++++ kernel-maemo-2.6.28/drivers/dsp/bridge/services/reg.c @@ -0,0 +1,196 @@ +/* + * reg.c @@ -143523,7 +143523,7 @@ +} + --- /dev/null -+++ kernel-2.6.28/drivers/dsp/bridge/services/regsup.c ++++ kernel-maemo-2.6.28/drivers/dsp/bridge/services/regsup.c @@ -0,0 +1,370 @@ +/* + * regsup.c @@ -143896,7 +143896,7 @@ +} + --- /dev/null -+++ kernel-2.6.28/drivers/dsp/bridge/services/regsup.h ++++ kernel-maemo-2.6.28/drivers/dsp/bridge/services/regsup.h @@ -0,0 +1,58 @@ +/* + * regsup.h @@ -143957,7 +143957,7 @@ +#endif + --- /dev/null -+++ kernel-2.6.28/drivers/dsp/bridge/services/services.c ++++ kernel-maemo-2.6.28/drivers/dsp/bridge/services/services.c @@ -0,0 +1,193 @@ +/* + * services.c @@ -144153,7 +144153,7 @@ +} + --- /dev/null -+++ kernel-2.6.28/drivers/dsp/bridge/services/sync.c ++++ kernel-maemo-2.6.28/drivers/dsp/bridge/services/sync.c @@ -0,0 +1,608 @@ +/* + * sync.c @@ -144764,7 +144764,7 @@ + return status; +} --- /dev/null -+++ kernel-2.6.28/drivers/dsp/bridge/wmd/_cmm.h ++++ kernel-maemo-2.6.28/drivers/dsp/bridge/wmd/_cmm.h @@ -0,0 +1,59 @@ +/* + * _cmm.h @@ -144826,7 +144826,7 @@ + +#endif /* _CMM_ */ --- /dev/null -+++ kernel-2.6.28/drivers/dsp/bridge/wmd/_deh.h ++++ kernel-maemo-2.6.28/drivers/dsp/bridge/wmd/_deh.h @@ -0,0 +1,46 @@ +/* + * _deh.h @@ -144875,7 +144875,7 @@ + +#endif /* _DEH_ */ --- /dev/null -+++ kernel-2.6.28/drivers/dsp/bridge/wmd/_msg_sm.h ++++ kernel-maemo-2.6.28/drivers/dsp/bridge/wmd/_msg_sm.h @@ -0,0 +1,158 @@ +/* + * _msg_sm.h @@ -145036,7 +145036,7 @@ +#endif /* _MSG_SM_ */ + --- /dev/null -+++ kernel-2.6.28/drivers/dsp/bridge/wmd/_tiomap.h ++++ kernel-maemo-2.6.28/drivers/dsp/bridge/wmd/_tiomap.h @@ -0,0 +1,384 @@ +/* + * _tiomap.h @@ -145423,7 +145423,7 @@ +#endif /* _TIOMAP_ */ + --- /dev/null -+++ kernel-2.6.28/drivers/dsp/bridge/wmd/_tiomap_mmu.h ++++ kernel-maemo-2.6.28/drivers/dsp/bridge/wmd/_tiomap_mmu.h @@ -0,0 +1,53 @@ +/* + * _tiomap_mmu.h @@ -145479,7 +145479,7 @@ + +#endif /* _TIOMAP_MMU_ */ --- /dev/null -+++ kernel-2.6.28/drivers/dsp/bridge/wmd/_tiomap_pwr.h ++++ kernel-maemo-2.6.28/drivers/dsp/bridge/wmd/_tiomap_pwr.h @@ -0,0 +1,102 @@ +/* + * _tiomap_pwr.h @@ -145584,7 +145584,7 @@ +#endif /* _TIOMAP_PWR_ */ + --- /dev/null -+++ kernel-2.6.28/drivers/dsp/bridge/wmd/_tiomap_util.h ++++ kernel-maemo-2.6.28/drivers/dsp/bridge/wmd/_tiomap_util.h @@ -0,0 +1,46 @@ +/* + * _tiomap_util.h @@ -145633,7 +145633,7 @@ +#endif /* _TIOMAP_UTIL_ */ + --- /dev/null -+++ kernel-2.6.28/drivers/dsp/bridge/wmd/chnl_sm.c ++++ kernel-maemo-2.6.28/drivers/dsp/bridge/wmd/chnl_sm.c @@ -0,0 +1,1100 @@ +/* + * chnl_sm.c @@ -146736,7 +146736,7 @@ + return status; +} --- /dev/null -+++ kernel-2.6.28/drivers/dsp/bridge/wmd/io_sm.c ++++ kernel-maemo-2.6.28/drivers/dsp/bridge/wmd/io_sm.c @@ -0,0 +1,2009 @@ +/* + * io_sm.c @@ -148748,7 +148748,7 @@ + +} --- /dev/null -+++ kernel-2.6.28/drivers/dsp/bridge/wmd/mmu_fault.c ++++ kernel-maemo-2.6.28/drivers/dsp/bridge/wmd/mmu_fault.c @@ -0,0 +1,172 @@ +/* + * mmu_fault.c @@ -148923,7 +148923,7 @@ + return retVal; +} --- /dev/null -+++ kernel-2.6.28/drivers/dsp/bridge/wmd/mmu_fault.h ++++ kernel-maemo-2.6.28/drivers/dsp/bridge/wmd/mmu_fault.h @@ -0,0 +1,45 @@ +/* + * mmu_fault.h @@ -148971,7 +148971,7 @@ +#endif /* MMU_FAULT_ */ + --- /dev/null -+++ kernel-2.6.28/drivers/dsp/bridge/wmd/msg_sm.c ++++ kernel-maemo-2.6.28/drivers/dsp/bridge/wmd/msg_sm.c @@ -0,0 +1,643 @@ +/* + * msg_sm.c @@ -149617,7 +149617,7 @@ +} + --- /dev/null -+++ kernel-2.6.28/drivers/dsp/bridge/wmd/tiomap3430.c ++++ kernel-maemo-2.6.28/drivers/dsp/bridge/wmd/tiomap3430.c @@ -0,0 +1,2091 @@ +/* + * tiomap.c @@ -151711,7 +151711,7 @@ + return TRUE; +} --- /dev/null -+++ kernel-2.6.28/drivers/dsp/bridge/wmd/tiomap3430_pwr.c ++++ kernel-maemo-2.6.28/drivers/dsp/bridge/wmd/tiomap3430_pwr.c @@ -0,0 +1,750 @@ +/* + * tiomap_pwr.c @@ -152464,7 +152464,7 @@ + } +} --- /dev/null -+++ kernel-2.6.28/drivers/dsp/bridge/wmd/tiomap_io.c ++++ kernel-maemo-2.6.28/drivers/dsp/bridge/wmd/tiomap_io.c @@ -0,0 +1,427 @@ +/* + * tiomap_io.c @@ -152894,7 +152894,7 @@ +} + --- /dev/null -+++ kernel-2.6.28/drivers/dsp/bridge/wmd/tiomap_io.h ++++ kernel-maemo-2.6.28/drivers/dsp/bridge/wmd/tiomap_io.h @@ -0,0 +1,112 @@ +/* + * tiomap_io.h @@ -153009,7 +153009,7 @@ +#endif /* _TIOMAP_IO_ */ + --- /dev/null -+++ kernel-2.6.28/drivers/dsp/bridge/wmd/tiomap_sm.c ++++ kernel-maemo-2.6.28/drivers/dsp/bridge/wmd/tiomap_sm.c @@ -0,0 +1,197 @@ +/* + * tiomap_sm.c @@ -153209,7 +153209,7 @@ + return true; +} --- /dev/null -+++ kernel-2.6.28/drivers/dsp/bridge/wmd/ue_deh.c ++++ kernel-maemo-2.6.28/drivers/dsp/bridge/wmd/ue_deh.c @@ -0,0 +1,371 @@ +/* + * ue_deh.c @@ -153583,7 +153583,7 @@ +} + --- /dev/null -+++ kernel-2.6.28/drivers/dsp/dspgateway/Kconfig ++++ kernel-maemo-2.6.28/drivers/dsp/dspgateway/Kconfig @@ -0,0 +1,24 @@ + +config OMAP_DSP @@ -153610,7 +153610,7 @@ + bothering ARM. + --- /dev/null -+++ kernel-2.6.28/drivers/dsp/dspgateway/Makefile ++++ kernel-maemo-2.6.28/drivers/dsp/dspgateway/Makefile @@ -0,0 +1,15 @@ +# +# Makefile for the OMAP DSP driver. @@ -153628,7 +153628,7 @@ + dsp_ctl_core.o dsp_ctl.o taskwatch.o error.o dsp_mem.o \ + uaccess_dsp.o --- /dev/null -+++ kernel-2.6.28/drivers/dsp/dspgateway/dsp.h ++++ kernel-maemo-2.6.28/drivers/dsp/dspgateway/dsp.h @@ -0,0 +1,391 @@ +/* + * This file is part of OMAP DSP driver (DSP Gateway version 3.3.1) @@ -154022,7 +154022,7 @@ + +#endif /* __PLAT_OMAP_DSP_DSP_H */ --- /dev/null -+++ kernel-2.6.28/drivers/dsp/dspgateway/dsp_common.c ++++ kernel-maemo-2.6.28/drivers/dsp/dspgateway/dsp_common.c @@ -0,0 +1,639 @@ +/* + * This file is part of OMAP DSP driver (DSP Gateway version 3.3.1) @@ -154664,7 +154664,7 @@ +EXPORT_SYMBOL(pmd_clear_bad); +#endif --- /dev/null -+++ kernel-2.6.28/drivers/dsp/dspgateway/dsp_core.c ++++ kernel-maemo-2.6.28/drivers/dsp/dspgateway/dsp_core.c @@ -0,0 +1,646 @@ +/* + * This file is part of OMAP DSP driver (DSP Gateway version 3.3.1) @@ -155313,7 +155313,7 @@ +module_init(omap_dsp_mod_init); +module_exit(omap_dsp_mod_exit); --- /dev/null -+++ kernel-2.6.28/drivers/dsp/dspgateway/dsp_ctl.c ++++ kernel-maemo-2.6.28/drivers/dsp/dspgateway/dsp_ctl.c @@ -0,0 +1,1069 @@ +/* + * This file is part of OMAP DSP driver (DSP Gateway version 3.3.1) @@ -156385,7 +156385,7 @@ + device_remove_file(omap_dsp->dev, &dev_attr_icrmask); +} --- /dev/null -+++ kernel-2.6.28/drivers/dsp/dspgateway/dsp_ctl_core.c ++++ kernel-maemo-2.6.28/drivers/dsp/dspgateway/dsp_ctl_core.c @@ -0,0 +1,132 @@ +/* + * This file is part of OMAP DSP driver (DSP Gateway version 3.3.1) @@ -156520,7 +156520,7 @@ + unregister_chrdev(OMAP_DSP_CTL_MAJOR, "dspctl"); +} --- /dev/null -+++ kernel-2.6.28/drivers/dsp/dspgateway/dsp_mbcmd.h ++++ kernel-maemo-2.6.28/drivers/dsp/dspgateway/dsp_mbcmd.h @@ -0,0 +1,147 @@ +/* + * This file is part of OMAP DSP driver (DSP Gateway version 3.3.1) @@ -156670,7 +156670,7 @@ + +#endif /* __PLAT_OMAP_DSP_MBCMD_H */ --- /dev/null -+++ kernel-2.6.28/drivers/dsp/dspgateway/dsp_mem.c ++++ kernel-maemo-2.6.28/drivers/dsp/dspgateway/dsp_mem.c @@ -0,0 +1,484 @@ +/* + * This file is part of OMAP DSP driver (DSP Gateway version 3.3.1) @@ -157157,7 +157157,7 @@ + omap_mmu_unregister(&dsp_mmu); +} --- /dev/null -+++ kernel-2.6.28/drivers/dsp/dspgateway/error.c ++++ kernel-maemo-2.6.28/drivers/dsp/dspgateway/error.c @@ -0,0 +1,227 @@ +/* + * This file is part of OMAP DSP driver (DSP Gateway version 3.3.1) @@ -157387,7 +157387,7 @@ + omap_dsp->mbox->err_notify = NULL; +} --- /dev/null -+++ kernel-2.6.28/drivers/dsp/dspgateway/hardware_dsp.h ++++ kernel-maemo-2.6.28/drivers/dsp/dspgateway/hardware_dsp.h @@ -0,0 +1,34 @@ +/* + * This file is part of OMAP DSP driver (DSP Gateway version 3.3.1) @@ -157424,7 +157424,7 @@ + +#endif /* __OMAP_DSP_HARDWARE_DSP_H */ --- /dev/null -+++ kernel-2.6.28/drivers/dsp/dspgateway/ipbuf.c ++++ kernel-maemo-2.6.28/drivers/dsp/dspgateway/ipbuf.c @@ -0,0 +1,353 @@ +/* + * This file is part of OMAP DSP driver (DSP Gateway version 3.3.1) @@ -157780,7 +157780,7 @@ + return len; +} --- /dev/null -+++ kernel-2.6.28/drivers/dsp/dspgateway/ipbuf.h ++++ kernel-maemo-2.6.28/drivers/dsp/dspgateway/ipbuf.h @@ -0,0 +1,193 @@ +/* + * This file is part of OMAP DSP driver (DSP Gateway version 3.3.1) @@ -157976,7 +157976,7 @@ + +#endif /* __PLAT_OMAP_DSP_IPBUF_H */ --- /dev/null -+++ kernel-2.6.28/drivers/dsp/dspgateway/mblog.c ++++ kernel-maemo-2.6.28/drivers/dsp/dspgateway/mblog.c @@ -0,0 +1,280 @@ +/* + * This file is part of OMAP DSP driver (DSP Gateway version 3.3.1) @@ -158259,7 +158259,7 @@ + device_remove_file(omap_dsp->dev, &dev_attr_mblog); +} --- /dev/null -+++ kernel-2.6.28/drivers/dsp/dspgateway/mmu.h ++++ kernel-maemo-2.6.28/drivers/dsp/dspgateway/mmu.h @@ -0,0 +1,140 @@ +#ifndef __PLAT_OMAP_DSP_MMU_H +#define __PLAT_OMAP_DSP_MMU_H @@ -158402,7 +158402,7 @@ + +#endif /* __PLAT_OMAP_DSP_MMU_H */ --- /dev/null -+++ kernel-2.6.28/drivers/dsp/dspgateway/omap1_dsp.h ++++ kernel-maemo-2.6.28/drivers/dsp/dspgateway/omap1_dsp.h @@ -0,0 +1,114 @@ +/* + * This file is part of OMAP DSP driver (DSP Gateway version 3.3.1) @@ -158519,7 +158519,7 @@ + +#endif /* __OMAP_DSP_OMAP1_DSP_H */ --- /dev/null -+++ kernel-2.6.28/drivers/dsp/dspgateway/omap2_dsp.h ++++ kernel-maemo-2.6.28/drivers/dsp/dspgateway/omap2_dsp.h @@ -0,0 +1,95 @@ +/* + * This file is part of OMAP DSP driver (DSP Gateway version 3.3.1) @@ -158617,7 +158617,7 @@ + +#endif /* __OMAP_DSP_OMAP2_DSP_H */ --- /dev/null -+++ kernel-2.6.28/drivers/dsp/dspgateway/proclist.h ++++ kernel-maemo-2.6.28/drivers/dsp/dspgateway/proclist.h @@ -0,0 +1,87 @@ +/* + * This file is part of OMAP DSP driver (DSP Gateway version 3.3.1) @@ -158707,7 +158707,7 @@ + +#endif /* __PLAT_OMAP_DSP_PROCLIST_H */ --- /dev/null -+++ kernel-2.6.28/drivers/dsp/dspgateway/task.c ++++ kernel-maemo-2.6.28/drivers/dsp/dspgateway/task.c @@ -0,0 +1,3041 @@ +/* + * This file is part of OMAP DSP driver (DSP Gateway version 3.3.1) @@ -161751,7 +161751,7 @@ + unregister_chrdev(OMAP_DSP_TASK_MAJOR, "dsptask"); +} --- /dev/null -+++ kernel-2.6.28/drivers/dsp/dspgateway/taskwatch.c ++++ kernel-maemo-2.6.28/drivers/dsp/dspgateway/taskwatch.c @@ -0,0 +1,164 @@ +/* + * This file is part of OMAP DSP driver (DSP Gateway version 3.3.1) @@ -161918,7 +161918,7 @@ + wake_up_interruptible(&read_wait_q); +} --- /dev/null -+++ kernel-2.6.28/drivers/dsp/dspgateway/uaccess_dsp.S ++++ kernel-maemo-2.6.28/drivers/dsp/dspgateway/uaccess_dsp.S @@ -0,0 +1,77 @@ +/* + * This file is part of OMAP DSP driver (DSP Gateway version 3.3.1) @@ -161998,7 +161998,7 @@ + ldmfd sp!, {r4, pc} + .previous --- /dev/null -+++ kernel-2.6.28/drivers/dsp/dspgateway/uaccess_dsp.h ++++ kernel-maemo-2.6.28/drivers/dsp/dspgateway/uaccess_dsp.h @@ -0,0 +1,176 @@ +/* + * This file is part of OMAP DSP driver (DSP Gateway version 3.3.1) @@ -162176,8 +162176,8 @@ +} + +#endif /* _OMAP_DSP_UACCESS_DSP_H */ ---- kernel-2.6.28.orig/drivers/gpio/gpiolib.c -+++ kernel-2.6.28/drivers/gpio/gpiolib.c +--- kernel-maemo-2.6.28.orig/drivers/gpio/gpiolib.c ++++ kernel-maemo-2.6.28/drivers/gpio/gpiolib.c @@ -789,6 +789,7 @@ } else { status = -EBUSY; @@ -162186,8 +162186,8 @@ } if (chip->request) { ---- kernel-2.6.28.orig/drivers/gpio/twl4030-gpio.c -+++ kernel-2.6.28/drivers/gpio/twl4030-gpio.c +--- kernel-maemo-2.6.28.orig/drivers/gpio/twl4030-gpio.c ++++ kernel-maemo-2.6.28/drivers/gpio/twl4030-gpio.c @@ -202,37 +202,6 @@ return ret; } @@ -162264,20 +162264,20 @@ twl_gpiochip.ngpio = TWL4030_GPIO_MAX; twl_gpiochip.dev = &pdev->dev; --- /dev/null -+++ kernel-2.6.28/drivers/gpu/Kconfig ++++ kernel-maemo-2.6.28/drivers/gpu/Kconfig @@ -0,0 +1,3 @@ +source drivers/gpu/pvr/Kconfig +source drivers/gpu/drm/Kconfig + ---- kernel-2.6.28.orig/drivers/gpu/Makefile -+++ kernel-2.6.28/drivers/gpu/Makefile +--- kernel-maemo-2.6.28.orig/drivers/gpu/Makefile ++++ kernel-maemo-2.6.28/drivers/gpu/Makefile @@ -1 +1,3 @@ -obj-y += drm/ +obj-$(CONFIG_PVR) += pvr/ +obj-$(CONFIG_DRM) += drm/ + --- /dev/null -+++ kernel-2.6.28/drivers/gpu/pvr/COPYING ++++ kernel-maemo-2.6.28/drivers/gpu/pvr/COPYING @@ -0,0 +1,351 @@ + +This software is Copyright (C) 2008 Imagination Technologies Ltd. @@ -162631,7 +162631,7 @@ +------------------------------------------------------------------------- + --- /dev/null -+++ kernel-2.6.28/drivers/gpu/pvr/Kconfig ++++ kernel-maemo-2.6.28/drivers/gpu/pvr/Kconfig @@ -0,0 +1,23 @@ +menuconfig PVR + tristate "PowerVR Services" @@ -162657,7 +162657,7 @@ +endif + --- /dev/null -+++ kernel-2.6.28/drivers/gpu/pvr/Makefile ++++ kernel-maemo-2.6.28/drivers/gpu/pvr/Makefile @@ -0,0 +1,25 @@ +obj-$(CONFIG_PVR) += omaplfb.o pvrsrvkm.o + @@ -162685,7 +162685,7 @@ +ccflags-y += $(CBUILD) -include $(src)/pvrconfig.h + --- /dev/null -+++ kernel-2.6.28/drivers/gpu/pvr/README ++++ kernel-maemo-2.6.28/drivers/gpu/pvr/README @@ -0,0 +1,27 @@ + +SGX Embedded Systems DDK for Linux kernel. @@ -162715,7 +162715,7 @@ +Imagination Technologies Ltd. +Home Park Estate, Kings Langley, Herts, WD4 8LZ, UK --- /dev/null -+++ kernel-2.6.28/drivers/gpu/pvr/bridged_pvr_bridge.c ++++ kernel-maemo-2.6.28/drivers/gpu/pvr/bridged_pvr_bridge.c @@ -0,0 +1,4793 @@ +/********************************************************************** + * @@ -167511,7 +167511,7 @@ + return err; +} --- /dev/null -+++ kernel-2.6.28/drivers/gpu/pvr/bridged_pvr_bridge.h ++++ kernel-maemo-2.6.28/drivers/gpu/pvr/bridged_pvr_bridge.h @@ -0,0 +1,72 @@ +/********************************************************************** + * @@ -167586,7 +167586,7 @@ + +#endif --- /dev/null -+++ kernel-2.6.28/drivers/gpu/pvr/buffer_manager.c ++++ kernel-maemo-2.6.28/drivers/gpu/pvr/buffer_manager.c @@ -0,0 +1,1632 @@ +/********************************************************************** + * @@ -169221,7 +169221,7 @@ + return ((BM_BUF *) psMemInfo->sMemBlk.hBuffer)->pMapping->hOSMemHandle; +} --- /dev/null -+++ kernel-2.6.28/drivers/gpu/pvr/buffer_manager.h ++++ kernel-maemo-2.6.28/drivers/gpu/pvr/buffer_manager.h @@ -0,0 +1,189 @@ +/********************************************************************** + * @@ -169413,7 +169413,7 @@ + +#endif --- /dev/null -+++ kernel-2.6.28/drivers/gpu/pvr/bufferclass_example.c ++++ kernel-maemo-2.6.28/drivers/gpu/pvr/bufferclass_example.c @@ -0,0 +1,284 @@ +/********************************************************************** + * @@ -169700,7 +169700,7 @@ + return PVRSRV_OK; +} --- /dev/null -+++ kernel-2.6.28/drivers/gpu/pvr/bufferclass_example.h ++++ kernel-maemo-2.6.28/drivers/gpu/pvr/bufferclass_example.h @@ -0,0 +1,117 @@ +/********************************************************************** + * @@ -169820,7 +169820,7 @@ + +#endif --- /dev/null -+++ kernel-2.6.28/drivers/gpu/pvr/bufferclass_example_linux.c ++++ kernel-maemo-2.6.28/drivers/gpu/pvr/bufferclass_example_linux.c @@ -0,0 +1,215 @@ +/********************************************************************** + * @@ -170038,7 +170038,7 @@ +module_init(BC_Example_ModInit); +module_exit(BC_Example_ModCleanup); --- /dev/null -+++ kernel-2.6.28/drivers/gpu/pvr/bufferclass_example_linux.h ++++ kernel-maemo-2.6.28/drivers/gpu/pvr/bufferclass_example_linux.h @@ -0,0 +1,45 @@ +/********************************************************************** + * @@ -170086,7 +170086,7 @@ + +#endif --- /dev/null -+++ kernel-2.6.28/drivers/gpu/pvr/bufferclass_example_private.c ++++ kernel-maemo-2.6.28/drivers/gpu/pvr/bufferclass_example_private.c @@ -0,0 +1,226 @@ +/********************************************************************** + * @@ -170315,7 +170315,7 @@ + return 0; +} --- /dev/null -+++ kernel-2.6.28/drivers/gpu/pvr/dbgdrvif.h ++++ kernel-maemo-2.6.28/drivers/gpu/pvr/dbgdrvif.h @@ -0,0 +1,283 @@ +/********************************************************************** + * @@ -170601,7 +170601,7 @@ + +#endif --- /dev/null -+++ kernel-2.6.28/drivers/gpu/pvr/device.h ++++ kernel-maemo-2.6.28/drivers/gpu/pvr/device.h @@ -0,0 +1,237 @@ +/********************************************************************** + * @@ -170841,7 +170841,7 @@ + +#endif --- /dev/null -+++ kernel-2.6.28/drivers/gpu/pvr/deviceclass.c ++++ kernel-maemo-2.6.28/drivers/gpu/pvr/deviceclass.c @@ -0,0 +1,1586 @@ +/********************************************************************** + * @@ -172430,7 +172430,7 @@ + return IMG_TRUE; +} --- /dev/null -+++ kernel-2.6.28/drivers/gpu/pvr/devicemem.c ++++ kernel-maemo-2.6.28/drivers/gpu/pvr/devicemem.c @@ -0,0 +1,1166 @@ +/********************************************************************** + * @@ -173599,7 +173599,7 @@ + return PVRSRV_OK; +} --- /dev/null -+++ kernel-2.6.28/drivers/gpu/pvr/env_data.h ++++ kernel-maemo-2.6.28/drivers/gpu/pvr/env_data.h @@ -0,0 +1,57 @@ +/********************************************************************** + * @@ -173659,7 +173659,7 @@ + +#endif --- /dev/null -+++ kernel-2.6.28/drivers/gpu/pvr/event.c ++++ kernel-maemo-2.6.28/drivers/gpu/pvr/event.c @@ -0,0 +1,276 @@ +/********************************************************************** + * @@ -173938,7 +173938,7 @@ + +} --- /dev/null -+++ kernel-2.6.28/drivers/gpu/pvr/event.h ++++ kernel-maemo-2.6.28/drivers/gpu/pvr/event.h @@ -0,0 +1,35 @@ +/********************************************************************** + * @@ -173976,7 +173976,7 @@ +PVRSRV_ERROR LinuxEventObjectWait(IMG_HANDLE hOSEventObject, + IMG_UINT32 ui32MSTimeout); --- /dev/null -+++ kernel-2.6.28/drivers/gpu/pvr/handle.c ++++ kernel-maemo-2.6.28/drivers/gpu/pvr/handle.c @@ -0,0 +1,1312 @@ +/********************************************************************** + * @@ -175291,7 +175291,7 @@ + return eError; +} --- /dev/null -+++ kernel-2.6.28/drivers/gpu/pvr/handle.h ++++ kernel-maemo-2.6.28/drivers/gpu/pvr/handle.h @@ -0,0 +1,145 @@ +/********************************************************************** + * @@ -175439,7 +175439,7 @@ + +#endif --- /dev/null -+++ kernel-2.6.28/drivers/gpu/pvr/hash.c ++++ kernel-maemo-2.6.28/drivers/gpu/pvr/hash.c @@ -0,0 +1,362 @@ +/********************************************************************** + * @@ -175804,7 +175804,7 @@ +} + --- /dev/null -+++ kernel-2.6.28/drivers/gpu/pvr/hash.h ++++ kernel-maemo-2.6.28/drivers/gpu/pvr/hash.h @@ -0,0 +1,72 @@ +/********************************************************************** + * @@ -175879,7 +175879,7 @@ + +#endif --- /dev/null -+++ kernel-2.6.28/drivers/gpu/pvr/img_defs.h ++++ kernel-maemo-2.6.28/drivers/gpu/pvr/img_defs.h @@ -0,0 +1,72 @@ +/********************************************************************** + * @@ -175954,7 +175954,7 @@ + +#endif --- /dev/null -+++ kernel-2.6.28/drivers/gpu/pvr/img_types.h ++++ kernel-maemo-2.6.28/drivers/gpu/pvr/img_types.h @@ -0,0 +1,102 @@ +/********************************************************************** + * @@ -176059,7 +176059,7 @@ + +#endif --- /dev/null -+++ kernel-2.6.28/drivers/gpu/pvr/ioctldef.h ++++ kernel-maemo-2.6.28/drivers/gpu/pvr/ioctldef.h @@ -0,0 +1,95 @@ +/********************************************************************** + * @@ -176157,7 +176157,7 @@ + +#endif --- /dev/null -+++ kernel-2.6.28/drivers/gpu/pvr/kernelbuffer.h ++++ kernel-maemo-2.6.28/drivers/gpu/pvr/kernelbuffer.h @@ -0,0 +1,59 @@ +/********************************************************************** + * @@ -176219,7 +176219,7 @@ + +#endif --- /dev/null -+++ kernel-2.6.28/drivers/gpu/pvr/kerneldisplay.h ++++ kernel-maemo-2.6.28/drivers/gpu/pvr/kerneldisplay.h @@ -0,0 +1,144 @@ +/********************************************************************** + * @@ -176366,7 +176366,7 @@ + +#endif --- /dev/null -+++ kernel-2.6.28/drivers/gpu/pvr/mem.c ++++ kernel-maemo-2.6.28/drivers/gpu/pvr/mem.c @@ -0,0 +1,121 @@ +/********************************************************************** + * @@ -176490,7 +176490,7 @@ + return PVRSRV_OK; +} --- /dev/null -+++ kernel-2.6.28/drivers/gpu/pvr/metrics.c ++++ kernel-maemo-2.6.28/drivers/gpu/pvr/metrics.c @@ -0,0 +1,114 @@ +/********************************************************************** + * @@ -176607,7 +176607,7 @@ + +#endif --- /dev/null -+++ kernel-2.6.28/drivers/gpu/pvr/metrics.h ++++ kernel-maemo-2.6.28/drivers/gpu/pvr/metrics.h @@ -0,0 +1,95 @@ +/********************************************************************** + * @@ -176705,7 +176705,7 @@ + +#endif --- /dev/null -+++ kernel-2.6.28/drivers/gpu/pvr/mm.c ++++ kernel-maemo-2.6.28/drivers/gpu/pvr/mm.c @@ -0,0 +1,1507 @@ +/********************************************************************** + * @@ -178215,7 +178215,7 @@ +} +#endif --- /dev/null -+++ kernel-2.6.28/drivers/gpu/pvr/mm.h ++++ kernel-maemo-2.6.28/drivers/gpu/pvr/mm.h @@ -0,0 +1,271 @@ +/********************************************************************** + * @@ -178489,7 +178489,7 @@ + +#endif --- /dev/null -+++ kernel-2.6.28/drivers/gpu/pvr/mmap.c ++++ kernel-maemo-2.6.28/drivers/gpu/pvr/mmap.c @@ -0,0 +1,668 @@ +/********************************************************************** + * @@ -179160,7 +179160,7 @@ +} +#endif --- /dev/null -+++ kernel-2.6.28/drivers/gpu/pvr/mmap.h ++++ kernel-maemo-2.6.28/drivers/gpu/pvr/mmap.h @@ -0,0 +1,70 @@ +/********************************************************************** + * @@ -179233,7 +179233,7 @@ + +#endif --- /dev/null -+++ kernel-2.6.28/drivers/gpu/pvr/mmu.c ++++ kernel-maemo-2.6.28/drivers/gpu/pvr/mmu.c @@ -0,0 +1,1523 @@ +/********************************************************************** + * @@ -180759,7 +180759,7 @@ +} + --- /dev/null -+++ kernel-2.6.28/drivers/gpu/pvr/mmu.h ++++ kernel-maemo-2.6.28/drivers/gpu/pvr/mmu.h @@ -0,0 +1,98 @@ +/********************************************************************** + * @@ -180860,7 +180860,7 @@ + +#endif --- /dev/null -+++ kernel-2.6.28/drivers/gpu/pvr/module.c ++++ kernel-maemo-2.6.28/drivers/gpu/pvr/module.c @@ -0,0 +1,323 @@ +/********************************************************************** + * @@ -181186,7 +181186,7 @@ +module_init(PVRCore_Init); +module_exit(PVRCore_Cleanup); --- /dev/null -+++ kernel-2.6.28/drivers/gpu/pvr/mutex.c ++++ kernel-maemo-2.6.28/drivers/gpu/pvr/mutex.c @@ -0,0 +1,71 @@ +/********************************************************************** + * @@ -181260,7 +181260,7 @@ +} + --- /dev/null -+++ kernel-2.6.28/drivers/gpu/pvr/mutex.h ++++ kernel-maemo-2.6.28/drivers/gpu/pvr/mutex.h @@ -0,0 +1,51 @@ +/********************************************************************** + * @@ -181314,7 +181314,7 @@ + +#endif --- /dev/null -+++ kernel-2.6.28/drivers/gpu/pvr/oemfuncs.h ++++ kernel-maemo-2.6.28/drivers/gpu/pvr/oemfuncs.h @@ -0,0 +1,48 @@ +/********************************************************************** + * @@ -181365,7 +181365,7 @@ + +#endif --- /dev/null -+++ kernel-2.6.28/drivers/gpu/pvr/omaplfb.h ++++ kernel-maemo-2.6.28/drivers/gpu/pvr/omaplfb.h @@ -0,0 +1,201 @@ +/********************************************************************** + * @@ -181569,7 +181569,7 @@ + +#endif --- /dev/null -+++ kernel-2.6.28/drivers/gpu/pvr/omaplfb_displayclass.c ++++ kernel-maemo-2.6.28/drivers/gpu/pvr/omaplfb_displayclass.c @@ -0,0 +1,1316 @@ +/********************************************************************** + * @@ -182888,7 +182888,7 @@ + spin_unlock_irqrestore(&psDevInfo->SwapChainLock, ulLockFlags); +} --- /dev/null -+++ kernel-2.6.28/drivers/gpu/pvr/omaplfb_linux.c ++++ kernel-maemo-2.6.28/drivers/gpu/pvr/omaplfb_linux.c @@ -0,0 +1,251 @@ +/********************************************************************** + * @@ -183142,7 +183142,7 @@ +module_init(OMAPLFB_Init); +module_exit(OMAPLFB_Cleanup); --- /dev/null -+++ kernel-2.6.28/drivers/gpu/pvr/osfunc.c ++++ kernel-maemo-2.6.28/drivers/gpu/pvr/osfunc.c @@ -0,0 +1,1752 @@ +/********************************************************************** + * @@ -184897,7 +184897,7 @@ + return PVRSRV_ERROR_GENERIC; +} --- /dev/null -+++ kernel-2.6.28/drivers/gpu/pvr/osfunc.h ++++ kernel-maemo-2.6.28/drivers/gpu/pvr/osfunc.h @@ -0,0 +1,300 @@ +/********************************************************************** + * @@ -185200,7 +185200,7 @@ + +#endif --- /dev/null -+++ kernel-2.6.28/drivers/gpu/pvr/pb.c ++++ kernel-maemo-2.6.28/drivers/gpu/pvr/pb.c @@ -0,0 +1,466 @@ +/********************************************************************** + * @@ -185669,7 +185669,7 @@ + return eRet; +} --- /dev/null -+++ kernel-2.6.28/drivers/gpu/pvr/pdump.c ++++ kernel-maemo-2.6.28/drivers/gpu/pvr/pdump.c @@ -0,0 +1,1382 @@ +/********************************************************************** + * @@ -187054,7 +187054,7 @@ + +#endif --- /dev/null -+++ kernel-2.6.28/drivers/gpu/pvr/pdump_km.h ++++ kernel-maemo-2.6.28/drivers/gpu/pvr/pdump_km.h @@ -0,0 +1,290 @@ +/********************************************************************** + * @@ -187347,7 +187347,7 @@ + +#endif --- /dev/null -+++ kernel-2.6.28/drivers/gpu/pvr/pdumpdefs.h ++++ kernel-maemo-2.6.28/drivers/gpu/pvr/pdumpdefs.h @@ -0,0 +1,92 @@ +/********************************************************************** + * @@ -187442,7 +187442,7 @@ + +#endif --- /dev/null -+++ kernel-2.6.28/drivers/gpu/pvr/perproc.c ++++ kernel-maemo-2.6.28/drivers/gpu/pvr/perproc.c @@ -0,0 +1,242 @@ +/********************************************************************** + * @@ -187687,7 +187687,7 @@ + return PVRSRV_OK; +} --- /dev/null -+++ kernel-2.6.28/drivers/gpu/pvr/perproc.h ++++ kernel-maemo-2.6.28/drivers/gpu/pvr/perproc.h @@ -0,0 +1,60 @@ +/********************************************************************** + * @@ -187750,7 +187750,7 @@ + +#endif --- /dev/null -+++ kernel-2.6.28/drivers/gpu/pvr/power.c ++++ kernel-maemo-2.6.28/drivers/gpu/pvr/power.c @@ -0,0 +1,649 @@ +/********************************************************************** + * @@ -188402,7 +188402,7 @@ + } +} --- /dev/null -+++ kernel-2.6.28/drivers/gpu/pvr/power.h ++++ kernel-maemo-2.6.28/drivers/gpu/pvr/power.h @@ -0,0 +1,118 @@ +/********************************************************************** + * @@ -188523,7 +188523,7 @@ + +#endif --- /dev/null -+++ kernel-2.6.28/drivers/gpu/pvr/proc.c ++++ kernel-maemo-2.6.28/drivers/gpu/pvr/proc.c @@ -0,0 +1,342 @@ +/********************************************************************** + * @@ -188868,7 +188868,7 @@ + return (len); +} --- /dev/null -+++ kernel-2.6.28/drivers/gpu/pvr/proc.h ++++ kernel-maemo-2.6.28/drivers/gpu/pvr/proc.h @@ -0,0 +1,51 @@ +/********************************************************************** + * @@ -188922,7 +188922,7 @@ + +#endif --- /dev/null -+++ kernel-2.6.28/drivers/gpu/pvr/pvr_bridge.h ++++ kernel-maemo-2.6.28/drivers/gpu/pvr/pvr_bridge.h @@ -0,0 +1,1013 @@ +/********************************************************************** + * @@ -189938,7 +189938,7 @@ + +#endif --- /dev/null -+++ kernel-2.6.28/drivers/gpu/pvr/pvr_bridge_k.c ++++ kernel-maemo-2.6.28/drivers/gpu/pvr/pvr_bridge_k.c @@ -0,0 +1,195 @@ +/********************************************************************** + * @@ -190136,7 +190136,7 @@ + return err; +} --- /dev/null -+++ kernel-2.6.28/drivers/gpu/pvr/pvr_bridge_km.h ++++ kernel-maemo-2.6.28/drivers/gpu/pvr/pvr_bridge_km.h @@ -0,0 +1,350 @@ +/********************************************************************** + * @@ -190489,7 +190489,7 @@ + +#endif --- /dev/null -+++ kernel-2.6.28/drivers/gpu/pvr/pvr_debug.c ++++ kernel-maemo-2.6.28/drivers/gpu/pvr/pvr_debug.c @@ -0,0 +1,185 @@ +/********************************************************************** + * @@ -190677,7 +190677,7 @@ + +#endif --- /dev/null -+++ kernel-2.6.28/drivers/gpu/pvr/pvr_debug.h ++++ kernel-maemo-2.6.28/drivers/gpu/pvr/pvr_debug.h @@ -0,0 +1,100 @@ +/********************************************************************** + * @@ -190780,7 +190780,7 @@ + +#endif --- /dev/null -+++ kernel-2.6.28/drivers/gpu/pvr/pvrconfig.h ++++ kernel-maemo-2.6.28/drivers/gpu/pvr/pvrconfig.h @@ -0,0 +1,24 @@ +#ifndef _PVRCONFIG_H +#define _PVRCONFIG_H @@ -190807,7 +190807,7 @@ + +#endif --- /dev/null -+++ kernel-2.6.28/drivers/gpu/pvr/pvrmmap.h ++++ kernel-maemo-2.6.28/drivers/gpu/pvr/pvrmmap.h @@ -0,0 +1,36 @@ +/********************************************************************** + * @@ -190846,7 +190846,7 @@ + +#endif --- /dev/null -+++ kernel-2.6.28/drivers/gpu/pvr/pvrmodule.h ++++ kernel-maemo-2.6.28/drivers/gpu/pvr/pvrmodule.h @@ -0,0 +1,31 @@ +/********************************************************************** + * @@ -190880,7 +190880,7 @@ +MODULE_LICENSE("GPL"); +#endif --- /dev/null -+++ kernel-2.6.28/drivers/gpu/pvr/pvrsrv.c ++++ kernel-maemo-2.6.28/drivers/gpu/pvr/pvrsrv.c @@ -0,0 +1,916 @@ +/********************************************************************** + * @@ -191799,7 +191799,7 @@ + return (PVRSRV_OK); +} --- /dev/null -+++ kernel-2.6.28/drivers/gpu/pvr/pvrversion.h ++++ kernel-maemo-2.6.28/drivers/gpu/pvr/pvrversion.h @@ -0,0 +1,37 @@ +/********************************************************************** + * @@ -191839,7 +191839,7 @@ + +#endif --- /dev/null -+++ kernel-2.6.28/drivers/gpu/pvr/queue.c ++++ kernel-maemo-2.6.28/drivers/gpu/pvr/queue.c @@ -0,0 +1,900 @@ +/********************************************************************** + * @@ -192742,7 +192742,7 @@ + return PVRSRV_OK; +} --- /dev/null -+++ kernel-2.6.28/drivers/gpu/pvr/queue.h ++++ kernel-maemo-2.6.28/drivers/gpu/pvr/queue.h @@ -0,0 +1,117 @@ +/********************************************************************** + * @@ -192862,7 +192862,7 @@ + +#endif --- /dev/null -+++ kernel-2.6.28/drivers/gpu/pvr/ra.c ++++ kernel-maemo-2.6.28/drivers/gpu/pvr/ra.c @@ -0,0 +1,1091 @@ +/********************************************************************** + * @@ -193956,7 +193956,7 @@ +} +#endif --- /dev/null -+++ kernel-2.6.28/drivers/gpu/pvr/ra.h ++++ kernel-maemo-2.6.28/drivers/gpu/pvr/ra.h @@ -0,0 +1,130 @@ +/********************************************************************** + * @@ -194089,7 +194089,7 @@ + +#endif --- /dev/null -+++ kernel-2.6.28/drivers/gpu/pvr/regpaths.h ++++ kernel-maemo-2.6.28/drivers/gpu/pvr/regpaths.h @@ -0,0 +1,41 @@ +/********************************************************************** + * @@ -194133,7 +194133,7 @@ + +#endif --- /dev/null -+++ kernel-2.6.28/drivers/gpu/pvr/resman.c ++++ kernel-maemo-2.6.28/drivers/gpu/pvr/resman.c @@ -0,0 +1,593 @@ +/********************************************************************** + * @@ -194729,7 +194729,7 @@ +} +#endif --- /dev/null -+++ kernel-2.6.28/drivers/gpu/pvr/resman.h ++++ kernel-maemo-2.6.28/drivers/gpu/pvr/resman.h @@ -0,0 +1,97 @@ +/********************************************************************** + * @@ -194829,7 +194829,7 @@ + +#endif --- /dev/null -+++ kernel-2.6.28/drivers/gpu/pvr/services.h ++++ kernel-maemo-2.6.28/drivers/gpu/pvr/services.h @@ -0,0 +1,968 @@ +/********************************************************************** + * @@ -195800,7 +195800,7 @@ + +#endif --- /dev/null -+++ kernel-2.6.28/drivers/gpu/pvr/services_headers.h ++++ kernel-maemo-2.6.28/drivers/gpu/pvr/services_headers.h @@ -0,0 +1,44 @@ +/********************************************************************** + * @@ -195847,7 +195847,7 @@ + +#endif --- /dev/null -+++ kernel-2.6.28/drivers/gpu/pvr/servicesext.h ++++ kernel-maemo-2.6.28/drivers/gpu/pvr/servicesext.h @@ -0,0 +1,396 @@ +/********************************************************************** + * @@ -196246,7 +196246,7 @@ + +#endif --- /dev/null -+++ kernel-2.6.28/drivers/gpu/pvr/servicesint.h ++++ kernel-maemo-2.6.28/drivers/gpu/pvr/servicesint.h @@ -0,0 +1,198 @@ +/********************************************************************** + * @@ -196447,7 +196447,7 @@ + +#endif --- /dev/null -+++ kernel-2.6.28/drivers/gpu/pvr/sgx530defs.h ++++ kernel-maemo-2.6.28/drivers/gpu/pvr/sgx530defs.h @@ -0,0 +1,427 @@ +/********************************************************************** + * @@ -196877,7 +196877,7 @@ + +#endif --- /dev/null -+++ kernel-2.6.28/drivers/gpu/pvr/sgx_bridge.h ++++ kernel-maemo-2.6.28/drivers/gpu/pvr/sgx_bridge.h @@ -0,0 +1,323 @@ +/********************************************************************** + * @@ -197203,7 +197203,7 @@ + +#endif --- /dev/null -+++ kernel-2.6.28/drivers/gpu/pvr/sgx_bridge_km.h ++++ kernel-maemo-2.6.28/drivers/gpu/pvr/sgx_bridge_km.h @@ -0,0 +1,139 @@ +/********************************************************************** + * @@ -197345,7 +197345,7 @@ + +#endif --- /dev/null -+++ kernel-2.6.28/drivers/gpu/pvr/sgxapi_km.h ++++ kernel-maemo-2.6.28/drivers/gpu/pvr/sgxapi_km.h @@ -0,0 +1,175 @@ +/********************************************************************** + * @@ -197523,7 +197523,7 @@ + +#endif --- /dev/null -+++ kernel-2.6.28/drivers/gpu/pvr/sgxconfig.h ++++ kernel-maemo-2.6.28/drivers/gpu/pvr/sgxconfig.h @@ -0,0 +1,85 @@ +/********************************************************************** + * @@ -197611,7 +197611,7 @@ + +#endif --- /dev/null -+++ kernel-2.6.28/drivers/gpu/pvr/sgxcoretypes.h ++++ kernel-maemo-2.6.28/drivers/gpu/pvr/sgxcoretypes.h @@ -0,0 +1,41 @@ +/********************************************************************** + * @@ -197655,7 +197655,7 @@ + +#endif --- /dev/null -+++ kernel-2.6.28/drivers/gpu/pvr/sgxdefs.h ++++ kernel-maemo-2.6.28/drivers/gpu/pvr/sgxdefs.h @@ -0,0 +1,34 @@ +/********************************************************************** + * @@ -197692,7 +197692,7 @@ + +#endif --- /dev/null -+++ kernel-2.6.28/drivers/gpu/pvr/sgxerrata.h ++++ kernel-maemo-2.6.28/drivers/gpu/pvr/sgxerrata.h @@ -0,0 +1,51 @@ +/********************************************************************** + * @@ -197746,7 +197746,7 @@ + +#endif --- /dev/null -+++ kernel-2.6.28/drivers/gpu/pvr/sgxfeaturedefs.h ++++ kernel-maemo-2.6.28/drivers/gpu/pvr/sgxfeaturedefs.h @@ -0,0 +1,38 @@ +/********************************************************************** + * @@ -197787,7 +197787,7 @@ + +#include "sgxcoretypes.h" --- /dev/null -+++ kernel-2.6.28/drivers/gpu/pvr/sgxinfo.h ++++ kernel-maemo-2.6.28/drivers/gpu/pvr/sgxinfo.h @@ -0,0 +1,309 @@ +/********************************************************************** + * @@ -198099,7 +198099,7 @@ + +#endif --- /dev/null -+++ kernel-2.6.28/drivers/gpu/pvr/sgxinfokm.h ++++ kernel-maemo-2.6.28/drivers/gpu/pvr/sgxinfokm.h @@ -0,0 +1,206 @@ +/********************************************************************** + * @@ -198308,7 +198308,7 @@ + +#endif --- /dev/null -+++ kernel-2.6.28/drivers/gpu/pvr/sgxinit.c ++++ kernel-maemo-2.6.28/drivers/gpu/pvr/sgxinit.c @@ -0,0 +1,1621 @@ +/********************************************************************** + * @@ -199932,7 +199932,7 @@ + return eError; +} --- /dev/null -+++ kernel-2.6.28/drivers/gpu/pvr/sgxkick.c ++++ kernel-maemo-2.6.28/drivers/gpu/pvr/sgxkick.c @@ -0,0 +1,324 @@ +/********************************************************************** + * @@ -200259,7 +200259,7 @@ + return eError; +} --- /dev/null -+++ kernel-2.6.28/drivers/gpu/pvr/sgxmmu.h ++++ kernel-maemo-2.6.28/drivers/gpu/pvr/sgxmmu.h @@ -0,0 +1,56 @@ +/********************************************************************** + * @@ -200318,7 +200318,7 @@ + +#endif --- /dev/null -+++ kernel-2.6.28/drivers/gpu/pvr/sgxreset.c ++++ kernel-maemo-2.6.28/drivers/gpu/pvr/sgxreset.c @@ -0,0 +1,251 @@ +/********************************************************************** + * @@ -200572,7 +200572,7 @@ + PDUMPCOMMENTWITHFLAGS(ui32PDUMPFlags, "End of SGX reset sequence\r\n"); +} --- /dev/null -+++ kernel-2.6.28/drivers/gpu/pvr/sgxscript.h ++++ kernel-maemo-2.6.28/drivers/gpu/pvr/sgxscript.h @@ -0,0 +1,64 @@ +/********************************************************************** + * @@ -200639,7 +200639,7 @@ + +#endif --- /dev/null -+++ kernel-2.6.28/drivers/gpu/pvr/sgxtransfer.c ++++ kernel-maemo-2.6.28/drivers/gpu/pvr/sgxtransfer.c @@ -0,0 +1,281 @@ +/********************************************************************** + * @@ -200923,7 +200923,7 @@ +} + --- /dev/null -+++ kernel-2.6.28/drivers/gpu/pvr/sgxutils.c ++++ kernel-maemo-2.6.28/drivers/gpu/pvr/sgxutils.c @@ -0,0 +1,792 @@ +/********************************************************************** + * @@ -201718,7 +201718,7 @@ + PVRSRV_USSE_EDM_RESMAN_CLEANUP_RT_REQUEST); +} --- /dev/null -+++ kernel-2.6.28/drivers/gpu/pvr/sgxutils.h ++++ kernel-maemo-2.6.28/drivers/gpu/pvr/sgxutils.h @@ -0,0 +1,117 @@ +/********************************************************************** + * @@ -201838,7 +201838,7 @@ + hHWTransferContext); + --- /dev/null -+++ kernel-2.6.28/drivers/gpu/pvr/srvkm.h ++++ kernel-maemo-2.6.28/drivers/gpu/pvr/srvkm.h @@ -0,0 +1,46 @@ +/********************************************************************** + * @@ -201887,7 +201887,7 @@ + +#endif --- /dev/null -+++ kernel-2.6.28/drivers/gpu/pvr/syscommon.h ++++ kernel-maemo-2.6.28/drivers/gpu/pvr/syscommon.h @@ -0,0 +1,158 @@ +/********************************************************************** + * @@ -202048,7 +202048,7 @@ + +#endif --- /dev/null -+++ kernel-2.6.28/drivers/gpu/pvr/sysconfig.c ++++ kernel-maemo-2.6.28/drivers/gpu/pvr/sysconfig.c @@ -0,0 +1,687 @@ +/********************************************************************** + * @@ -202738,7 +202738,7 @@ + return PVRSRV_ERROR_INVALID_PARAMS; +} --- /dev/null -+++ kernel-2.6.28/drivers/gpu/pvr/sysconfig.h ++++ kernel-maemo-2.6.28/drivers/gpu/pvr/sysconfig.h @@ -0,0 +1,53 @@ +/********************************************************************** + * @@ -202794,7 +202794,7 @@ + +#endif --- /dev/null -+++ kernel-2.6.28/drivers/gpu/pvr/sysinfo.h ++++ kernel-maemo-2.6.28/drivers/gpu/pvr/sysinfo.h @@ -0,0 +1,95 @@ +/********************************************************************** + * @@ -202892,7 +202892,7 @@ + +#endif --- /dev/null -+++ kernel-2.6.28/drivers/gpu/pvr/syslocal.h ++++ kernel-maemo-2.6.28/drivers/gpu/pvr/syslocal.h @@ -0,0 +1,84 @@ +/********************************************************************** + * @@ -202979,7 +202979,7 @@ + +#endif --- /dev/null -+++ kernel-2.6.28/drivers/gpu/pvr/sysutils_linux.c ++++ kernel-maemo-2.6.28/drivers/gpu/pvr/sysutils_linux.c @@ -0,0 +1,653 @@ +/********************************************************************** + * @@ -203635,7 +203635,7 @@ + DisableDebugClocks(psSysData); +} --- /dev/null -+++ kernel-2.6.28/drivers/gpu/pvr/tools/Makefile ++++ kernel-maemo-2.6.28/drivers/gpu/pvr/tools/Makefile @@ -0,0 +1,29 @@ +# +# Copyright(c) 2008 Imagination Technologies Ltd. All rights reserved. @@ -203667,7 +203667,7 @@ + hotkey.c + --- /dev/null -+++ kernel-2.6.28/drivers/gpu/pvr/tools/dbgdriv.c ++++ kernel-maemo-2.6.28/drivers/gpu/pvr/tools/dbgdriv.c @@ -0,0 +1,1701 @@ +/********************************************************************** + * @@ -205371,7 +205371,7 @@ + return psLFBuffer; +} --- /dev/null -+++ kernel-2.6.28/drivers/gpu/pvr/tools/dbgdriv.h ++++ kernel-maemo-2.6.28/drivers/gpu/pvr/tools/dbgdriv.h @@ -0,0 +1,186 @@ +/********************************************************************** + * @@ -205560,7 +205560,7 @@ + +#endif --- /dev/null -+++ kernel-2.6.28/drivers/gpu/pvr/tools/hostfunc.c ++++ kernel-maemo-2.6.28/drivers/gpu/pvr/tools/hostfunc.c @@ -0,0 +1,192 @@ +/********************************************************************** + * @@ -205755,7 +205755,7 @@ + +} --- /dev/null -+++ kernel-2.6.28/drivers/gpu/pvr/tools/hostfunc.h ++++ kernel-maemo-2.6.28/drivers/gpu/pvr/tools/hostfunc.h @@ -0,0 +1,53 @@ +/********************************************************************** + * @@ -205811,7 +205811,7 @@ + +#endif --- /dev/null -+++ kernel-2.6.28/drivers/gpu/pvr/tools/hotkey.c ++++ kernel-maemo-2.6.28/drivers/gpu/pvr/tools/hotkey.c @@ -0,0 +1,101 @@ +/********************************************************************** + * @@ -205915,7 +205915,7 @@ + } +} --- /dev/null -+++ kernel-2.6.28/drivers/gpu/pvr/tools/hotkey.h ++++ kernel-maemo-2.6.28/drivers/gpu/pvr/tools/hotkey.h @@ -0,0 +1,56 @@ +/********************************************************************** + * @@ -205974,7 +205974,7 @@ + +#endif --- /dev/null -+++ kernel-2.6.28/drivers/gpu/pvr/tools/ioctl.c ++++ kernel-maemo-2.6.28/drivers/gpu/pvr/tools/ioctl.c @@ -0,0 +1,404 @@ +/********************************************************************** + * @@ -206381,7 +206381,7 @@ + return (IMG_TRUE); +} --- /dev/null -+++ kernel-2.6.28/drivers/gpu/pvr/tools/ioctl.h ++++ kernel-maemo-2.6.28/drivers/gpu/pvr/tools/ioctl.h @@ -0,0 +1,81 @@ +/********************************************************************** + * @@ -206465,7 +206465,7 @@ + +#endif --- /dev/null -+++ kernel-2.6.28/drivers/gpu/pvr/tools/linuxsrv.h ++++ kernel-maemo-2.6.28/drivers/gpu/pvr/tools/linuxsrv.h @@ -0,0 +1,47 @@ +/********************************************************************** + * @@ -206515,7 +206515,7 @@ + +#endif --- /dev/null -+++ kernel-2.6.28/drivers/gpu/pvr/tools/main.c ++++ kernel-maemo-2.6.28/drivers/gpu/pvr/tools/main.c @@ -0,0 +1,184 @@ +/********************************************************************** + * @@ -206701,8 +206701,8 @@ +} + +EXPORT_SYMBOL(DBGDrvGetServiceTable); ---- kernel-2.6.28.orig/drivers/hwmon/Kconfig -+++ kernel-2.6.28/drivers/hwmon/Kconfig +--- kernel-maemo-2.6.28.orig/drivers/hwmon/Kconfig ++++ kernel-maemo-2.6.28/drivers/hwmon/Kconfig @@ -879,6 +879,22 @@ Say Y here if you have an applicable laptop and want to experience the awesome power of applesmc. @@ -206726,8 +206726,8 @@ config HWMON_DEBUG_CHIP bool "Hardware Monitoring Chip debugging messages" default n ---- kernel-2.6.28.orig/drivers/hwmon/Makefile -+++ kernel-2.6.28/drivers/hwmon/Makefile +--- kernel-maemo-2.6.28.orig/drivers/hwmon/Makefile ++++ kernel-maemo-2.6.28/drivers/hwmon/Makefile @@ -77,7 +77,9 @@ obj-$(CONFIG_SENSORS_VT8231) += vt8231.o obj-$(CONFIG_SENSORS_W83627EHF) += w83627ehf.o @@ -206739,7 +206739,7 @@ ifeq ($(CONFIG_HWMON_DEBUG_CHIP),y) EXTRA_CFLAGS += -DDEBUG --- /dev/null -+++ kernel-2.6.28/drivers/hwmon/omap34xx_temp.c ++++ kernel-maemo-2.6.28/drivers/hwmon/omap34xx_temp.c @@ -0,0 +1,268 @@ +/* + * omap34xx_temp.c - Linux kernel module for OMAP34xx hardware monitoring @@ -207010,7 +207010,7 @@ +module_exit(omap34xx_temp_exit) + --- /dev/null -+++ kernel-2.6.28/drivers/hwmon/tsc210x_sensors.c ++++ kernel-maemo-2.6.28/drivers/hwmon/tsc210x_sensors.c @@ -0,0 +1,296 @@ +/* + * tsc210x_sensors.c - hwmon interface to TI TSC210x sensors @@ -207308,8 +207308,8 @@ +MODULE_AUTHOR("Andrzej Zaborowski"); +MODULE_DESCRIPTION("hwmon driver for TI TSC210x-connected sensors."); +MODULE_LICENSE("GPL"); ---- kernel-2.6.28.orig/drivers/i2c/Kconfig -+++ kernel-2.6.28/drivers/i2c/Kconfig +--- kernel-maemo-2.6.28.orig/drivers/i2c/Kconfig ++++ kernel-maemo-2.6.28/drivers/i2c/Kconfig @@ -5,6 +5,7 @@ menuconfig I2C tristate "I2C support" @@ -207318,8 +207318,8 @@ ---help--- I2C (pronounce: I-square-C) is a slow serial bus protocol used in many micro controller applications and developed by Philips. SMBus, ---- kernel-2.6.28.orig/drivers/i2c/busses/Kconfig -+++ kernel-2.6.28/drivers/i2c/busses/Kconfig +--- kernel-maemo-2.6.28.orig/drivers/i2c/busses/Kconfig ++++ kernel-maemo-2.6.28/drivers/i2c/busses/Kconfig @@ -418,10 +418,26 @@ default y if MACH_OMAP_H3 || MACH_OMAP_OSK help @@ -207349,8 +207349,8 @@ config I2C_PASEMI tristate "PA Semi SMBus interface" depends on PPC_PASEMI && PCI ---- kernel-2.6.28.orig/drivers/i2c/busses/i2c-omap.c -+++ kernel-2.6.28/drivers/i2c/busses/i2c-omap.c +--- kernel-maemo-2.6.28.orig/drivers/i2c/busses/i2c-omap.c ++++ kernel-maemo-2.6.28/drivers/i2c/busses/i2c-omap.c @@ -2,13 +2,16 @@ * TI OMAP I2C master mode driver * @@ -208120,8 +208120,8 @@ return 0; err_free_irq: ---- kernel-2.6.28.orig/drivers/i2c/chips/Kconfig -+++ kernel-2.6.28/drivers/i2c/chips/Kconfig +--- kernel-maemo-2.6.28.orig/drivers/i2c/chips/Kconfig ++++ kernel-maemo-2.6.28/drivers/i2c/chips/Kconfig @@ -53,6 +53,13 @@ This driver can also be built as a module. If so, the module will be called eeprom. @@ -208221,8 +208221,8 @@ config MENELAUS bool "TWL92330/Menelaus PM chip" depends on I2C=y && ARCH_OMAP24XX ---- kernel-2.6.28.orig/drivers/i2c/chips/Makefile -+++ kernel-2.6.28/drivers/i2c/chips/Makefile +--- kernel-maemo-2.6.28.orig/drivers/i2c/chips/Makefile ++++ kernel-maemo-2.6.28/drivers/i2c/chips/Makefile @@ -13,18 +13,24 @@ obj-$(CONFIG_DS1682) += ds1682.o obj-$(CONFIG_AT24) += at24.o @@ -208251,7 +208251,7 @@ endif - --- /dev/null -+++ kernel-2.6.28/drivers/i2c/chips/lis302dl.c ++++ kernel-maemo-2.6.28/drivers/i2c/chips/lis302dl.c @@ -0,0 +1,863 @@ +/* + * drivers/i2c/chips/lis302dl.c @@ -209117,7 +209117,7 @@ +module_init(lis302dl_init); +module_exit(lis302dl_exit); --- /dev/null -+++ kernel-2.6.28/drivers/i2c/chips/lp5521.c ++++ kernel-maemo-2.6.28/drivers/i2c/chips/lp5521.c @@ -0,0 +1,585 @@ +/* + * drivers/i2c/chips/lp5521.c @@ -209704,8 +209704,8 @@ + +module_init(lp5521_init); +module_exit(lp5521_exit); ---- kernel-2.6.28.orig/drivers/i2c/chips/menelaus.c -+++ kernel-2.6.28/drivers/i2c/chips/menelaus.c +--- kernel-maemo-2.6.28.orig/drivers/i2c/chips/menelaus.c ++++ kernel-maemo-2.6.28/drivers/i2c/chips/menelaus.c @@ -1,3 +1,4 @@ + /* @@ -210029,7 +210029,7 @@ static void __exit menelaus_exit(void) --- /dev/null -+++ kernel-2.6.28/drivers/i2c/chips/tpa6130a2.c ++++ kernel-maemo-2.6.28/drivers/i2c/chips/tpa6130a2.c @@ -0,0 +1,497 @@ +/* + * drivers/i2c/chips/tpa6130a2.c @@ -210529,7 +210529,7 @@ +late_initcall(tpa6130a2_init); +module_exit(tpa6130a2_exit); --- /dev/null -+++ kernel-2.6.28/drivers/i2c/chips/tsl2563.c ++++ kernel-maemo-2.6.28/drivers/i2c/chips/tsl2563.c @@ -0,0 +1,772 @@ +/* + * drivers/i2c/chips/tsl2563.c @@ -211304,7 +211304,7 @@ +module_init(tsl2563_init); +module_exit(tsl2563_exit); --- /dev/null -+++ kernel-2.6.28/drivers/i2c/chips/twl4030-madc.c ++++ kernel-maemo-2.6.28/drivers/i2c/chips/twl4030-madc.c @@ -0,0 +1,540 @@ +/* + * drivers/i2c/chips/twl4030-madc.c @@ -211847,7 +211847,7 @@ +MODULE_LICENSE("GPL"); + --- /dev/null -+++ kernel-2.6.28/drivers/i2c/chips/twl4030-poweroff.c ++++ kernel-maemo-2.6.28/drivers/i2c/chips/twl4030-poweroff.c @@ -0,0 +1,97 @@ +/* + * linux/drivers/i2c/chips/twl4030_poweroff.c @@ -211947,7 +211947,7 @@ +MODULE_LICENSE("GPL"); +MODULE_AUTHOR("Peter De Schrijver"); --- /dev/null -+++ kernel-2.6.28/drivers/i2c/chips/twl4030-pwrbutton.c ++++ kernel-maemo-2.6.28/drivers/i2c/chips/twl4030-pwrbutton.c @@ -0,0 +1,126 @@ +/** + * drivers/i2c/chips/twl4030-pwrbutton.c @@ -212075,8 +212075,8 @@ +MODULE_LICENSE("GPL"); +MODULE_AUTHOR("Peter De Schrijver"); + ---- kernel-2.6.28.orig/drivers/input/Kconfig -+++ kernel-2.6.28/drivers/input/Kconfig +--- kernel-maemo-2.6.28.orig/drivers/input/Kconfig ++++ kernel-maemo-2.6.28/drivers/input/Kconfig @@ -170,6 +170,8 @@ source "drivers/input/touchscreen/Kconfig" @@ -212086,16 +212086,16 @@ source "drivers/input/misc/Kconfig" endif ---- kernel-2.6.28.orig/drivers/input/Makefile -+++ kernel-2.6.28/drivers/input/Makefile +--- kernel-maemo-2.6.28.orig/drivers/input/Makefile ++++ kernel-maemo-2.6.28/drivers/input/Makefile @@ -25,3 +25,5 @@ obj-$(CONFIG_INPUT_APMPOWER) += apm-power.o obj-$(CONFIG_XEN_KBDDEV_FRONTEND) += xen-kbdfront.o + +obj-$(CONFIG_INPUT_LIRC) += lirc/ ---- kernel-2.6.28.orig/drivers/input/keyboard/Kconfig -+++ kernel-2.6.28/drivers/input/keyboard/Kconfig +--- kernel-maemo-2.6.28.orig/drivers/input/keyboard/Kconfig ++++ kernel-maemo-2.6.28/drivers/input/keyboard/Kconfig @@ -259,6 +259,39 @@ To compile this driver as a module, choose M here: the module will be called omap-keypad. @@ -212136,8 +212136,8 @@ config KEYBOARD_PXA27x tristate "PXA27x/PXA3xx keypad support" depends on PXA27x || PXA3xx ---- kernel-2.6.28.orig/drivers/input/keyboard/Makefile -+++ kernel-2.6.28/drivers/input/keyboard/Makefile +--- kernel-maemo-2.6.28.orig/drivers/input/keyboard/Makefile ++++ kernel-maemo-2.6.28/drivers/input/keyboard/Makefile @@ -19,6 +19,10 @@ obj-$(CONFIG_KEYBOARD_HIL) += hil_kbd.o obj-$(CONFIG_KEYBOARD_HIL_OLD) += hilkbd.o @@ -212149,8 +212149,8 @@ obj-$(CONFIG_KEYBOARD_PXA27x) += pxa27x_keypad.o obj-$(CONFIG_KEYBOARD_AAED2000) += aaed2000_kbd.o obj-$(CONFIG_KEYBOARD_GPIO) += gpio_keys.o ---- kernel-2.6.28.orig/drivers/input/keyboard/gpio_keys.c -+++ kernel-2.6.28/drivers/input/keyboard/gpio_keys.c +--- kernel-maemo-2.6.28.orig/drivers/input/keyboard/gpio_keys.c ++++ kernel-maemo-2.6.28/drivers/input/keyboard/gpio_keys.c @@ -98,6 +98,10 @@ input->id.product = 0x0001; input->id.version = 0x0100; @@ -212163,7 +212163,7 @@ for (i = 0; i < pdata->nbuttons; i++) { --- /dev/null -+++ kernel-2.6.28/drivers/input/keyboard/innovator_ps2.c ++++ kernel-maemo-2.6.28/drivers/input/keyboard/innovator_ps2.c @@ -0,0 +1,1279 @@ +/* + * drivers/char/innovator_ps2.c @@ -213445,7 +213445,7 @@ +MODULE_DESCRIPTION("Innovator PS/2 Driver"); +MODULE_LICENSE("GPL"); --- /dev/null -+++ kernel-2.6.28/drivers/input/keyboard/lm8323.c ++++ kernel-maemo-2.6.28/drivers/input/keyboard/lm8323.c @@ -0,0 +1,934 @@ +/* + * drivers/i2c/chips/lm8323.c @@ -214381,8 +214381,8 @@ + +module_init(lm8323_init); +module_exit(lm8323_exit); ---- kernel-2.6.28.orig/drivers/input/keyboard/omap-keypad.c -+++ kernel-2.6.28/drivers/input/keyboard/omap-keypad.c +--- kernel-maemo-2.6.28.orig/drivers/input/keyboard/omap-keypad.c ++++ kernel-maemo-2.6.28/drivers/input/keyboard/omap-keypad.c @@ -33,13 +33,15 @@ #include #include @@ -214526,7 +214526,7 @@ } else { omap_writew(1, OMAP_MPUIO_BASE + OMAP_MPUIO_KBD_MASKIT); --- /dev/null -+++ kernel-2.6.28/drivers/input/keyboard/omap-twl4030keypad.c ++++ kernel-maemo-2.6.28/drivers/input/keyboard/omap-twl4030keypad.c @@ -0,0 +1,547 @@ +/* + * drivers/input/keyboard/omap-twl4030keypad.c @@ -215076,7 +215076,7 @@ +MODULE_DESCRIPTION("OMAP TWL4030 Keypad Driver"); +MODULE_LICENSE("GPL"); --- /dev/null -+++ kernel-2.6.28/drivers/input/keyboard/tsc2301_kp.c ++++ kernel-maemo-2.6.28/drivers/input/keyboard/tsc2301_kp.c @@ -0,0 +1,475 @@ +/* + * TSC2301 keypad driver @@ -215554,7 +215554,7 @@ + kfree(kp); +} --- /dev/null -+++ kernel-2.6.28/drivers/input/keyboard/twl4030-keypad.h ++++ kernel-maemo-2.6.28/drivers/input/keyboard/twl4030-keypad.h @@ -0,0 +1,82 @@ +/* + * drivers/input/keyboard/twl4030-keypad.h @@ -215639,7 +215639,7 @@ + +#endif /* End of __TWL4030-KEYPAD_H__ */ --- /dev/null -+++ kernel-2.6.28/drivers/input/lirc/Kconfig ++++ kernel-maemo-2.6.28/drivers/input/lirc/Kconfig @@ -0,0 +1,26 @@ +# +# LIRC driver(s) configuration @@ -215668,7 +215668,7 @@ + +endif --- /dev/null -+++ kernel-2.6.28/drivers/input/lirc/Makefile ++++ kernel-maemo-2.6.28/drivers/input/lirc/Makefile @@ -0,0 +1,7 @@ +# Makefile for the lirc drivers. +# @@ -215678,7 +215678,7 @@ +obj-$(CONFIG_LIRC_DEV) += lirc_dev.o +obj-$(CONFIG_LIRC_RX51) += lirc_rx51.o --- /dev/null -+++ kernel-2.6.28/drivers/input/lirc/lirc.h ++++ kernel-maemo-2.6.28/drivers/input/lirc/lirc.h @@ -0,0 +1,100 @@ +/* + * lirc.h - linux infrared remote control header file @@ -215781,7 +215781,7 @@ + +#endif --- /dev/null -+++ kernel-2.6.28/drivers/input/lirc/lirc_dev.c ++++ kernel-maemo-2.6.28/drivers/input/lirc/lirc_dev.c @@ -0,0 +1,759 @@ +/* + * LIRC base driver @@ -216543,7 +216543,7 @@ +module_param(debug, bool, 0644); +MODULE_PARM_DESC(debug, "Enable debugging messages"); --- /dev/null -+++ kernel-2.6.28/drivers/input/lirc/lirc_dev.h ++++ kernel-maemo-2.6.28/drivers/input/lirc/lirc_dev.h @@ -0,0 +1,178 @@ +/* + * LIRC base driver @@ -216724,7 +216724,7 @@ + +#endif --- /dev/null -+++ kernel-2.6.28/drivers/input/lirc/lirc_rx51.c ++++ kernel-maemo-2.6.28/drivers/input/lirc/lirc_rx51.c @@ -0,0 +1,484 @@ +/* + * Copyright (C) 2008 Nokia Corporation @@ -217211,7 +217211,7 @@ +MODULE_AUTHOR("Nokia Corporation"); +MODULE_LICENSE("GPL"); --- /dev/null -+++ kernel-2.6.28/drivers/input/lirc/lirc_rx51.h ++++ kernel-maemo-2.6.28/drivers/input/lirc/lirc_rx51.h @@ -0,0 +1,10 @@ +#ifndef _LIRC_RX51_H +#define _LIRC_RX51_H @@ -217223,8 +217223,8 @@ +}; + +#endif ---- kernel-2.6.28.orig/drivers/input/touchscreen/Kconfig -+++ kernel-2.6.28/drivers/input/touchscreen/Kconfig +--- kernel-maemo-2.6.28.orig/drivers/input/touchscreen/Kconfig ++++ kernel-maemo-2.6.28/drivers/input/touchscreen/Kconfig @@ -221,6 +221,32 @@ To compile this driver as a module, choose M here: the module will be called atmel_tsadcc. @@ -217258,8 +217258,8 @@ config TOUCHSCREEN_UCB1400 tristate "Philips UCB1400 touchscreen" depends on AC97_BUS ---- kernel-2.6.28.orig/drivers/input/touchscreen/Makefile -+++ kernel-2.6.28/drivers/input/touchscreen/Makefile +--- kernel-maemo-2.6.28.orig/drivers/input/touchscreen/Makefile ++++ kernel-maemo-2.6.28/drivers/input/touchscreen/Makefile @@ -26,6 +26,9 @@ obj-$(CONFIG_TOUCHSCREEN_TOUCHRIGHT) += touchright.o obj-$(CONFIG_TOUCHSCREEN_TOUCHWIN) += touchwin.o @@ -217270,8 +217270,8 @@ obj-$(CONFIG_TOUCHSCREEN_WM97XX) += wm97xx-ts.o wm97xx-ts-$(CONFIG_TOUCHSCREEN_WM9705) += wm9705.o wm97xx-ts-$(CONFIG_TOUCHSCREEN_WM9712) += wm9712.o ---- kernel-2.6.28.orig/drivers/input/touchscreen/ads7846.c -+++ kernel-2.6.28/drivers/input/touchscreen/ads7846.c +--- kernel-maemo-2.6.28.orig/drivers/input/touchscreen/ads7846.c ++++ kernel-maemo-2.6.28/drivers/input/touchscreen/ads7846.c @@ -878,6 +878,15 @@ return -ENODEV; } @@ -217289,7 +217289,7 @@ if (spi->max_speed_hz > (125000 * SAMPLE_BITS)) { dev_dbg(&spi->dev, "f(sample) %d KHz?\n", --- /dev/null -+++ kernel-2.6.28/drivers/input/touchscreen/tsc2005.c ++++ kernel-maemo-2.6.28/drivers/input/touchscreen/tsc2005.c @@ -0,0 +1,958 @@ +/* + * TSC2005 touchscreen driver @@ -218250,7 +218250,7 @@ +MODULE_LICENSE("GPL"); +MODULE_ALIAS("platform:tsc2005"); --- /dev/null -+++ kernel-2.6.28/drivers/input/touchscreen/tsc210x_ts.c ++++ kernel-maemo-2.6.28/drivers/input/touchscreen/tsc210x_ts.c @@ -0,0 +1,160 @@ +/* + * tsc210x_ts.c - touchscreen input device for TI TSC210x chips @@ -218413,7 +218413,7 @@ +MODULE_DESCRIPTION("Touchscreen input driver for TI TSC2101/2102."); +MODULE_LICENSE("GPL"); --- /dev/null -+++ kernel-2.6.28/drivers/input/touchscreen/tsc2301_ts.c ++++ kernel-maemo-2.6.28/drivers/input/touchscreen/tsc2301_ts.c @@ -0,0 +1,676 @@ +/* + * TSC2301 touchscreen driver @@ -219091,8 +219091,8 @@ +} +MODULE_AUTHOR("Jarkko Oikarinen "); +MODULE_LICENSE("GPL"); ---- kernel-2.6.28.orig/drivers/leds/Kconfig -+++ kernel-2.6.28/drivers/leds/Kconfig +--- kernel-maemo-2.6.28.orig/drivers/leds/Kconfig ++++ kernel-maemo-2.6.28/drivers/leds/Kconfig @@ -63,6 +63,27 @@ help This option enables support for the PCEngines WRAP programmable LEDs. @@ -219148,8 +219148,8 @@ comment "LED Triggers" config LEDS_TRIGGERS ---- kernel-2.6.28.orig/drivers/leds/Makefile -+++ kernel-2.6.28/drivers/leds/Makefile +--- kernel-maemo-2.6.28.orig/drivers/leds/Makefile ++++ kernel-maemo-2.6.28/drivers/leds/Makefile @@ -11,6 +11,8 @@ obj-$(CONFIG_LEDS_AMS_DELTA) += leds-ams-delta.o obj-$(CONFIG_LEDS_NET48XX) += leds-net48xx.o @@ -219174,7 +219174,7 @@ # LED Triggers obj-$(CONFIG_LEDS_TRIGGER_TIMER) += ledtrig-timer.o --- /dev/null -+++ kernel-2.6.28/drivers/leds/leds-lp5523.c ++++ kernel-maemo-2.6.28/drivers/leds/leds-lp5523.c @@ -0,0 +1,980 @@ +/* + * lp5523.c - LP5523 LED Driver @@ -220157,7 +220157,7 @@ +module_init(lp5523_init); +module_exit(lp5523_exit); --- /dev/null -+++ kernel-2.6.28/drivers/leds/leds-omap-pwm.c ++++ kernel-maemo-2.6.28/drivers/leds/leds-omap-pwm.c @@ -0,0 +1,376 @@ +/* drivers/leds/leds-omap_pwm.c + * @@ -220536,7 +220536,7 @@ +MODULE_DESCRIPTION("OMAP PWM LED driver"); +MODULE_LICENSE("GPL"); --- /dev/null -+++ kernel-2.6.28/drivers/leds/leds-omap.c ++++ kernel-maemo-2.6.28/drivers/leds/leds-omap.c @@ -0,0 +1,129 @@ +/* drivers/leds/leds-omap.c + * @@ -220668,7 +220668,7 @@ +MODULE_DESCRIPTION("OMAP LED driver"); +MODULE_LICENSE("GPL"); --- /dev/null -+++ kernel-2.6.28/drivers/leds/leds-twl4030-vibra.c ++++ kernel-maemo-2.6.28/drivers/leds/leds-twl4030-vibra.c @@ -0,0 +1,456 @@ +/* + * leds-twl4030-vibra.c - TWL4030 Vibrator driver @@ -221126,8 +221126,8 @@ + +MODULE_ALIAS("platform:twl4030-vibra"); + ---- kernel-2.6.28.orig/drivers/media/radio/Kconfig -+++ kernel-2.6.28/drivers/media/radio/Kconfig +--- kernel-maemo-2.6.28.orig/drivers/media/radio/Kconfig ++++ kernel-maemo-2.6.28/drivers/media/radio/Kconfig @@ -339,6 +339,18 @@ help Enter the I/O port of your Zoltrix radio card. @@ -221164,8 +221164,8 @@ config USB_MR800 tristate "AverMedia MR 800 USB FM radio support" depends on USB && VIDEO_V4L2 ---- kernel-2.6.28.orig/drivers/media/radio/Makefile -+++ kernel-2.6.28/drivers/media/radio/Makefile +--- kernel-maemo-2.6.28.orig/drivers/media/radio/Makefile ++++ kernel-maemo-2.6.28/drivers/media/radio/Makefile @@ -15,8 +15,11 @@ obj-$(CONFIG_RADIO_GEMTEK) += radio-gemtek.o obj-$(CONFIG_RADIO_GEMTEK_PCI) += radio-gemtek-pci.o @@ -221179,7 +221179,7 @@ obj-$(CONFIG_USB_MR800) += radio-mr800.o --- /dev/null -+++ kernel-2.6.28/drivers/media/radio/radio-bcm2048.c ++++ kernel-maemo-2.6.28/drivers/media/radio/radio-bcm2048.c @@ -0,0 +1,2612 @@ +/* + * drivers/media/radio/radio-bcm2048.c @@ -223794,7 +223794,7 @@ +MODULE_DESCRIPTION(BCM2048_DRIVER_DESC); +MODULE_VERSION("0.0.1"); --- /dev/null -+++ kernel-2.6.28/drivers/media/radio/radio-si4713.c ++++ kernel-maemo-2.6.28/drivers/media/radio/radio-si4713.c @@ -0,0 +1,857 @@ +/* + * drivers/media/radio/radio-si4713.c @@ -224654,7 +224654,7 @@ +MODULE_DESCRIPTION(DRIVER_DESC); +MODULE_VERSION("0.0.1"); --- /dev/null -+++ kernel-2.6.28/drivers/media/radio/radio-si4713.h ++++ kernel-maemo-2.6.28/drivers/media/radio/radio-si4713.h @@ -0,0 +1,32 @@ +/* + * drivers/media/radio/radio-si4713.h @@ -224689,7 +224689,7 @@ + +#endif /* ifndef RADIO_SI4713_H*/ --- /dev/null -+++ kernel-2.6.28/drivers/media/radio/si4713.c ++++ kernel-maemo-2.6.28/drivers/media/radio/si4713.c @@ -0,0 +1,2450 @@ +/* + * drivers/media/radio/si4713.c @@ -227142,7 +227142,7 @@ + return rval; +} --- /dev/null -+++ kernel-2.6.28/drivers/media/radio/si4713.h ++++ kernel-maemo-2.6.28/drivers/media/radio/si4713.h @@ -0,0 +1,319 @@ +/* + * drivers/media/radio/si4713.h @@ -227463,8 +227463,8 @@ +int si4713_set_tone_off_time(struct si4713_device *sdev, u16 off_time); +int si4713_get_tone_off_time(struct si4713_device *sdev); +#endif /* ifndef SI4713_H */ ---- kernel-2.6.28.orig/drivers/media/video/Kconfig -+++ kernel-2.6.28/drivers/media/video/Kconfig +--- kernel-maemo-2.6.28.orig/drivers/media/video/Kconfig ++++ kernel-maemo-2.6.28/drivers/media/video/Kconfig @@ -305,6 +305,28 @@ This is a driver for the Toshiba TCM825x VGA camera sensor. It is used for example in Nokia N800. @@ -227536,8 +227536,8 @@ config SOC_CAMERA tristate "SoC camera support" depends on VIDEO_V4L2 && HAS_DMA ---- kernel-2.6.28.orig/drivers/media/video/Makefile -+++ kernel-2.6.28/drivers/media/video/Makefile +--- kernel-maemo-2.6.28.orig/drivers/media/video/Makefile ++++ kernel-maemo-2.6.28/drivers/media/video/Makefile @@ -47,6 +47,7 @@ obj-$(CONFIG_VIDEO_ADV7170) += adv7170.o obj-$(CONFIG_VIDEO_ADV7175) += adv7175.o @@ -227564,7 +227564,7 @@ obj-$(CONFIG_USB_DABUSB) += dabusb.o obj-$(CONFIG_USB_OV511) += ov511.o --- /dev/null -+++ kernel-2.6.28/drivers/media/video/ad5820.c ++++ kernel-maemo-2.6.28/drivers/media/video/ad5820.c @@ -0,0 +1,495 @@ +/* + * drivers/media/video/ad5820.c @@ -228062,7 +228062,7 @@ +MODULE_DESCRIPTION("AD5820 camera lens driver"); +MODULE_LICENSE("GPL"); --- /dev/null -+++ kernel-2.6.28/drivers/media/video/adp1653.c ++++ kernel-maemo-2.6.28/drivers/media/video/adp1653.c @@ -0,0 +1,574 @@ +/* + * drivers/media/video/adp1653.c @@ -228639,7 +228639,7 @@ +MODULE_DESCRIPTION("Analog Devices ADP1653 LED flash driver"); +MODULE_LICENSE("GPL"); --- /dev/null -+++ kernel-2.6.28/drivers/media/video/et8ek8-modes.h ++++ kernel-maemo-2.6.28/drivers/media/video/et8ek8-modes.h @@ -0,0 +1,367 @@ +/* Automatically generated code from Scooby + * configuration file by makemodes.pl. */ @@ -229009,7 +229009,7 @@ + +/* imageFormat 1 0=raw8, 1=raw10 */ --- /dev/null -+++ kernel-2.6.28/drivers/media/video/et8ek8.c ++++ kernel-maemo-2.6.28/drivers/media/video/et8ek8.c @@ -0,0 +1,1065 @@ +/* + * drivers/media/video/et8ek8.c @@ -230077,7 +230077,7 @@ +MODULE_DESCRIPTION("Toshiba ET8EK8 camera sensor driver"); +MODULE_LICENSE("GPL"); --- /dev/null -+++ kernel-2.6.28/drivers/media/video/et8ek8.h ++++ kernel-maemo-2.6.28/drivers/media/video/et8ek8.h @@ -0,0 +1,79 @@ +/* + * drivers/media/video/et8ek8.h @@ -230159,7 +230159,7 @@ + +#endif /* ET8EK8_H */ --- /dev/null -+++ kernel-2.6.28/drivers/media/video/isp/Makefile ++++ kernel-maemo-2.6.28/drivers/media/video/isp/Makefile @@ -0,0 +1,14 @@ +# Makefile for OMAP3 ISP driver + @@ -230177,7 +230177,7 @@ +obj-$(CONFIG_VIDEO_OMAP3) += omap_previewer_hack.o \ No newline at end of file --- /dev/null -+++ kernel-2.6.28/drivers/media/video/isp/bluegamma_table.h ++++ kernel-maemo-2.6.28/drivers/media/video/isp/bluegamma_table.h @@ -0,0 +1,1040 @@ +/* + * bluegamma_table.h @@ -231220,7 +231220,7 @@ +255, +255 --- /dev/null -+++ kernel-2.6.28/drivers/media/video/isp/cfa_coef_table.h ++++ kernel-maemo-2.6.28/drivers/media/video/isp/cfa_coef_table.h @@ -0,0 +1,603 @@ +/* + * cfa_coef_table.h @@ -231826,7 +231826,7 @@ +248 + --- /dev/null -+++ kernel-2.6.28/drivers/media/video/isp/greengamma_table.h ++++ kernel-maemo-2.6.28/drivers/media/video/isp/greengamma_table.h @@ -0,0 +1,1040 @@ +/* + * greengamma_table.h @@ -232869,7 +232869,7 @@ +255, +255 --- /dev/null -+++ kernel-2.6.28/drivers/media/video/isp/isp.c ++++ kernel-maemo-2.6.28/drivers/media/video/isp/isp.c @@ -0,0 +1,2542 @@ +/* + * isp.c @@ -235414,7 +235414,7 @@ +MODULE_DESCRIPTION("ISP Control Module Library"); +MODULE_LICENSE("GPL"); --- /dev/null -+++ kernel-2.6.28/drivers/media/video/isp/isp.h ++++ kernel-maemo-2.6.28/drivers/media/video/isp/isp.h @@ -0,0 +1,500 @@ +/* + * isp.h @@ -235917,7 +235917,7 @@ + +#endif /* OMAP_ISP_TOP_H */ --- /dev/null -+++ kernel-2.6.28/drivers/media/video/isp/isp_af.c ++++ kernel-maemo-2.6.28/drivers/media/video/isp/isp_af.c @@ -0,0 +1,477 @@ +/* + * isp_af.c @@ -236397,7 +236397,7 @@ + ispstat_free(&isp->isp_af.stat); +} --- /dev/null -+++ kernel-2.6.28/drivers/media/video/isp/isp_af.h ++++ kernel-maemo-2.6.28/drivers/media/video/isp/isp_af.h @@ -0,0 +1,138 @@ +/* + * isp_af.h @@ -236538,7 +236538,7 @@ + +#endif /* OMAP_ISP_AF_H */ --- /dev/null -+++ kernel-2.6.28/drivers/media/video/isp/ispccdc.c ++++ kernel-maemo-2.6.28/drivers/media/video/isp/ispccdc.c @@ -0,0 +1,1510 @@ +/* + * ispccdc.c @@ -238051,7 +238051,7 @@ + } +} --- /dev/null -+++ kernel-2.6.28/drivers/media/video/isp/ispccdc.h ++++ kernel-maemo-2.6.28/drivers/media/video/isp/ispccdc.h @@ -0,0 +1,210 @@ +/* + * ispccdc.h @@ -238264,7 +238264,7 @@ + +#endif /* OMAP_ISP_CCDC_H */ --- /dev/null -+++ kernel-2.6.28/drivers/media/video/isp/ispcsi2.c ++++ kernel-maemo-2.6.28/drivers/media/video/isp/ispcsi2.c @@ -0,0 +1,2177 @@ +/* + * ispcsi2.c @@ -240444,7 +240444,7 @@ +MODULE_DESCRIPTION("ISP CSI2 Receiver Module"); +MODULE_LICENSE("GPL"); --- /dev/null -+++ kernel-2.6.28/drivers/media/video/isp/ispcsi2.h ++++ kernel-maemo-2.6.28/drivers/media/video/isp/ispcsi2.h @@ -0,0 +1,232 @@ +/* + * ispcsi2.h @@ -240679,7 +240679,7 @@ +#endif /* OMAP_ISP_CSI2_H */ + --- /dev/null -+++ kernel-2.6.28/drivers/media/video/isp/isph3a.c ++++ kernel-maemo-2.6.28/drivers/media/video/isp/isph3a.c @@ -0,0 +1,603 @@ +/* + * isph3a.c @@ -241285,7 +241285,7 @@ +} +EXPORT_SYMBOL(isph3a_restore_context); --- /dev/null -+++ kernel-2.6.28/drivers/media/video/isp/isph3a.h ++++ kernel-maemo-2.6.28/drivers/media/video/isp/isph3a.h @@ -0,0 +1,159 @@ +/* + * isph3a.h @@ -241447,7 +241447,7 @@ + +#endif /* OMAP_ISP_H3A_H */ --- /dev/null -+++ kernel-2.6.28/drivers/media/video/isp/isphist.c ++++ kernel-maemo-2.6.28/drivers/media/video/isp/isphist.c @@ -0,0 +1,774 @@ +/* + * isphist.c @@ -242224,7 +242224,7 @@ +#endif +} --- /dev/null -+++ kernel-2.6.28/drivers/media/video/isp/isphist.h ++++ kernel-maemo-2.6.28/drivers/media/video/isp/isphist.h @@ -0,0 +1,159 @@ +/* + * isphist.h @@ -242386,7 +242386,7 @@ + +#endif /* OMAP_ISP_HIST */ --- /dev/null -+++ kernel-2.6.28/drivers/media/video/isp/isppreview.c ++++ kernel-maemo-2.6.28/drivers/media/video/isp/isppreview.c @@ -0,0 +1,2017 @@ +/* + * isppreview.c @@ -244406,7 +244406,7 @@ + return 0; +} --- /dev/null -+++ kernel-2.6.28/drivers/media/video/isp/isppreview.h ++++ kernel-maemo-2.6.28/drivers/media/video/isp/isppreview.h @@ -0,0 +1,426 @@ +/* + * isppreview.h @@ -244835,7 +244835,7 @@ + +#endif/* OMAP_ISP_PREVIEW_H */ --- /dev/null -+++ kernel-2.6.28/drivers/media/video/isp/ispreg.h ++++ kernel-maemo-2.6.28/drivers/media/video/isp/ispreg.h @@ -0,0 +1,1708 @@ +/* + * ispreg.h @@ -246546,7 +246546,7 @@ + +#endif /* __ISPREG_H__ */ --- /dev/null -+++ kernel-2.6.28/drivers/media/video/isp/ispresizer.c ++++ kernel-maemo-2.6.28/drivers/media/video/isp/ispresizer.c @@ -0,0 +1,914 @@ +/* + * ispresizer.c @@ -247463,7 +247463,7 @@ +{ +} --- /dev/null -+++ kernel-2.6.28/drivers/media/video/isp/ispresizer.h ++++ kernel-maemo-2.6.28/drivers/media/video/isp/ispresizer.h @@ -0,0 +1,189 @@ +/* + * ispresizer.h @@ -247655,7 +247655,7 @@ + +#endif /* OMAP_ISP_RESIZER_H */ --- /dev/null -+++ kernel-2.6.28/drivers/media/video/isp/ispstat.c ++++ kernel-maemo-2.6.28/drivers/media/video/isp/ispstat.c @@ -0,0 +1,350 @@ +/* + * ispstat.c @@ -248008,7 +248008,7 @@ + kfree(stat->buf); +} --- /dev/null -+++ kernel-2.6.28/drivers/media/video/isp/ispstat.h ++++ kernel-maemo-2.6.28/drivers/media/video/isp/ispstat.h @@ -0,0 +1,71 @@ +/* + * ispstat.h @@ -248082,7 +248082,7 @@ + +#endif /* ISPSTAT_H */ --- /dev/null -+++ kernel-2.6.28/drivers/media/video/isp/luma_enhance_table.h ++++ kernel-maemo-2.6.28/drivers/media/video/isp/luma_enhance_table.h @@ -0,0 +1,144 @@ +/* + * luma_enhance_table.h @@ -248229,7 +248229,7 @@ +1024, +1024 --- /dev/null -+++ kernel-2.6.28/drivers/media/video/isp/noise_filter_table.h ++++ kernel-maemo-2.6.28/drivers/media/video/isp/noise_filter_table.h @@ -0,0 +1,79 @@ +/* + * noise_filter_table.h @@ -248311,7 +248311,7 @@ +31, +31 --- /dev/null -+++ kernel-2.6.28/drivers/media/video/isp/omap_previewer_hack.c ++++ kernel-maemo-2.6.28/drivers/media/video/isp/omap_previewer_hack.c @@ -0,0 +1,1247 @@ +/* + * drivers/media/video/isp/omap_previewer.c @@ -249561,7 +249561,7 @@ +MODULE_LICENSE("GPL"); + --- /dev/null -+++ kernel-2.6.28/drivers/media/video/isp/redgamma_table.h ++++ kernel-maemo-2.6.28/drivers/media/video/isp/redgamma_table.h @@ -0,0 +1,1040 @@ +/* + * redgamma_table.h @@ -250604,7 +250604,7 @@ +255, +255 --- /dev/null -+++ kernel-2.6.28/drivers/media/video/omap34xxcam-daemon-req.c ++++ kernel-maemo-2.6.28/drivers/media/video/omap34xxcam-daemon-req.c @@ -0,0 +1,126 @@ +/* + * drivers/media/video/omap/omap34xcam-daemon-req.c @@ -250733,7 +250733,7 @@ + return rval; +} --- /dev/null -+++ kernel-2.6.28/drivers/media/video/omap34xxcam-daemon.c ++++ kernel-maemo-2.6.28/drivers/media/video/omap34xxcam-daemon.c @@ -0,0 +1,423 @@ +/* + * drivers/media/video/omap/omap34xcam-daemon.c @@ -251159,7 +251159,7 @@ + return rval; +} --- /dev/null -+++ kernel-2.6.28/drivers/media/video/omap34xxcam.c ++++ kernel-maemo-2.6.28/drivers/media/video/omap34xxcam.c @@ -0,0 +1,2160 @@ +/* + * omap34xxcam.c @@ -253322,7 +253322,7 @@ +late_initcall(omap34xxcam_init); +module_exit(omap34xxcam_exit); --- /dev/null -+++ kernel-2.6.28/drivers/media/video/omap34xxcam.h ++++ kernel-maemo-2.6.28/drivers/media/video/omap34xxcam.h @@ -0,0 +1,181 @@ +/* + * omap34xxcam.h @@ -253506,7 +253506,7 @@ + +#endif /* ifndef OMAP34XXCAM_H */ --- /dev/null -+++ kernel-2.6.28/drivers/media/video/smia-sensor.c ++++ kernel-maemo-2.6.28/drivers/media/video/smia-sensor.c @@ -0,0 +1,1060 @@ +/* + * drivers/media/video/smia-sensor.c @@ -254569,7 +254569,7 @@ +MODULE_DESCRIPTION("Generic SMIA-compatible camera sensor driver"); +MODULE_LICENSE("GPL"); --- /dev/null -+++ kernel-2.6.28/drivers/media/video/smia-sensor.h ++++ kernel-maemo-2.6.28/drivers/media/video/smia-sensor.h @@ -0,0 +1,42 @@ +/* + * drivers/media/video/smia-sensor.h @@ -254614,7 +254614,7 @@ + +#endif /* SMIA_SENSOR_H */ --- /dev/null -+++ kernel-2.6.28/drivers/media/video/smiaregs.c ++++ kernel-maemo-2.6.28/drivers/media/video/smiaregs.c @@ -0,0 +1,718 @@ +/* + * drivers/media/video/smiaregs.c @@ -255334,8 +255334,8 @@ +MODULE_AUTHOR("Sakari Ailus "); +MODULE_DESCRIPTION("Generic SMIA configuration and i2c register access"); +MODULE_LICENSE("GPL"); ---- kernel-2.6.28.orig/drivers/media/video/v4l2-int-device.c -+++ kernel-2.6.28/drivers/media/video/v4l2-int-device.c +--- kernel-maemo-2.6.28.orig/drivers/media/video/v4l2-int-device.c ++++ kernel-maemo-2.6.28/drivers/media/video/v4l2-int-device.c @@ -32,7 +32,7 @@ static DEFINE_MUTEX(mutex); static LIST_HEAD(int_list); @@ -255388,8 +255388,8 @@ mutex_unlock(&mutex); return 0; ---- kernel-2.6.28.orig/drivers/media/video/videobuf-dma-sg.c -+++ kernel-2.6.28/drivers/media/video/videobuf-dma-sg.c +--- kernel-maemo-2.6.28.orig/drivers/media/video/videobuf-dma-sg.c ++++ kernel-maemo-2.6.28/drivers/media/video/videobuf-dma-sg.c @@ -58,9 +58,10 @@ struct page *pg; int i; @@ -255462,8 +255462,8 @@ dma->sglist = NULL; dma->sglen = 0; return 0; ---- kernel-2.6.28.orig/drivers/mfd/Kconfig -+++ kernel-2.6.28/drivers/mfd/Kconfig +--- kernel-maemo-2.6.28.orig/drivers/mfd/Kconfig ++++ kernel-maemo-2.6.28/drivers/mfd/Kconfig @@ -63,7 +63,7 @@ config TWL4030_CORE @@ -255489,8 +255489,8 @@ config MFD_TMIO bool default n ---- kernel-2.6.28.orig/drivers/mfd/Makefile -+++ kernel-2.6.28/drivers/mfd/Makefile +--- kernel-maemo-2.6.28.orig/drivers/mfd/Makefile ++++ kernel-maemo-2.6.28/drivers/mfd/Makefile @@ -18,6 +18,7 @@ obj-$(CONFIG_MFD_WM8350_I2C) += wm8350-i2c.o @@ -255499,8 +255499,8 @@ obj-$(CONFIG_MFD_CORE) += mfd-core.o ---- kernel-2.6.28.orig/drivers/mfd/twl4030-core.c -+++ kernel-2.6.28/drivers/mfd/twl4030-core.c +--- kernel-maemo-2.6.28.orig/drivers/mfd/twl4030-core.c ++++ kernel-maemo-2.6.28/drivers/mfd/twl4030-core.c @@ -33,6 +33,8 @@ #include #include @@ -256133,7 +256133,7 @@ }; MODULE_DEVICE_TABLE(i2c, twl4030_ids); --- /dev/null -+++ kernel-2.6.28/drivers/mfd/twl4030-power.c ++++ kernel-maemo-2.6.28/drivers/mfd/twl4030-power.c @@ -0,0 +1,540 @@ +/* + * linux/drivers/i2c/chips/twl4030-power.c @@ -256675,8 +256675,8 @@ + printk(KERN_ERR + "TWL4030 Unable to relock registers\n"); +} ---- kernel-2.6.28.orig/drivers/misc/Kconfig -+++ kernel-2.6.28/drivers/misc/Kconfig +--- kernel-maemo-2.6.28.orig/drivers/misc/Kconfig ++++ kernel-maemo-2.6.28/drivers/misc/Kconfig @@ -178,6 +178,15 @@ If you have an ACPI-compatible ASUS laptop, say Y or M here. @@ -256724,8 +256724,8 @@ +source "drivers/misc/ssi-char/Kconfig" endif # MISC_DEVICES ---- kernel-2.6.28.orig/drivers/misc/Makefile -+++ kernel-2.6.28/drivers/misc/Makefile +--- kernel-maemo-2.6.28.orig/drivers/misc/Makefile ++++ kernel-maemo-2.6.28/drivers/misc/Makefile @@ -5,6 +5,7 @@ obj-$(CONFIG_IBM_ASM) += ibmasm/ @@ -256752,7 +256752,7 @@ +obj-$(CONFIG_SSI_CHAR) += ssi-char/ +obj-$(CONFIG_PANIC_INFO_BUFF) += panic_info_buff.o --- /dev/null -+++ kernel-2.6.28/drivers/misc/cmt-speech/Kconfig ++++ kernel-maemo-2.6.28/drivers/misc/cmt-speech/Kconfig @@ -0,0 +1,24 @@ +# +# OMAP SSI kernel configuration @@ -256779,7 +256779,7 @@ + + If unsure, say N. --- /dev/null -+++ kernel-2.6.28/drivers/misc/cmt-speech/Makefile ++++ kernel-maemo-2.6.28/drivers/misc/cmt-speech/Makefile @@ -0,0 +1,7 @@ +# +# Makefile for SSI CMT speech driver @@ -256789,7 +256789,7 @@ + +cmt_speech-objs := cs-core.o cs-ssi.o --- /dev/null -+++ kernel-2.6.28/drivers/misc/cmt-speech/cs-core.c ++++ kernel-maemo-2.6.28/drivers/misc/cmt-speech/cs-core.c @@ -0,0 +1,438 @@ +/* + * cs-core.c @@ -257230,7 +257230,7 @@ +module_init(cs_char_init); +module_exit(cs_char_exit); --- /dev/null -+++ kernel-2.6.28/drivers/misc/cmt-speech/cs-core.h ++++ kernel-maemo-2.6.28/drivers/misc/cmt-speech/cs-core.h @@ -0,0 +1,36 @@ +/* + * cs-core.h @@ -257269,7 +257269,7 @@ + +#endif /* _CS_CORE_H */ --- /dev/null -+++ kernel-2.6.28/drivers/misc/cmt-speech/cs-debug.h ++++ kernel-maemo-2.6.28/drivers/misc/cmt-speech/cs-debug.h @@ -0,0 +1,40 @@ +/* + * cs-debug.h @@ -257312,7 +257312,7 @@ + +#endif /* _CS_DEBUG_H */ --- /dev/null -+++ kernel-2.6.28/drivers/misc/cmt-speech/cs-ssi.c ++++ kernel-maemo-2.6.28/drivers/misc/cmt-speech/cs-ssi.c @@ -0,0 +1,682 @@ +/* + * cs-ssi.c @@ -257997,7 +257997,7 @@ + return 0; +} --- /dev/null -+++ kernel-2.6.28/drivers/misc/cmt-speech/cs-ssi.h ++++ kernel-maemo-2.6.28/drivers/misc/cmt-speech/cs-ssi.h @@ -0,0 +1,39 @@ +/* + * cs-ssi.h @@ -258039,7 +258039,7 @@ + +#endif /* _CS_SSI_H */ --- /dev/null -+++ kernel-2.6.28/drivers/misc/mcsaab/Kconfig ++++ kernel-maemo-2.6.28/drivers/misc/mcsaab/Kconfig @@ -0,0 +1,10 @@ +# +# SSI protocol kernel configuration @@ -258052,7 +258052,7 @@ + + If unsure, say Y, or else you will not be able to connect to the CMT. --- /dev/null -+++ kernel-2.6.28/drivers/misc/mcsaab/Makefile ++++ kernel-maemo-2.6.28/drivers/misc/mcsaab/Makefile @@ -0,0 +1,8 @@ +# +# Makefile for SSI protocol modules @@ -258063,7 +258063,7 @@ +EXTRA_CFLAGS += -DSSI_DEBUG +endif --- /dev/null -+++ kernel-2.6.28/drivers/misc/mcsaab/ssi_mcsaab_imp.c ++++ kernel-maemo-2.6.28/drivers/misc/mcsaab/ssi_mcsaab_imp.c @@ -0,0 +1,1274 @@ +/* + * ssi_mcsaab_imp.c @@ -259340,7 +259340,7 @@ +MODULE_DESCRIPTION(MCSAAB_IMP_DESC); +MODULE_LICENSE("GPL"); --- /dev/null -+++ kernel-2.6.28/drivers/misc/nokia-av.c ++++ kernel-maemo-2.6.28/drivers/misc/nokia-av.c @@ -0,0 +1,786 @@ +/* + * nokia-av.c - Nokia AV accessory detection @@ -260129,7 +260129,7 @@ +MODULE_DESCRIPTION("Nokia AV accessory detection"); +MODULE_LICENSE("GPL"); --- /dev/null -+++ kernel-2.6.28/drivers/misc/panic_info_buff.c ++++ kernel-maemo-2.6.28/drivers/misc/panic_info_buff.c @@ -0,0 +1,93 @@ +/* + * Copyright (C) Nokia Corporation @@ -260225,7 +260225,7 @@ +MODULE_LICENSE("GPL"); +MODULE_ALIAS("panic_info_buff"); --- /dev/null -+++ kernel-2.6.28/drivers/misc/ssi-char/Kconfig ++++ kernel-maemo-2.6.28/drivers/misc/ssi-char/Kconfig @@ -0,0 +1,18 @@ +# +# OMAP SSI kernel configuration @@ -260246,7 +260246,7 @@ + ---help--- + Enable the debug information in the CMT character driver. --- /dev/null -+++ kernel-2.6.28/drivers/misc/ssi-char/Makefile ++++ kernel-maemo-2.6.28/drivers/misc/ssi-char/Makefile @@ -0,0 +1,8 @@ +# +# Makefile for SSI CHAR driver @@ -260257,7 +260257,7 @@ + +ssi_char-objs := ssi-char.o ssi-if.o --- /dev/null -+++ kernel-2.6.28/drivers/misc/ssi-char/ssi-char-debug.h ++++ kernel-maemo-2.6.28/drivers/misc/ssi-char/ssi-char-debug.h @@ -0,0 +1,39 @@ +/* + * ssi-char-debug.h @@ -260299,7 +260299,7 @@ + +#endif /* _SSI_CHAR_DEBUG_H */ --- /dev/null -+++ kernel-2.6.28/drivers/misc/ssi-char/ssi-char.c ++++ kernel-maemo-2.6.28/drivers/misc/ssi-char/ssi-char.c @@ -0,0 +1,493 @@ +/* + * ssi-char.c @@ -260795,7 +260795,7 @@ +module_init(ssi_char_init); +module_exit(ssi_char_exit); --- /dev/null -+++ kernel-2.6.28/drivers/misc/ssi-char/ssi-char.h ++++ kernel-maemo-2.6.28/drivers/misc/ssi-char/ssi-char.h @@ -0,0 +1,36 @@ +/* + * ssi-char.h @@ -260834,7 +260834,7 @@ + +#endif /* _SSI_CHAR_H */ --- /dev/null -+++ kernel-2.6.28/drivers/misc/ssi-char/ssi-if.c ++++ kernel-maemo-2.6.28/drivers/misc/ssi-char/ssi-if.c @@ -0,0 +1,625 @@ +/* + * ssi-if.c @@ -261462,7 +261462,7 @@ + return 0; +} --- /dev/null -+++ kernel-2.6.28/drivers/misc/ssi-char/ssi-if.h ++++ kernel-maemo-2.6.28/drivers/misc/ssi-char/ssi-if.h @@ -0,0 +1,70 @@ +/* + * ssi-if.h @@ -261535,7 +261535,7 @@ + +#endif /* _SSI_IF_H */ --- /dev/null -+++ kernel-2.6.28/drivers/misc/ssi/Kconfig ++++ kernel-maemo-2.6.28/drivers/misc/ssi/Kconfig @@ -0,0 +1,11 @@ +# +# OMAP SSI HW kernel configuration @@ -261549,7 +261549,7 @@ + + If unsure, say N. --- /dev/null -+++ kernel-2.6.28/drivers/misc/ssi/Makefile ++++ kernel-maemo-2.6.28/drivers/misc/ssi/Makefile @@ -0,0 +1,15 @@ +# +# Makefile for SSI drivers @@ -261567,7 +261567,7 @@ + +obj-$(CONFIG_OMAP_SSI) += omap_ssi.o --- /dev/null -+++ kernel-2.6.28/drivers/misc/ssi/ssi_driver.c ++++ kernel-maemo-2.6.28/drivers/misc/ssi/ssi_driver.c @@ -0,0 +1,540 @@ +/* + * ssi_driver.c @@ -262110,7 +262110,7 @@ +MODULE_DESCRIPTION("Synchronous Serial Interface Driver"); +MODULE_LICENSE("GPL"); --- /dev/null -+++ kernel-2.6.28/drivers/misc/ssi/ssi_driver.h ++++ kernel-maemo-2.6.28/drivers/misc/ssi/ssi_driver.h @@ -0,0 +1,273 @@ +/* + * ssi_driver.h @@ -262386,7 +262386,7 @@ + +#endif /* __SSI_DRIVER_H__ */ --- /dev/null -+++ kernel-2.6.28/drivers/misc/ssi/ssi_driver_bus.c ++++ kernel-maemo-2.6.28/drivers/misc/ssi/ssi_driver_bus.c @@ -0,0 +1,153 @@ +/* + * ssi_driver_bus.c @@ -262542,7 +262542,7 @@ +} +EXPORT_SYMBOL(unregister_ssi_driver); --- /dev/null -+++ kernel-2.6.28/drivers/misc/ssi/ssi_driver_debugfs.c ++++ kernel-maemo-2.6.28/drivers/misc/ssi/ssi_driver_debugfs.c @@ -0,0 +1,259 @@ +/* + * ssi_driver_debugfs.c @@ -262804,7 +262804,7 @@ + debugfs_remove_recursive(ssi_dir); +} --- /dev/null -+++ kernel-2.6.28/drivers/misc/ssi/ssi_driver_dma.c ++++ kernel-maemo-2.6.28/drivers/misc/ssi/ssi_driver_dma.c @@ -0,0 +1,424 @@ +/* + * ssi_driver_dma.c @@ -263231,7 +263231,7 @@ + free_irq(ssi_ctrl->gdd_irq, ssi_ctrl); +} --- /dev/null -+++ kernel-2.6.28/drivers/misc/ssi/ssi_driver_gpio.c ++++ kernel-maemo-2.6.28/drivers/misc/ssi/ssi_driver_gpio.c @@ -0,0 +1,81 @@ +/* + * ssi_driver_gpio.c @@ -263315,7 +263315,7 @@ + free_irq(port->cawake_gpio_irq, port); +} --- /dev/null -+++ kernel-2.6.28/drivers/misc/ssi/ssi_driver_if.c ++++ kernel-maemo-2.6.28/drivers/misc/ssi/ssi_driver_if.c @@ -0,0 +1,572 @@ +/* + * ssi_driver_if.c @@ -263890,7 +263890,7 @@ +} +EXPORT_SYMBOL(ssi_set_port_event_cb); --- /dev/null -+++ kernel-2.6.28/drivers/misc/ssi/ssi_driver_int.c ++++ kernel-maemo-2.6.28/drivers/misc/ssi/ssi_driver_int.c @@ -0,0 +1,284 @@ +/* + * ssi_driver_int.c @@ -264177,7 +264177,7 @@ + free_irq(ssi_p->irq, ssi_p); +} --- /dev/null -+++ kernel-2.6.28/drivers/misc/sti/Makefile ++++ kernel-maemo-2.6.28/drivers/misc/sti/Makefile @@ -0,0 +1,8 @@ +ifeq ($(CONFIG_ARCH_OMAP3),y) +obj-$(CONFIG_OMAP_STI) += sdti.o @@ -264188,7 +264188,7 @@ +obj-$(CONFIG_NET) += sti-netlink.o +obj-$(CONFIG_OMAP_STI_CONSOLE) += sti-console.o --- /dev/null -+++ kernel-2.6.28/drivers/misc/sti/sdti.c ++++ kernel-maemo-2.6.28/drivers/misc/sti/sdti.c @@ -0,0 +1,228 @@ +/* + * Support functions for OMAP3 SDTI (Serial Debug Tracing Interface) @@ -264419,7 +264419,7 @@ +MODULE_AUTHOR("Roman Tereshonkov"); +MODULE_LICENSE("GPL"); --- /dev/null -+++ kernel-2.6.28/drivers/misc/sti/sti-console.c ++++ kernel-maemo-2.6.28/drivers/misc/sti/sti-console.c @@ -0,0 +1,189 @@ +/* + * Console support for OMAP STI/XTI @@ -264611,7 +264611,7 @@ +MODULE_DESCRIPTION("OMAP STI console support"); +MODULE_LICENSE("GPL"); --- /dev/null -+++ kernel-2.6.28/drivers/misc/sti/sti-fifo.c ++++ kernel-maemo-2.6.28/drivers/misc/sti/sti-fifo.c @@ -0,0 +1,117 @@ +/* + * STI RX FIFO Support @@ -264731,7 +264731,7 @@ +MODULE_AUTHOR("Paul Mundt, Roman Tereshonkov"); +MODULE_LICENSE("GPL"); --- /dev/null -+++ kernel-2.6.28/drivers/misc/sti/sti-netlink.c ++++ kernel-maemo-2.6.28/drivers/misc/sti/sti-netlink.c @@ -0,0 +1,157 @@ +/* + * OMAP STI/XTI communications interface via netlink socket. @@ -264891,7 +264891,7 @@ +MODULE_LICENSE("GPL"); +MODULE_DESCRIPTION("STI netlink-driven communications interface"); --- /dev/null -+++ kernel-2.6.28/drivers/misc/sti/sti.c ++++ kernel-maemo-2.6.28/drivers/misc/sti/sti.c @@ -0,0 +1,430 @@ +/* + * Support functions for OMAP STI/XTI (Serial Tracing Interface) @@ -265323,8 +265323,8 @@ + +MODULE_AUTHOR("Paul Mundt, Juha Yrjölä, Roman Tereshonkov"); +MODULE_LICENSE("GPL"); ---- kernel-2.6.28.orig/drivers/mmc/card/block.c -+++ kernel-2.6.28/drivers/mmc/card/block.c +--- kernel-maemo-2.6.28.orig/drivers/mmc/card/block.c ++++ kernel-maemo-2.6.28/drivers/mmc/card/block.c @@ -83,7 +83,14 @@ mutex_lock(&open_lock); md->usage--; @@ -265577,8 +265577,8 @@ } static void mmc_blk_remove(struct mmc_card *card) ---- kernel-2.6.28.orig/drivers/mmc/card/queue.c -+++ kernel-2.6.28/drivers/mmc/card/queue.c +--- kernel-maemo-2.6.28.orig/drivers/mmc/card/queue.c ++++ kernel-maemo-2.6.28/drivers/mmc/card/queue.c @@ -91,9 +91,9 @@ int ret; @@ -265623,8 +265623,8 @@ mq->card = NULL; } EXPORT_SYMBOL(mmc_cleanup_queue); ---- kernel-2.6.28.orig/drivers/mmc/core/core.c -+++ kernel-2.6.28/drivers/mmc/core/core.c +--- kernel-maemo-2.6.28.orig/drivers/mmc/core/core.c ++++ kernel-maemo-2.6.28/drivers/mmc/core/core.c @@ -327,6 +327,98 @@ EXPORT_SYMBOL(mmc_align_data_size); @@ -266041,8 +266041,8 @@ mmc_flush_scheduled_work(); mmc_bus_get(host); ---- kernel-2.6.28.orig/drivers/mmc/core/core.h -+++ kernel-2.6.28/drivers/mmc/core/core.h +--- kernel-maemo-2.6.28.orig/drivers/mmc/core/core.h ++++ kernel-maemo-2.6.28/drivers/mmc/core/core.h @@ -16,10 +16,14 @@ #define MMC_CMD_RETRIES 3 @@ -266058,8 +266058,8 @@ }; void mmc_attach_bus(struct mmc_host *host, const struct mmc_bus_ops *ops); ---- kernel-2.6.28.orig/drivers/mmc/core/debugfs.c -+++ kernel-2.6.28/drivers/mmc/core/debugfs.c +--- kernel-maemo-2.6.28.orig/drivers/mmc/core/debugfs.c ++++ kernel-maemo-2.6.28/drivers/mmc/core/debugfs.c @@ -184,6 +184,68 @@ DEFINE_SIMPLE_ATTRIBUTE(mmc_dbg_card_status_fops, mmc_dbg_card_status_get, NULL, "%08llx\n"); @@ -266141,8 +266141,8 @@ return; err: ---- kernel-2.6.28.orig/drivers/mmc/core/host.c -+++ kernel-2.6.28/drivers/mmc/core/host.c +--- kernel-maemo-2.6.28.orig/drivers/mmc/core/host.c ++++ kernel-maemo-2.6.28/drivers/mmc/core/host.c @@ -83,6 +83,7 @@ spin_lock_init(&host->lock); init_waitqueue_head(&host->wq); @@ -266151,8 +266151,8 @@ /* * By default, hosts do not support SGIO or large requests. ---- kernel-2.6.28.orig/drivers/mmc/core/host.h -+++ kernel-2.6.28/drivers/mmc/core/host.h +--- kernel-maemo-2.6.28.orig/drivers/mmc/core/host.h ++++ kernel-maemo-2.6.28/drivers/mmc/core/host.h @@ -14,5 +14,7 @@ int mmc_register_host_class(void); void mmc_unregister_host_class(void); @@ -266161,8 +266161,8 @@ + #endif ---- kernel-2.6.28.orig/drivers/mmc/core/mmc.c -+++ kernel-2.6.28/drivers/mmc/core/mmc.c +--- kernel-maemo-2.6.28.orig/drivers/mmc/core/mmc.c ++++ kernel-maemo-2.6.28/drivers/mmc/core/mmc.c @@ -160,7 +160,6 @@ { int err; @@ -266390,8 +266390,8 @@ return err; } - ---- kernel-2.6.28.orig/drivers/mmc/core/mmc_ops.c -+++ kernel-2.6.28/drivers/mmc/core/mmc_ops.c +--- kernel-maemo-2.6.28.orig/drivers/mmc/core/mmc_ops.c ++++ kernel-maemo-2.6.28/drivers/mmc/core/mmc_ops.c @@ -57,6 +57,34 @@ return _mmc_select_card(host, NULL); } @@ -266480,8 +266480,8 @@ return 0; } ---- kernel-2.6.28.orig/drivers/mmc/core/mmc_ops.h -+++ kernel-2.6.28/drivers/mmc/core/mmc_ops.h +--- kernel-maemo-2.6.28.orig/drivers/mmc/core/mmc_ops.h ++++ kernel-maemo-2.6.28/drivers/mmc/core/mmc_ops.h @@ -25,6 +25,7 @@ int mmc_send_cid(struct mmc_host *host, u32 *cid); int mmc_spi_read_ocr(struct mmc_host *host, int highcap, u32 *ocrp); @@ -266490,8 +266490,8 @@ #endif ---- kernel-2.6.28.orig/drivers/mmc/core/sd.c -+++ kernel-2.6.28/drivers/mmc/core/sd.c +--- kernel-maemo-2.6.28.orig/drivers/mmc/core/sd.c ++++ kernel-maemo-2.6.28/drivers/mmc/core/sd.c @@ -558,8 +558,6 @@ } } @@ -266575,8 +266575,8 @@ /* * We need to get OCR a different way for SPI. ---- kernel-2.6.28.orig/drivers/mmc/host/Kconfig -+++ kernel-2.6.28/drivers/mmc/host/Kconfig +--- kernel-maemo-2.6.28.orig/drivers/mmc/host/Kconfig ++++ kernel-maemo-2.6.28/drivers/mmc/host/Kconfig @@ -67,8 +67,9 @@ config MMC_OMAP @@ -266605,8 +266605,8 @@ config MMC_WBSD tristate "Winbond W83L51xD SD/MMC Card Interface support" depends on ISA_DMA_API ---- kernel-2.6.28.orig/drivers/mmc/host/Makefile -+++ kernel-2.6.28/drivers/mmc/host/Makefile +--- kernel-maemo-2.6.28.orig/drivers/mmc/host/Makefile ++++ kernel-maemo-2.6.28/drivers/mmc/host/Makefile @@ -15,6 +15,7 @@ obj-$(CONFIG_MMC_WBSD) += wbsd.o obj-$(CONFIG_MMC_AU1X) += au1xmmc.o @@ -266615,8 +266615,8 @@ obj-$(CONFIG_MMC_AT91) += at91_mci.o obj-$(CONFIG_MMC_ATMELMCI) += atmel-mci.o obj-$(CONFIG_MMC_TIFM_SD) += tifm_sd.o ---- kernel-2.6.28.orig/drivers/mmc/host/omap.c -+++ kernel-2.6.28/drivers/mmc/host/omap.c +--- kernel-maemo-2.6.28.orig/drivers/mmc/host/omap.c ++++ kernel-maemo-2.6.28/drivers/mmc/host/omap.c @@ -1015,7 +1015,7 @@ } @@ -266653,7 +266653,7 @@ host->irq = irq; --- /dev/null -+++ kernel-2.6.28/drivers/mmc/host/omap_hsmmc.c ++++ kernel-maemo-2.6.28/drivers/mmc/host/omap_hsmmc.c @@ -0,0 +1,1977 @@ +/* + * drivers/mmc/host/omap_hsmmc.c @@ -268632,8 +268632,8 @@ +MODULE_LICENSE("GPL"); +MODULE_ALIAS("platform:" DRIVER_NAME); +MODULE_AUTHOR("Texas Instruments Inc"); ---- kernel-2.6.28.orig/drivers/mtd/cmdlinepart.c -+++ kernel-2.6.28/drivers/mtd/cmdlinepart.c +--- kernel-maemo-2.6.28.orig/drivers/mtd/cmdlinepart.c ++++ kernel-maemo-2.6.28/drivers/mtd/cmdlinepart.c @@ -350,7 +350,7 @@ * * This function needs to be visible for bootloaders. @@ -268643,8 +268643,8 @@ { cmdline = s; return 1; ---- kernel-2.6.28.orig/drivers/mtd/maps/Kconfig -+++ kernel-2.6.28/drivers/mtd/maps/Kconfig +--- kernel-maemo-2.6.28.orig/drivers/mtd/maps/Kconfig ++++ kernel-maemo-2.6.28/drivers/mtd/maps/Kconfig @@ -434,6 +434,13 @@ PhotoMax Digital Picture Frame. If you have such a device, say 'Y'. @@ -268659,8 +268659,8 @@ config MTD_H720X tristate "Hynix evaluation board mappings" depends on MTD_CFI && ( ARCH_H7201 || ARCH_H7202 ) ---- kernel-2.6.28.orig/drivers/mtd/maps/Makefile -+++ kernel-2.6.28/drivers/mtd/maps/Makefile +--- kernel-maemo-2.6.28.orig/drivers/mtd/maps/Makefile ++++ kernel-maemo-2.6.28/drivers/mtd/maps/Makefile @@ -52,6 +52,7 @@ obj-$(CONFIG_MTD_SCB2_FLASH) += scb2_flash.o obj-$(CONFIG_MTD_H720X) += h720x-flash.o @@ -268669,8 +268669,8 @@ obj-$(CONFIG_MTD_IXP4XX) += ixp4xx.o obj-$(CONFIG_MTD_IXP2000) += ixp2000.o obj-$(CONFIG_MTD_WRSBC8260) += wr_sbc82xx_flash.o ---- kernel-2.6.28.orig/drivers/mtd/maps/omap_nor.c -+++ kernel-2.6.28/drivers/mtd/maps/omap_nor.c +--- kernel-maemo-2.6.28.orig/drivers/mtd/maps/omap_nor.c ++++ kernel-maemo-2.6.28/drivers/mtd/maps/omap_nor.c @@ -142,11 +142,12 @@ static int __exit omapflash_remove(struct platform_device *pdev) { @@ -268685,8 +268685,8 @@ del_mtd_partitions(info->mtd); kfree(info->parts); } else ---- kernel-2.6.28.orig/drivers/mtd/mtdoops.c -+++ kernel-2.6.28/drivers/mtd/mtdoops.c +--- kernel-maemo-2.6.28.orig/drivers/mtd/mtdoops.c ++++ kernel-maemo-2.6.28/drivers/mtd/mtdoops.c @@ -44,6 +44,7 @@ int oops_pages; int nextpage; @@ -268756,8 +268756,8 @@ vfree(cxt->oops_buf); } ---- kernel-2.6.28.orig/drivers/mtd/mtdpart.c -+++ kernel-2.6.28/drivers/mtd/mtdpart.c +--- kernel-maemo-2.6.28.orig/drivers/mtd/mtdpart.c ++++ kernel-maemo-2.6.28/drivers/mtd/mtdpart.c @@ -18,6 +18,7 @@ #include #include @@ -268953,8 +268953,8 @@ + ); + } +} ---- kernel-2.6.28.orig/drivers/mtd/nand/Kconfig -+++ kernel-2.6.28/drivers/mtd/nand/Kconfig +--- kernel-maemo-2.6.28.orig/drivers/mtd/nand/Kconfig ++++ kernel-maemo-2.6.28/drivers/mtd/nand/Kconfig @@ -74,6 +74,31 @@ help Support for NAND flash on Amstrad E3 (Delta). @@ -268987,8 +268987,8 @@ config MTD_NAND_TS7250 tristate "NAND Flash device on TS-7250 board" depends on MACH_TS72XX ---- kernel-2.6.28.orig/drivers/mtd/nand/Makefile -+++ kernel-2.6.28/drivers/mtd/nand/Makefile +--- kernel-maemo-2.6.28.orig/drivers/mtd/nand/Makefile ++++ kernel-maemo-2.6.28/drivers/mtd/nand/Makefile @@ -8,6 +8,7 @@ obj-$(CONFIG_MTD_NAND_CAFE) += cafe_nand.o obj-$(CONFIG_MTD_NAND_SPIA) += spia.o @@ -269008,7 +269008,7 @@ obj-$(CONFIG_MTD_NAND_BASLER_EXCITE) += excite_nandflash.o obj-$(CONFIG_MTD_NAND_PXA3xx) += pxa3xx_nand.o --- /dev/null -+++ kernel-2.6.28/drivers/mtd/nand/omap-hw.c ++++ kernel-maemo-2.6.28/drivers/mtd/nand/omap-hw.c @@ -0,0 +1,859 @@ +/* + * drivers/mtd/nand/omap-hw.c @@ -269870,7 +269870,7 @@ +module_exit(omap_nand_cleanup); + --- /dev/null -+++ kernel-2.6.28/drivers/mtd/nand/omap-nand-flash.c ++++ kernel-maemo-2.6.28/drivers/mtd/nand/omap-nand-flash.c @@ -0,0 +1,184 @@ +/* + * drivers/mtd/nand/omap-nand-flash.c @@ -270057,7 +270057,7 @@ +MODULE_DESCRIPTION("Glue layer for NAND flash on TI OMAP boards"); + --- /dev/null -+++ kernel-2.6.28/drivers/mtd/nand/omap2.c ++++ kernel-maemo-2.6.28/drivers/mtd/nand/omap2.c @@ -0,0 +1,755 @@ +/* + * drivers/mtd/nand/omap2.c @@ -270814,8 +270814,8 @@ + +MODULE_LICENSE("GPL"); +MODULE_DESCRIPTION("Glue layer for NAND flash on TI OMAP boards"); ---- kernel-2.6.28.orig/drivers/mtd/onenand/omap2.c -+++ kernel-2.6.28/drivers/mtd/onenand/omap2.c +--- kernel-maemo-2.6.28.orig/drivers/mtd/onenand/omap2.c ++++ kernel-maemo-2.6.28/drivers/mtd/onenand/omap2.c @@ -149,7 +149,7 @@ INIT_COMPLETION(c->irq_done); @@ -270902,8 +270902,8 @@ } iounmap(c->onenand.base); release_mem_region(c->phys_base, ONENAND_IO_SIZE); ---- kernel-2.6.28.orig/drivers/mtd/onenand/onenand_base.c -+++ kernel-2.6.28/drivers/mtd/onenand/onenand_base.c +--- kernel-maemo-2.6.28.orig/drivers/mtd/onenand/onenand_base.c ++++ kernel-maemo-2.6.28/drivers/mtd/onenand/onenand_base.c @@ -1455,7 +1455,8 @@ struct mtd_oob_ops *ops) { @@ -271115,8 +271115,8 @@ /* Send the command for reading device ID from BootRAM */ this->write_word(ONENAND_CMD_READID, this->base + ONENAND_BOOTRAM); ---- kernel-2.6.28.orig/drivers/mtd/ubi/build.c -+++ kernel-2.6.28/drivers/mtd/ubi/build.c +--- kernel-maemo-2.6.28.orig/drivers/mtd/ubi/build.c ++++ kernel-maemo-2.6.28/drivers/mtd/ubi/build.c @@ -632,6 +632,15 @@ } @@ -271164,8 +271164,8 @@ if (!DBG_DISABLE_BGT) ubi->thread_enabled = 1; ---- kernel-2.6.28.orig/drivers/mtd/ubi/cdev.c -+++ kernel-2.6.28/drivers/mtd/ubi/cdev.c +--- kernel-maemo-2.6.28.orig/drivers/mtd/ubi/cdev.c ++++ kernel-maemo-2.6.28/drivers/mtd/ubi/cdev.c @@ -721,7 +721,8 @@ * It seems we need to remove volume with name @re->new_name, * if it exists. @@ -271176,8 +271176,8 @@ if (IS_ERR(desc)) { err = PTR_ERR(desc); if (err == -ENODEV) ---- kernel-2.6.28.orig/drivers/mtd/ubi/debug.c -+++ kernel-2.6.28/drivers/mtd/ubi/debug.c +--- kernel-maemo-2.6.28.orig/drivers/mtd/ubi/debug.c ++++ kernel-maemo-2.6.28/drivers/mtd/ubi/debug.c @@ -44,6 +44,8 @@ be32_to_cpu(ec_hdr->vid_hdr_offset)); printk(KERN_DEBUG "\tdata_offset %d\n", @@ -271187,8 +271187,8 @@ printk(KERN_DEBUG "\thdr_crc %#08x\n", be32_to_cpu(ec_hdr->hdr_crc)); printk(KERN_DEBUG "erase counter header hexdump:\n"); ---- kernel-2.6.28.orig/drivers/mtd/ubi/debug.h -+++ kernel-2.6.28/drivers/mtd/ubi/debug.h +--- kernel-maemo-2.6.28.orig/drivers/mtd/ubi/debug.h ++++ kernel-maemo-2.6.28/drivers/mtd/ubi/debug.h @@ -27,11 +27,11 @@ #define dbg_err(fmt, ...) ubi_err(fmt, ##__VA_ARGS__) @@ -271206,8 +271206,8 @@ } while (0) #define dbg_msg(fmt, ...) \ ---- kernel-2.6.28.orig/drivers/mtd/ubi/eba.c -+++ kernel-2.6.28/drivers/mtd/ubi/eba.c +--- kernel-maemo-2.6.28.orig/drivers/mtd/ubi/eba.c ++++ kernel-maemo-2.6.28/drivers/mtd/ubi/eba.c @@ -419,8 +419,9 @@ * not implemented. */ @@ -271488,8 +271488,8 @@ goto out_unlock_buf; } } ---- kernel-2.6.28.orig/drivers/mtd/ubi/io.c -+++ kernel-2.6.28/drivers/mtd/ubi/io.c +--- kernel-maemo-2.6.28.orig/drivers/mtd/ubi/io.c ++++ kernel-maemo-2.6.28/drivers/mtd/ubi/io.c @@ -566,15 +566,16 @@ * This function returns zero if the erase counter header is OK, and %1 if * not. @@ -271633,8 +271633,8 @@ vid_hdr->magic = cpu_to_be32(UBI_VID_HDR_MAGIC); vid_hdr->version = UBI_VERSION; ---- kernel-2.6.28.orig/drivers/mtd/ubi/scan.c -+++ kernel-2.6.28/drivers/mtd/ubi/scan.c +--- kernel-maemo-2.6.28.orig/drivers/mtd/ubi/scan.c ++++ kernel-maemo-2.6.28/drivers/mtd/ubi/scan.c @@ -912,6 +912,8 @@ if (si->is_empty) ubi_msg("empty MTD device detected"); @@ -271644,8 +271644,8 @@ /* * In case of unknown erase counter we use the mean erase counter * value. ---- kernel-2.6.28.orig/drivers/mtd/ubi/ubi-media.h -+++ kernel-2.6.28/drivers/mtd/ubi/ubi-media.h +--- kernel-maemo-2.6.28.orig/drivers/mtd/ubi/ubi-media.h ++++ kernel-maemo-2.6.28/drivers/mtd/ubi/ubi-media.h @@ -129,6 +129,7 @@ * @ec: the erase counter * @vid_hdr_offset: where the VID header starts @@ -271679,8 +271679,8 @@ __be32 hdr_crc; } __attribute__ ((packed)); ---- kernel-2.6.28.orig/drivers/mtd/ubi/ubi.h -+++ kernel-2.6.28/drivers/mtd/ubi/ubi.h +--- kernel-maemo-2.6.28.orig/drivers/mtd/ubi/ubi.h ++++ kernel-maemo-2.6.28/drivers/mtd/ubi/ubi.h @@ -74,6 +74,13 @@ #define UBI_IO_RETRIES 3 @@ -271852,8 +271852,8 @@ int min_io_size; int hdrs_min_io_size; int ro_mode; ---- kernel-2.6.28.orig/drivers/mtd/ubi/wl.c -+++ kernel-2.6.28/drivers/mtd/ubi/wl.c +--- kernel-maemo-2.6.28.orig/drivers/mtd/ubi/wl.c ++++ kernel-maemo-2.6.28/drivers/mtd/ubi/wl.c @@ -22,7 +22,7 @@ * UBI wear-leveling sub-system. * @@ -272829,8 +272829,8 @@ + return 1; +} #endif /* CONFIG_MTD_UBI_DEBUG_PARANOID */ ---- kernel-2.6.28.orig/drivers/net/irda/Kconfig -+++ kernel-2.6.28/drivers/net/irda/Kconfig +--- kernel-maemo-2.6.28.orig/drivers/net/irda/Kconfig ++++ kernel-maemo-2.6.28/drivers/net/irda/Kconfig @@ -342,5 +342,15 @@ To compile it as a module, choose M here: the module will be called mcs7780. @@ -272847,8 +272847,8 @@ + endmenu ---- kernel-2.6.28.orig/drivers/net/irda/Makefile -+++ kernel-2.6.28/drivers/net/irda/Makefile +--- kernel-maemo-2.6.28.orig/drivers/net/irda/Makefile ++++ kernel-maemo-2.6.28/drivers/net/irda/Makefile @@ -18,6 +18,7 @@ obj-$(CONFIG_VIA_FIR) += via-ircc.o obj-$(CONFIG_PXA_FICP) += pxaficp_ir.o @@ -272858,7 +272858,7 @@ # SIR drivers obj-$(CONFIG_IRTTY_SIR) += irtty-sir.o sir-dev.o --- /dev/null -+++ kernel-2.6.28/drivers/net/irda/omap-ir.c ++++ kernel-maemo-2.6.28/drivers/net/irda/omap-ir.c @@ -0,0 +1,901 @@ +/* + * BRIEF MODULE DESCRIPTION @@ -273761,8 +273761,8 @@ +MODULE_DESCRIPTION("OMAP IrDA Driver"); +MODULE_LICENSE("GPL"); + ---- kernel-2.6.28.orig/drivers/net/smc911x.h -+++ kernel-2.6.28/drivers/net/smc911x.h +--- kernel-maemo-2.6.28.orig/drivers/net/smc911x.h ++++ kernel-maemo-2.6.28/drivers/net/smc911x.h @@ -42,6 +42,16 @@ #define SMC_USE_16BIT 0 #define SMC_USE_32BIT 1 @@ -273780,8 +273780,8 @@ #else /* * Default configuration ---- kernel-2.6.28.orig/drivers/net/smc91x.c -+++ kernel-2.6.28/drivers/net/smc91x.c +--- kernel-maemo-2.6.28.orig/drivers/net/smc91x.c ++++ kernel-maemo-2.6.28/drivers/net/smc91x.c @@ -448,6 +448,11 @@ dev->name, packet_number, status, packet_len, packet_len); @@ -273794,8 +273794,8 @@ back: if (unlikely(packet_len < 6 || status & RS_ERRORS)) { if (status & RS_TOOLONG && packet_len <= (1514 + 4 + 6)) { ---- kernel-2.6.28.orig/drivers/net/wireless/Kconfig -+++ kernel-2.6.28/drivers/net/wireless/Kconfig +--- kernel-maemo-2.6.28.orig/drivers/net/wireless/Kconfig ++++ kernel-maemo-2.6.28/drivers/net/wireless/Kconfig @@ -717,5 +717,6 @@ source "drivers/net/wireless/b43legacy/Kconfig" source "drivers/net/wireless/zd1211rw/Kconfig" @@ -273803,8 +273803,8 @@ +source "drivers/net/wireless/wl12xx/Kconfig" endmenu ---- kernel-2.6.28.orig/drivers/net/wireless/Makefile -+++ kernel-2.6.28/drivers/net/wireless/Makefile +--- kernel-maemo-2.6.28.orig/drivers/net/wireless/Makefile ++++ kernel-maemo-2.6.28/drivers/net/wireless/Makefile @@ -67,3 +67,5 @@ obj-$(CONFIG_ATH9K) += ath9k/ @@ -273812,7 +273812,7 @@ + +obj-$(CONFIG_WL12XX) += wl12xx/ --- /dev/null -+++ kernel-2.6.28/drivers/net/wireless/wl12xx/Kconfig ++++ kernel-maemo-2.6.28/drivers/net/wireless/wl12xx/Kconfig @@ -0,0 +1,31 @@ +menuconfig WL12XX + boolean "TI wl12xx driver support" @@ -273846,7 +273846,7 @@ + unsure. + --- /dev/null -+++ kernel-2.6.28/drivers/net/wireless/wl12xx/Makefile ++++ kernel-maemo-2.6.28/drivers/net/wireless/wl12xx/Makefile @@ -0,0 +1,13 @@ +# FIXME: use wl12xx.ko for now to not break the user space +wl12xx-objs = wl1251_main.o wl1251_netlink.o wl1251_event.o \ @@ -273862,7 +273862,7 @@ + wl1271_debugfs.o +obj-$(CONFIG_WL1271) += wl1271.o --- /dev/null -+++ kernel-2.6.28/drivers/net/wireless/wl12xx/wl1251.h ++++ kernel-maemo-2.6.28/drivers/net/wireless/wl12xx/wl1251.h @@ -0,0 +1,455 @@ +/* + * This file is part of wl1251 @@ -274320,7 +274320,7 @@ + +#endif --- /dev/null -+++ kernel-2.6.28/drivers/net/wireless/wl12xx/wl1251_acx.c ++++ kernel-maemo-2.6.28/drivers/net/wireless/wl12xx/wl1251_acx.c @@ -0,0 +1,1106 @@ +#include "wl1251_acx.h" + @@ -275429,7 +275429,7 @@ + return ret; +} --- /dev/null -+++ kernel-2.6.28/drivers/net/wireless/wl12xx/wl1251_acx.h ++++ kernel-maemo-2.6.28/drivers/net/wireless/wl12xx/wl1251_acx.h @@ -0,0 +1,1414 @@ +/* + * This file is part of wl1251 @@ -276846,7 +276846,7 @@ + +#endif /* __WL1251_ACX_H__ */ --- /dev/null -+++ kernel-2.6.28/drivers/net/wireless/wl12xx/wl1251_boot.c ++++ kernel-maemo-2.6.28/drivers/net/wireless/wl12xx/wl1251_boot.c @@ -0,0 +1,552 @@ +/* + * This file is part of wl1251 @@ -277401,7 +277401,7 @@ + return ret; +} --- /dev/null -+++ kernel-2.6.28/drivers/net/wireless/wl12xx/wl1251_boot.h ++++ kernel-maemo-2.6.28/drivers/net/wireless/wl12xx/wl1251_boot.h @@ -0,0 +1,41 @@ +/* + * This file is part of wl1251 @@ -277445,7 +277445,7 @@ + +#endif --- /dev/null -+++ kernel-2.6.28/drivers/net/wireless/wl12xx/wl1251_cmd.c ++++ kernel-maemo-2.6.28/drivers/net/wireless/wl12xx/wl1251_cmd.c @@ -0,0 +1,412 @@ +#include "wl1251_cmd.h" + @@ -277860,7 +277860,7 @@ + return ret; +} --- /dev/null -+++ kernel-2.6.28/drivers/net/wireless/wl12xx/wl1251_cmd.h ++++ kernel-maemo-2.6.28/drivers/net/wireless/wl12xx/wl1251_cmd.h @@ -0,0 +1,407 @@ +/* + * This file is part of wl1251 @@ -278270,7 +278270,7 @@ + +#endif /* __WL1251_CMD_H__ */ --- /dev/null -+++ kernel-2.6.28/drivers/net/wireless/wl12xx/wl1251_debugfs.c ++++ kernel-maemo-2.6.28/drivers/net/wireless/wl12xx/wl1251_debugfs.c @@ -0,0 +1,518 @@ +/* + * This file is part of wl1251 @@ -278791,7 +278791,7 @@ + +} --- /dev/null -+++ kernel-2.6.28/drivers/net/wireless/wl12xx/wl1251_debugfs.h ++++ kernel-maemo-2.6.28/drivers/net/wireless/wl12xx/wl1251_debugfs.h @@ -0,0 +1,33 @@ +/* + * This file is part of wl1251 @@ -278827,7 +278827,7 @@ + +#endif /* WL1251_DEBUGFS_H */ --- /dev/null -+++ kernel-2.6.28/drivers/net/wireless/wl12xx/wl1251_event.c ++++ kernel-maemo-2.6.28/drivers/net/wireless/wl12xx/wl1251_event.c @@ -0,0 +1,177 @@ +/* + * This file is part of wl1251 @@ -279007,7 +279007,7 @@ + return 0; +} --- /dev/null -+++ kernel-2.6.28/drivers/net/wireless/wl12xx/wl1251_event.h ++++ kernel-maemo-2.6.28/drivers/net/wireless/wl12xx/wl1251_event.h @@ -0,0 +1,128 @@ +/* + * This file is part of wl1251 @@ -279138,7 +279138,7 @@ + +#endif --- /dev/null -+++ kernel-2.6.28/drivers/net/wireless/wl12xx/wl1251_init.c ++++ kernel-maemo-2.6.28/drivers/net/wireless/wl12xx/wl1251_init.c @@ -0,0 +1,423 @@ +/* + * This file is part of wl1251 @@ -279564,7 +279564,7 @@ + return ret; +} --- /dev/null -+++ kernel-2.6.28/drivers/net/wireless/wl12xx/wl1251_init.h ++++ kernel-maemo-2.6.28/drivers/net/wireless/wl12xx/wl1251_init.h @@ -0,0 +1,41 @@ +/* + * This file is part of wl1251 @@ -279608,7 +279608,7 @@ + +#endif --- /dev/null -+++ kernel-2.6.28/drivers/net/wireless/wl12xx/wl1251_main.c ++++ kernel-maemo-2.6.28/drivers/net/wireless/wl12xx/wl1251_main.c @@ -0,0 +1,2128 @@ + +/* @@ -281739,7 +281739,7 @@ +MODULE_LICENSE("GPL"); +MODULE_AUTHOR("Kalle Valo "); --- /dev/null -+++ kernel-2.6.28/drivers/net/wireless/wl12xx/wl1251_netlink.c ++++ kernel-maemo-2.6.28/drivers/net/wireless/wl12xx/wl1251_netlink.c @@ -0,0 +1,679 @@ +/* + * This file is part of wl1251 @@ -282421,7 +282421,7 @@ + genl_unregister_family(&wl1251_nl_family); +} --- /dev/null -+++ kernel-2.6.28/drivers/net/wireless/wl12xx/wl1251_netlink.h ++++ kernel-maemo-2.6.28/drivers/net/wireless/wl12xx/wl1251_netlink.h @@ -0,0 +1,30 @@ +/* + * This file is part of wl1251 @@ -282454,7 +282454,7 @@ + +#endif /* __WL1251_NETLINK_H__ */ --- /dev/null -+++ kernel-2.6.28/drivers/net/wireless/wl12xx/wl1251_ps.c ++++ kernel-maemo-2.6.28/drivers/net/wireless/wl12xx/wl1251_ps.c @@ -0,0 +1,203 @@ +/* + * This file is part of wl1251 @@ -282660,7 +282660,7 @@ +} + --- /dev/null -+++ kernel-2.6.28/drivers/net/wireless/wl12xx/wl1251_ps.h ++++ kernel-maemo-2.6.28/drivers/net/wireless/wl12xx/wl1251_ps.h @@ -0,0 +1,37 @@ +#ifndef __WL1251_PS_H__ +#define __WL1251_PS_H__ @@ -282700,7 +282700,7 @@ + +#endif /* __WL1251_PS_H__ */ --- /dev/null -+++ kernel-2.6.28/drivers/net/wireless/wl12xx/wl1251_reg.h ++++ kernel-maemo-2.6.28/drivers/net/wireless/wl12xx/wl1251_reg.h @@ -0,0 +1,744 @@ +/* + * This file is part of wl12xx @@ -283447,7 +283447,7 @@ + +#endif --- /dev/null -+++ kernel-2.6.28/drivers/net/wireless/wl12xx/wl1251_rx.c ++++ kernel-maemo-2.6.28/drivers/net/wireless/wl12xx/wl1251_rx.c @@ -0,0 +1,195 @@ +/* + * This file is part of wl1251 @@ -283645,7 +283645,7 @@ + return; +} --- /dev/null -+++ kernel-2.6.28/drivers/net/wireless/wl12xx/wl1251_rx.h ++++ kernel-maemo-2.6.28/drivers/net/wireless/wl12xx/wl1251_rx.h @@ -0,0 +1,124 @@ +/* + * This file is part of wl1251 @@ -283772,7 +283772,7 @@ + +#endif --- /dev/null -+++ kernel-2.6.28/drivers/net/wireless/wl12xx/wl1251_spi.c ++++ kernel-maemo-2.6.28/drivers/net/wireless/wl12xx/wl1251_spi.c @@ -0,0 +1,409 @@ +/* + * This file is part of wl1251 @@ -284184,7 +284184,7 @@ + wl1251_write32(wl, wl1251_translate_reg_addr(wl, addr), val); +} --- /dev/null -+++ kernel-2.6.28/drivers/net/wireless/wl12xx/wl1251_spi.h ++++ kernel-maemo-2.6.28/drivers/net/wireless/wl12xx/wl1251_spi.h @@ -0,0 +1,111 @@ +/* + * This file is part of wl1251 @@ -284298,7 +284298,7 @@ + +#endif /* __WL1251_SPI_H__ */ --- /dev/null -+++ kernel-2.6.28/drivers/net/wireless/wl12xx/wl1251_tx.c ++++ kernel-maemo-2.6.28/drivers/net/wireless/wl12xx/wl1251_tx.c @@ -0,0 +1,564 @@ +/* + * This file is part of wl1251 @@ -284865,7 +284865,7 @@ + } +} --- /dev/null -+++ kernel-2.6.28/drivers/net/wireless/wl12xx/wl1251_tx.h ++++ kernel-maemo-2.6.28/drivers/net/wireless/wl12xx/wl1251_tx.h @@ -0,0 +1,216 @@ +/* + * This file is part of wl1251 @@ -285084,7 +285084,7 @@ + +#endif --- /dev/null -+++ kernel-2.6.28/drivers/net/wireless/wl12xx/wl1271.h ++++ kernel-maemo-2.6.28/drivers/net/wireless/wl12xx/wl1271.h @@ -0,0 +1,409 @@ +/* + * This file is part of wl1271 @@ -285496,7 +285496,7 @@ + +#endif --- /dev/null -+++ kernel-2.6.28/drivers/net/wireless/wl12xx/wl1271_acx.c ++++ kernel-maemo-2.6.28/drivers/net/wireless/wl12xx/wl1271_acx.c @@ -0,0 +1,938 @@ +#include "wl1271_acx.h" + @@ -286437,7 +286437,7 @@ + return ret; +} --- /dev/null -+++ kernel-2.6.28/drivers/net/wireless/wl12xx/wl1271_acx.h ++++ kernel-maemo-2.6.28/drivers/net/wireless/wl12xx/wl1271_acx.h @@ -0,0 +1,1221 @@ +/* + * This file is part of wl1271 @@ -287661,7 +287661,7 @@ + +#endif /* __WL1271_ACX_H__ */ --- /dev/null -+++ kernel-2.6.28/drivers/net/wireless/wl12xx/wl1271_boot.c ++++ kernel-maemo-2.6.28/drivers/net/wireless/wl12xx/wl1271_boot.c @@ -0,0 +1,540 @@ +/* + * This file is part of wl1271 @@ -288204,7 +288204,7 @@ + return ret; +} --- /dev/null -+++ kernel-2.6.28/drivers/net/wireless/wl12xx/wl1271_boot.h ++++ kernel-maemo-2.6.28/drivers/net/wireless/wl12xx/wl1271_boot.h @@ -0,0 +1,72 @@ +/* + * This file is part of wl1271 @@ -288279,7 +288279,7 @@ + +#endif --- /dev/null -+++ kernel-2.6.28/drivers/net/wireless/wl12xx/wl1271_cmd.c ++++ kernel-maemo-2.6.28/drivers/net/wireless/wl12xx/wl1271_cmd.c @@ -0,0 +1,813 @@ +/* + * This file is part of wl1271 @@ -289095,7 +289095,7 @@ + return ret; +} --- /dev/null -+++ kernel-2.6.28/drivers/net/wireless/wl12xx/wl1271_cmd.h ++++ kernel-maemo-2.6.28/drivers/net/wireless/wl12xx/wl1271_cmd.h @@ -0,0 +1,463 @@ +/* + * This file is part of wl1271 @@ -289561,7 +289561,7 @@ + +#endif /* __WL1271_CMD_H__ */ --- /dev/null -+++ kernel-2.6.28/drivers/net/wireless/wl12xx/wl1271_debugfs.c ++++ kernel-maemo-2.6.28/drivers/net/wireless/wl12xx/wl1271_debugfs.c @@ -0,0 +1,518 @@ +/* + * This file is part of wl1271 @@ -290082,7 +290082,7 @@ + +} --- /dev/null -+++ kernel-2.6.28/drivers/net/wireless/wl12xx/wl1271_debugfs.h ++++ kernel-maemo-2.6.28/drivers/net/wireless/wl12xx/wl1271_debugfs.h @@ -0,0 +1,33 @@ +/* + * This file is part of wl1271 @@ -290118,7 +290118,7 @@ + +#endif /* WL1271_DEBUGFS_H */ --- /dev/null -+++ kernel-2.6.28/drivers/net/wireless/wl12xx/wl1271_event.c ++++ kernel-maemo-2.6.28/drivers/net/wireless/wl12xx/wl1271_event.c @@ -0,0 +1,126 @@ +/* + * This file is part of wl1271 @@ -290247,7 +290247,7 @@ + return 0; +} --- /dev/null -+++ kernel-2.6.28/drivers/net/wireless/wl12xx/wl1271_event.h ++++ kernel-maemo-2.6.28/drivers/net/wireless/wl12xx/wl1271_event.h @@ -0,0 +1,110 @@ +/* + * This file is part of wl1271 @@ -290360,7 +290360,7 @@ + +#endif --- /dev/null -+++ kernel-2.6.28/drivers/net/wireless/wl12xx/wl1271_init.c ++++ kernel-maemo-2.6.28/drivers/net/wireless/wl12xx/wl1271_init.c @@ -0,0 +1,397 @@ +/* + * This file is part of wl1271 @@ -290760,7 +290760,7 @@ + return ret; +} --- /dev/null -+++ kernel-2.6.28/drivers/net/wireless/wl12xx/wl1271_init.h ++++ kernel-maemo-2.6.28/drivers/net/wireless/wl12xx/wl1271_init.h @@ -0,0 +1,115 @@ +/* + * This file is part of wl1271 @@ -290878,7 +290878,7 @@ + +#endif --- /dev/null -+++ kernel-2.6.28/drivers/net/wireless/wl12xx/wl1271_main.c ++++ kernel-maemo-2.6.28/drivers/net/wireless/wl12xx/wl1271_main.c @@ -0,0 +1,1390 @@ +/* + * This file is part of wl1271 @@ -292271,7 +292271,7 @@ +MODULE_AUTHOR("Kalle Valo , " + "Luciano Coelho "); --- /dev/null -+++ kernel-2.6.28/drivers/net/wireless/wl12xx/wl1271_netlink.c ++++ kernel-maemo-2.6.28/drivers/net/wireless/wl12xx/wl1271_netlink.c @@ -0,0 +1,679 @@ +/* + * This file is part of wl1271 @@ -292953,7 +292953,7 @@ + genl_unregister_family(&wl1271_nl_family); +} --- /dev/null -+++ kernel-2.6.28/drivers/net/wireless/wl12xx/wl1271_netlink.h ++++ kernel-maemo-2.6.28/drivers/net/wireless/wl12xx/wl1271_netlink.h @@ -0,0 +1,30 @@ +/* + * This file is part of wl1271 @@ -292986,7 +292986,7 @@ + +#endif /* __WL1271_NETLINK_H__ */ --- /dev/null -+++ kernel-2.6.28/drivers/net/wireless/wl12xx/wl1271_ps.c ++++ kernel-maemo-2.6.28/drivers/net/wireless/wl12xx/wl1271_ps.c @@ -0,0 +1,127 @@ +/* + * This file is part of wl1271 @@ -293116,7 +293116,7 @@ + + --- /dev/null -+++ kernel-2.6.28/drivers/net/wireless/wl12xx/wl1271_ps.h ++++ kernel-maemo-2.6.28/drivers/net/wireless/wl12xx/wl1271_ps.h @@ -0,0 +1,36 @@ +#ifndef __WL1271_PS_H__ +#define __WL1271_PS_H__ @@ -293155,7 +293155,7 @@ + +#endif /* __WL1271_PS_H__ */ --- /dev/null -+++ kernel-2.6.28/drivers/net/wireless/wl12xx/wl1271_reg.h ++++ kernel-maemo-2.6.28/drivers/net/wireless/wl12xx/wl1271_reg.h @@ -0,0 +1,758 @@ +/* + * This file is part of wl12xx @@ -293916,7 +293916,7 @@ + +#endif --- /dev/null -+++ kernel-2.6.28/drivers/net/wireless/wl12xx/wl1271_rx.c ++++ kernel-maemo-2.6.28/drivers/net/wireless/wl12xx/wl1271_rx.c @@ -0,0 +1,199 @@ +/* + * This file is part of wl1271 @@ -294118,7 +294118,7 @@ + +} --- /dev/null -+++ kernel-2.6.28/drivers/net/wireless/wl12xx/wl1271_rx.h ++++ kernel-maemo-2.6.28/drivers/net/wireless/wl12xx/wl1271_rx.h @@ -0,0 +1,121 @@ +/* + * This file is part of wl1271 @@ -294242,7 +294242,7 @@ + +#endif --- /dev/null -+++ kernel-2.6.28/drivers/net/wireless/wl12xx/wl1271_spi.c ++++ kernel-maemo-2.6.28/drivers/net/wireless/wl12xx/wl1271_spi.c @@ -0,0 +1,382 @@ +/* + * This file is part of wl1271 @@ -294627,7 +294627,7 @@ + wl1271_write32(wl, wl1271_translate_reg_addr(wl, addr), val); +} --- /dev/null -+++ kernel-2.6.28/drivers/net/wireless/wl12xx/wl1271_spi.h ++++ kernel-maemo-2.6.28/drivers/net/wireless/wl12xx/wl1271_spi.h @@ -0,0 +1,113 @@ +/* + * This file is part of wl1271 @@ -294743,7 +294743,7 @@ + +#endif /* __WL1271_SPI_H__ */ --- /dev/null -+++ kernel-2.6.28/drivers/net/wireless/wl12xx/wl1271_tx.c ++++ kernel-maemo-2.6.28/drivers/net/wireless/wl12xx/wl1271_tx.c @@ -0,0 +1,376 @@ +/* + * This file is part of wl1271 @@ -295122,7 +295122,7 @@ + } +} --- /dev/null -+++ kernel-2.6.28/drivers/net/wireless/wl12xx/wl1271_tx.h ++++ kernel-maemo-2.6.28/drivers/net/wireless/wl12xx/wl1271_tx.h @@ -0,0 +1,129 @@ +/* + * This file is part of wl1271 @@ -295254,7 +295254,7 @@ + +#endif --- /dev/null -+++ kernel-2.6.28/drivers/net/wireless/wl12xx/wl12xx_80211.h ++++ kernel-maemo-2.6.28/drivers/net/wireless/wl12xx/wl12xx_80211.h @@ -0,0 +1,156 @@ +#ifndef __WL12XX_80211_H__ +#define __WL12XX_80211_H__ @@ -295412,8 +295412,8 @@ +} __attribute__ ((packed)); + +#endif ---- kernel-2.6.28.orig/drivers/power/Kconfig -+++ kernel-2.6.28/drivers/power/Kconfig +--- kernel-maemo-2.6.28.orig/drivers/power/Kconfig ++++ kernel-maemo-2.6.28/drivers/power/Kconfig @@ -56,6 +56,13 @@ Say Y to enable support for the battery on the Sharp Zaurus SL-6000 (tosa) models. @@ -295428,8 +295428,8 @@ config BATTERY_WM97XX bool "WM97xx generic battery driver" depends on TOUCHSCREEN_WM97XX=y ---- kernel-2.6.28.orig/drivers/power/Makefile -+++ kernel-2.6.28/drivers/power/Makefile +--- kernel-maemo-2.6.28.orig/drivers/power/Makefile ++++ kernel-maemo-2.6.28/drivers/power/Makefile @@ -20,6 +20,8 @@ obj-$(CONFIG_BATTERY_DS2760) += ds2760_battery.o obj-$(CONFIG_BATTERY_PMU) += pmu_battery.o @@ -295440,7 +295440,7 @@ obj-$(CONFIG_BATTERY_WM97XX) += wm97xx_battery.o obj-$(CONFIG_BATTERY_BQ27x00) += bq27x00_battery.o --- /dev/null -+++ kernel-2.6.28/drivers/power/twl4030_bci_battery.c ++++ kernel-maemo-2.6.28/drivers/power/twl4030_bci_battery.c @@ -0,0 +1,1097 @@ +/* + * linux/drivers/power/twl4030_bci_battery.c @@ -296539,8 +296539,8 @@ +} +module_exit(twl4030_battery_exit); + ---- kernel-2.6.28.orig/drivers/regulator/Kconfig -+++ kernel-2.6.28/drivers/regulator/Kconfig +--- kernel-maemo-2.6.28.orig/drivers/regulator/Kconfig ++++ kernel-maemo-2.6.28/drivers/regulator/Kconfig @@ -52,6 +52,13 @@ charging select between 100 mA and 500 mA charging current limit. @@ -296555,8 +296555,8 @@ config REGULATOR_WM8350 tristate "Wolfson Microelectroncis WM8350 AudioPlus PMIC" depends on MFD_WM8350 ---- kernel-2.6.28.orig/drivers/regulator/Makefile -+++ kernel-2.6.28/drivers/regulator/Makefile +--- kernel-maemo-2.6.28.orig/drivers/regulator/Makefile ++++ kernel-maemo-2.6.28/drivers/regulator/Makefile @@ -8,6 +8,7 @@ obj-$(CONFIG_REGULATOR_VIRTUAL_CONSUMER) += virtual.o @@ -296566,7 +296566,7 @@ obj-$(CONFIG_REGULATOR_WM8400) += wm8400-regulator.o obj-$(CONFIG_REGULATOR_DA903X) += da903x.o --- /dev/null -+++ kernel-2.6.28/drivers/regulator/twl4030-regulator.c ++++ kernel-maemo-2.6.28/drivers/regulator/twl4030-regulator.c @@ -0,0 +1,581 @@ +/* + * twl4030-regulator.c -- support regulators in twl4030 family chips @@ -297149,8 +297149,8 @@ + +MODULE_DESCRIPTION("TWL4030 regulator driver"); +MODULE_LICENSE("GPL"); ---- kernel-2.6.28.orig/drivers/rtc/rtc-twl4030.c -+++ kernel-2.6.28/drivers/rtc/rtc-twl4030.c +--- kernel-maemo-2.6.28.orig/drivers/rtc/rtc-twl4030.c ++++ kernel-maemo-2.6.28/drivers/rtc/rtc-twl4030.c @@ -505,8 +505,9 @@ static void twl4030_rtc_shutdown(struct platform_device *pdev) @@ -297163,8 +297163,8 @@ } #ifdef CONFIG_PM ---- kernel-2.6.28.orig/drivers/serial/8250.c -+++ kernel-2.6.28/drivers/serial/8250.c +--- kernel-maemo-2.6.28.orig/drivers/serial/8250.c ++++ kernel-maemo-2.6.28/drivers/serial/8250.c @@ -1456,6 +1456,16 @@ if (status & UART_LSR_THRE) transmit_chars(up); @@ -297214,8 +297214,8 @@ serial_outp(up, UART_FCR, fcr); /* set fcr */ } serial8250_set_mctrl(&up->port, up->port.mctrl); ---- kernel-2.6.28.orig/drivers/spi/Kconfig -+++ kernel-2.6.28/drivers/spi/Kconfig +--- kernel-maemo-2.6.28.orig/drivers/spi/Kconfig ++++ kernel-maemo-2.6.28/drivers/spi/Kconfig @@ -225,6 +225,47 @@ This driver can also be built as a module. If so, the module will be called at25. @@ -297264,8 +297264,8 @@ config SPI_SPIDEV tristate "User mode SPI device driver support" depends on EXPERIMENTAL ---- kernel-2.6.28.orig/drivers/spi/Makefile -+++ kernel-2.6.28/drivers/spi/Makefile +--- kernel-maemo-2.6.28.orig/drivers/spi/Makefile ++++ kernel-maemo-2.6.28/drivers/spi/Makefile @@ -35,6 +35,9 @@ obj-$(CONFIG_SPI_AT25) += at25.o obj-$(CONFIG_SPI_SPIDEV) += spidev.o @@ -297276,8 +297276,8 @@ # ... add above this line ... # SPI slave controller drivers (upstream link) ---- kernel-2.6.28.orig/drivers/spi/omap2_mcspi.c -+++ kernel-2.6.28/drivers/spi/omap2_mcspi.c +--- kernel-maemo-2.6.28.orig/drivers/spi/omap2_mcspi.c ++++ kernel-maemo-2.6.28/drivers/spi/omap2_mcspi.c @@ -41,6 +41,9 @@ #define OMAP2_MCSPI_MAX_FREQ 48000000 @@ -297673,7 +297673,7 @@ mcspi->ick = clk_get(&pdev->dev, "mcspi_ick"); if (IS_ERR(mcspi->ick)) { --- /dev/null -+++ kernel-2.6.28/drivers/spi/tsc210x.c ++++ kernel-maemo-2.6.28/drivers/spi/tsc210x.c @@ -0,0 +1,1262 @@ +/* + * tsc210x.c - TSC2101/2102/... driver core @@ -298938,7 +298938,7 @@ +MODULE_DESCRIPTION("Interface driver for TI TSC210x chips."); +MODULE_LICENSE("GPL"); --- /dev/null -+++ kernel-2.6.28/drivers/spi/tsc2301-core.c ++++ kernel-maemo-2.6.28/drivers/spi/tsc2301-core.c @@ -0,0 +1,287 @@ +/* + * TSC2301 driver @@ -299227,8 +299227,8 @@ + +MODULE_AUTHOR("Juha Yrjölä "); +MODULE_LICENSE("GPL"); ---- kernel-2.6.28.orig/drivers/usb/Kconfig -+++ kernel-2.6.28/drivers/usb/Kconfig +--- kernel-maemo-2.6.28.orig/drivers/usb/Kconfig ++++ kernel-maemo-2.6.28/drivers/usb/Kconfig @@ -56,6 +56,7 @@ default y if PPC_83xx default y if SOC_AU1200 @@ -299244,8 +299244,8 @@ +source "drivers/usb/otg/Kconfig" + endif # USB_SUPPORT ---- kernel-2.6.28.orig/drivers/usb/core/Kconfig -+++ kernel-2.6.28/drivers/usb/core/Kconfig +--- kernel-maemo-2.6.28.orig/drivers/usb/core/Kconfig ++++ kernel-maemo-2.6.28/drivers/usb/core/Kconfig @@ -104,11 +104,10 @@ config USB_OTG @@ -299259,8 +299259,8 @@ config USB_OTG_WHITELIST bool "Rely on OTG Targeted Peripherals List" depends on USB_OTG || EMBEDDED ---- kernel-2.6.28.orig/drivers/usb/core/otg_whitelist.h -+++ kernel-2.6.28/drivers/usb/core/otg_whitelist.h +--- kernel-maemo-2.6.28.orig/drivers/usb/core/otg_whitelist.h ++++ kernel-maemo-2.6.28/drivers/usb/core/otg_whitelist.h @@ -9,104 +9,12 @@ * (at your option) any later version. */ @@ -299371,8 +299371,8 @@ } +#endif ---- kernel-2.6.28.orig/drivers/usb/gadget/Kconfig -+++ kernel-2.6.28/drivers/usb/gadget/Kconfig +--- kernel-maemo-2.6.28.orig/drivers/usb/gadget/Kconfig ++++ kernel-maemo-2.6.28/drivers/usb/gadget/Kconfig @@ -208,17 +208,6 @@ default USB_GADGET select USB_GADGET_SELECTED @@ -299434,8 +299434,8 @@ # put drivers that need isochronous transfer support (for audio # or video class gadget drivers), or specific hardware, here. ---- kernel-2.6.28.orig/drivers/usb/gadget/Makefile -+++ kernel-2.6.28/drivers/usb/gadget/Makefile +--- kernel-maemo-2.6.28.orig/drivers/usb/gadget/Makefile ++++ kernel-maemo-2.6.28/drivers/usb/gadget/Makefile @@ -31,6 +31,8 @@ g_file_storage-objs := file_storage.o g_printer-objs := printer.o @@ -299452,8 +299452,8 @@ +obj-$(CONFIG_USB_G_NOKIA) += g_nokia.o +obj-$(CONFIG_USB_G_SOFTUPD) += g_softupd.o ---- kernel-2.6.28.orig/drivers/usb/gadget/composite.c -+++ kernel-2.6.28/drivers/usb/gadget/composite.c +--- kernel-maemo-2.6.28.orig/drivers/usb/gadget/composite.c ++++ kernel-maemo-2.6.28/drivers/usb/gadget/composite.c @@ -24,6 +24,7 @@ #include #include @@ -299751,8 +299751,8 @@ .suspend = composite_suspend, .resume = composite_resume, ---- kernel-2.6.28.orig/drivers/usb/gadget/f_acm.c -+++ kernel-2.6.28/drivers/usb/gadget/f_acm.c +--- kernel-maemo-2.6.28.orig/drivers/usb/gadget/f_acm.c ++++ kernel-maemo-2.6.28/drivers/usb/gadget/f_acm.c @@ -340,10 +340,13 @@ value = 0; @@ -299770,8 +299770,8 @@ acm->port_handshake_bits = w_value; break; ---- kernel-2.6.28.orig/drivers/usb/gadget/f_obex.c -+++ kernel-2.6.28/drivers/usb/gadget/f_obex.c +--- kernel-maemo-2.6.28.orig/drivers/usb/gadget/f_obex.c ++++ kernel-maemo-2.6.28/drivers/usb/gadget/f_obex.c @@ -50,6 +50,7 @@ u8 data_id; u8 port_num; @@ -299921,7 +299921,7 @@ obex->port.func.strings = obex_strings; /* descriptors are per-instance copies */ --- /dev/null -+++ kernel-2.6.28/drivers/usb/gadget/f_phonet.c ++++ kernel-maemo-2.6.28/drivers/usb/gadget/f_phonet.c @@ -0,0 +1,623 @@ +/* + * f_phonet.c -- USB CDC Phonet function @@ -300547,7 +300547,7 @@ + unregister_netdev(dev); +} --- /dev/null -+++ kernel-2.6.28/drivers/usb/gadget/f_raw.c ++++ kernel-maemo-2.6.28/drivers/usb/gadget/f_raw.c @@ -0,0 +1,779 @@ +/* + * f_raw.c -- USB Raw Access Function Driver @@ -301328,8 +301328,8 @@ + kfree(graw); +} + ---- kernel-2.6.28.orig/drivers/usb/gadget/file_storage.c -+++ kernel-2.6.28/drivers/usb/gadget/file_storage.c +--- kernel-maemo-2.6.28.orig/drivers/usb/gadget/file_storage.c ++++ kernel-maemo-2.6.28/drivers/usb/gadget/file_storage.c @@ -87,6 +87,8 @@ * removable Default false, boolean for removable media * luns=N Default N = number of filenames, number of @@ -302640,7 +302640,7 @@ } module_exit(fsg_cleanup); --- /dev/null -+++ kernel-2.6.28/drivers/usb/gadget/nokia.c ++++ kernel-maemo-2.6.28/drivers/usb/gadget/nokia.c @@ -0,0 +1,263 @@ +/* + * nokia.c -- Nokia Composite Gadget Driver @@ -302905,8 +302905,8 @@ +} +module_exit(nokia_cleanup); + ---- kernel-2.6.28.orig/drivers/usb/gadget/omap_udc.c -+++ kernel-2.6.28/drivers/usb/gadget/omap_udc.c +--- kernel-maemo-2.6.28.orig/drivers/usb/gadget/omap_udc.c ++++ kernel-maemo-2.6.28/drivers/usb/gadget/omap_udc.c @@ -3006,7 +3006,7 @@ cleanup0: @@ -302926,7 +302926,7 @@ } omap_writew(0, UDC_SYSCON1); --- /dev/null -+++ kernel-2.6.28/drivers/usb/gadget/softupd.c ++++ kernel-maemo-2.6.28/drivers/usb/gadget/softupd.c @@ -0,0 +1,243 @@ +/* + * softupd.c -- Nokia Software Update Gadget @@ -303171,8 +303171,8 @@ +} +module_exit(softupd_cleanup); + ---- kernel-2.6.28.orig/drivers/usb/gadget/u_ether.c -+++ kernel-2.6.28/drivers/usb/gadget/u_ether.c +--- kernel-maemo-2.6.28.orig/drivers/usb/gadget/u_ether.c ++++ kernel-maemo-2.6.28/drivers/usb/gadget/u_ether.c @@ -116,7 +116,6 @@ #undef DBG #undef VDBG @@ -303211,7 +303211,7 @@ free_netdev(the_dev->net); --- /dev/null -+++ kernel-2.6.28/drivers/usb/gadget/u_phonet.h ++++ kernel-maemo-2.6.28/drivers/usb/gadget/u_phonet.h @@ -0,0 +1,21 @@ +/* + * u_phonet.h - interface to Phonet @@ -303234,8 +303234,8 @@ +void gphonet_cleanup(void); + +#endif /* __U_PHONET_H */ ---- kernel-2.6.28.orig/drivers/usb/gadget/u_serial.c -+++ kernel-2.6.28/drivers/usb/gadget/u_serial.c +--- kernel-maemo-2.6.28.orig/drivers/usb/gadget/u_serial.c ++++ kernel-maemo-2.6.28/drivers/usb/gadget/u_serial.c @@ -81,6 +81,7 @@ /* circular buffer */ struct gs_buf { @@ -303387,8 +303387,8 @@ + wake_up_interruptible(&port->full_wait); spin_unlock_irqrestore(&port->port_lock, flags); } ---- kernel-2.6.28.orig/drivers/usb/host/Kconfig -+++ kernel-2.6.28/drivers/usb/host/Kconfig +--- kernel-maemo-2.6.28.orig/drivers/usb/host/Kconfig ++++ kernel-maemo-2.6.28/drivers/usb/host/Kconfig @@ -41,6 +41,25 @@ To compile this driver as a module, choose M here: the @@ -303415,8 +303415,8 @@ config USB_EHCI_ROOT_HUB_TT bool "Root Hub Transaction Translators" ---- kernel-2.6.28.orig/drivers/usb/host/ehci-hcd.c -+++ kernel-2.6.28/drivers/usb/host/ehci-hcd.c +--- kernel-maemo-2.6.28.orig/drivers/usb/host/ehci-hcd.c ++++ kernel-maemo-2.6.28/drivers/usb/host/ehci-hcd.c @@ -1014,6 +1014,11 @@ #define PLATFORM_DRIVER ehci_hcd_au1xxx_driver #endif @@ -303430,7 +303430,7 @@ #include "ehci-ps3.c" #define PS3_SYSTEM_BUS_DRIVER ps3_ehci_driver --- /dev/null -+++ kernel-2.6.28/drivers/usb/host/ehci-omap.c ++++ kernel-maemo-2.6.28/drivers/usb/host/ehci-omap.c @@ -0,0 +1,577 @@ +/* + * ehci-omap.c - driver for USBHOST on OMAP 34xx processor @@ -304010,7 +304010,7 @@ + } +}; --- /dev/null -+++ kernel-2.6.28/drivers/usb/host/ehci-omap.h ++++ kernel-maemo-2.6.28/drivers/usb/host/ehci-omap.h @@ -0,0 +1,125 @@ +/* + * ehci-omap.h - register definitions for USBHOST in OMAP 34xx @@ -304137,8 +304137,8 @@ +#define OMAP_USBHOST_OHCI_BASE (OMAP_USBHOST_BASE + 0x4400) + +#endif/* __EHCI_OMAP_H*/ ---- kernel-2.6.28.orig/drivers/usb/host/ohci-omap.c -+++ kernel-2.6.28/drivers/usb/host/ohci-omap.c +--- kernel-maemo-2.6.28.orig/drivers/usb/host/ohci-omap.c ++++ kernel-maemo-2.6.28/drivers/usb/host/ohci-omap.c @@ -18,6 +18,7 @@ #include #include @@ -304175,8 +304175,8 @@ iounmap(hcd->regs); release_mem_region(hcd->rsrc_start, hcd->rsrc_len); usb_put_hcd(hcd); ---- kernel-2.6.28.orig/drivers/usb/musb/Kconfig -+++ kernel-2.6.28/drivers/usb/musb/Kconfig +--- kernel-maemo-2.6.28.orig/drivers/usb/musb/Kconfig ++++ kernel-maemo-2.6.28/drivers/usb/musb/Kconfig @@ -11,7 +11,9 @@ depends on (USB || USB_GADGET) && HAVE_CLK depends on !SUPERH @@ -304238,8 +304238,8 @@ + help + This enables the old musb procfs entry. Ideally this would move to a userland application + talking to musb via usbfs and issueing the correct control messages. ---- kernel-2.6.28.orig/drivers/usb/musb/Makefile -+++ kernel-2.6.28/drivers/usb/musb/Makefile +--- kernel-maemo-2.6.28.orig/drivers/usb/musb/Makefile ++++ kernel-maemo-2.6.28/drivers/usb/musb/Makefile @@ -22,6 +22,14 @@ musb_hdrc-objs += omap2430.o endif @@ -304266,7 +304266,7 @@ + musb_hdrc-objs += musb_procfs.o endif --- /dev/null -+++ kernel-2.6.28/drivers/usb/musb/blackfin.c ++++ kernel-maemo-2.6.28/drivers/usb/musb/blackfin.c @@ -0,0 +1,329 @@ +/* + * MUSB OTG controller driver for Blackfin Processors @@ -304598,7 +304598,7 @@ + return 0; +} --- /dev/null -+++ kernel-2.6.28/drivers/usb/musb/blackfin.h ++++ kernel-maemo-2.6.28/drivers/usb/musb/blackfin.h @@ -0,0 +1,52 @@ +/* + * Copyright (C) 2007 by Analog Devices, Inc. @@ -304652,8 +304652,8 @@ +static struct timer_list musb_conn_timer; + +#endif /* __MUSB_BLACKFIN_H__ */ ---- kernel-2.6.28.orig/drivers/usb/musb/davinci.c -+++ kernel-2.6.28/drivers/usb/musb/davinci.c +--- kernel-maemo-2.6.28.orig/drivers/usb/musb/davinci.c ++++ kernel-maemo-2.6.28/drivers/usb/musb/davinci.c @@ -32,9 +32,9 @@ #include #include @@ -304793,7 +304793,7 @@ u8 devctl, warn = 0; --- /dev/null -+++ kernel-2.6.28/drivers/usb/musb/isp1704.h ++++ kernel-maemo-2.6.28/drivers/usb/musb/isp1704.h @@ -0,0 +1,81 @@ +/* + * isp1704.h - ISP 1704 Register @@ -304876,8 +304876,8 @@ +#define ISP1704_PWR_CTRL_HWDETECT (1 << 7) + +#endif /* __ISP1704_H__ */ ---- kernel-2.6.28.orig/drivers/usb/musb/musb_core.c -+++ kernel-2.6.28/drivers/usb/musb/musb_core.c +--- kernel-maemo-2.6.28.orig/drivers/usb/musb/musb_core.c ++++ kernel-maemo-2.6.28/drivers/usb/musb/musb_core.c @@ -112,10 +112,19 @@ #include "davinci.h" #endif @@ -306462,8 +306462,8 @@ /* for static cmos like DaVinci, register values were preserved * unless for some reason the whole soc powered down and we're * not treating that as a whole-system restart (e.g. swsusp) ---- kernel-2.6.28.orig/drivers/usb/musb/musb_core.h -+++ kernel-2.6.28/drivers/usb/musb/musb_core.h +--- kernel-maemo-2.6.28.orig/drivers/usb/musb/musb_core.h ++++ kernel-maemo-2.6.28/drivers/usb/musb/musb_core.h @@ -64,7 +64,6 @@ #include "musb_host.h" @@ -306751,8 +306751,8 @@ +#endif + #endif /* __MUSB_CORE_H__ */ ---- kernel-2.6.28.orig/drivers/usb/musb/musb_debug.h -+++ kernel-2.6.28/drivers/usb/musb/musb_debug.h +--- kernel-maemo-2.6.28.orig/drivers/usb/musb/musb_debug.h ++++ kernel-maemo-2.6.28/drivers/usb/musb/musb_debug.h @@ -42,9 +42,13 @@ #define INFO(fmt, args...) yprintk(KERN_INFO, fmt, ## args) #define ERR(fmt, args...) yprintk(KERN_ERR, fmt, ## args) @@ -306781,8 +306781,8 @@ -extern const char *otg_state_string(struct musb *); #endif /* __MUSB_LINUX_DEBUG_H__ */ ---- kernel-2.6.28.orig/drivers/usb/musb/musb_dma.h -+++ kernel-2.6.28/drivers/usb/musb/musb_dma.h +--- kernel-maemo-2.6.28.orig/drivers/usb/musb/musb_dma.h ++++ kernel-maemo-2.6.28/drivers/usb/musb/musb_dma.h @@ -69,15 +69,21 @@ #endif @@ -306809,8 +306809,8 @@ #endif /* ---- kernel-2.6.28.orig/drivers/usb/musb/musb_gadget.c -+++ kernel-2.6.28/drivers/usb/musb/musb_gadget.c +--- kernel-maemo-2.6.28.orig/drivers/usb/musb/musb_gadget.c ++++ kernel-maemo-2.6.28/drivers/usb/musb/musb_gadget.c @@ -106,50 +106,207 @@ { struct musb_request *req; @@ -308526,8 +308526,8 @@ musb->g.is_a_peripheral = 1; } else WARN_ON(1); ---- kernel-2.6.28.orig/drivers/usb/musb/musb_gadget.h -+++ kernel-2.6.28/drivers/usb/musb/musb_gadget.h +--- kernel-maemo-2.6.28.orig/drivers/usb/musb/musb_gadget.h ++++ kernel-maemo-2.6.28/drivers/usb/musb/musb_gadget.h @@ -42,6 +42,7 @@ u8 tx; /* endpoint direction */ u8 epnum; @@ -308558,8 +308558,8 @@ extern const struct usb_ep_ops musb_g_ep0_ops; ---- kernel-2.6.28.orig/drivers/usb/musb/musb_gadget_ep0.c -+++ kernel-2.6.28/drivers/usb/musb/musb_gadget_ep0.c +--- kernel-maemo-2.6.28.orig/drivers/usb/musb/musb_gadget_ep0.c ++++ kernel-maemo-2.6.28/drivers/usb/musb/musb_gadget_ep0.c @@ -55,7 +55,7 @@ * the gadget driver, or adjusting endpoint halt status. */ @@ -308586,8 +308586,8 @@ musb_writew(regs, MUSB_RXCSR, csr); } ---- kernel-2.6.28.orig/drivers/usb/musb/musb_host.c -+++ kernel-2.6.28/drivers/usb/musb/musb_host.c +--- kernel-maemo-2.6.28.orig/drivers/usb/musb/musb_host.c ++++ kernel-maemo-2.6.28/drivers/usb/musb/musb_host.c @@ -112,18 +112,21 @@ { void __iomem *epio = ep->regs; @@ -309236,8 +309236,8 @@ return 0; if (is_host_active(musb) && musb->is_active) { ---- kernel-2.6.28.orig/drivers/usb/musb/musb_io.h -+++ kernel-2.6.28/drivers/usb/musb/musb_io.h +--- kernel-maemo-2.6.28.orig/drivers/usb/musb/musb_io.h ++++ kernel-maemo-2.6.28/drivers/usb/musb/musb_io.h @@ -39,7 +39,7 @@ #if !defined(CONFIG_ARM) && !defined(CONFIG_SUPERH) \ @@ -309284,7 +309284,7 @@ + #endif --- /dev/null -+++ kernel-2.6.28/drivers/usb/musb/musb_procfs.c ++++ kernel-maemo-2.6.28/drivers/usb/musb/musb_procfs.c @@ -0,0 +1,775 @@ +/* + * MUSB OTG driver debug support @@ -310061,8 +310061,8 @@ + + return pde; +} ---- kernel-2.6.28.orig/drivers/usb/musb/musb_regs.h -+++ kernel-2.6.28/drivers/usb/musb/musb_regs.h +--- kernel-maemo-2.6.28.orig/drivers/usb/musb/musb_regs.h ++++ kernel-maemo-2.6.28/drivers/usb/musb/musb_regs.h @@ -35,98 +35,9 @@ #ifndef __MUSB_REGS_H__ #define __MUSB_REGS_H__ @@ -310561,8 +310561,8 @@ +#endif /* CONFIG_BLACKFIN */ + #endif /* __MUSB_REGS_H__ */ ---- kernel-2.6.28.orig/drivers/usb/musb/musb_virthub.c -+++ kernel-2.6.28/drivers/usb/musb/musb_virthub.c +--- kernel-maemo-2.6.28.orig/drivers/usb/musb/musb_virthub.c ++++ kernel-maemo-2.6.28/drivers/usb/musb/musb_virthub.c @@ -78,18 +78,18 @@ DBG(3, "Root port suspended, power %02x\n", power); @@ -310623,8 +310623,8 @@ } put_unaligned(cpu_to_le32(musb->port1_status ---- kernel-2.6.28.orig/drivers/usb/musb/musbhsdma.c -+++ kernel-2.6.28/drivers/usb/musb/musbhsdma.c +--- kernel-maemo-2.6.28.orig/drivers/usb/musb/musbhsdma.c ++++ kernel-maemo-2.6.28/drivers/usb/musb/musbhsdma.c @@ -34,58 +34,7 @@ #include #include @@ -310989,7 +310989,7 @@ dma_controller_destroy(&controller->controller); --- /dev/null -+++ kernel-2.6.28/drivers/usb/musb/musbhsdma.h ++++ kernel-maemo-2.6.28/drivers/usb/musb/musbhsdma.h @@ -0,0 +1,149 @@ +/* + * MUSB OTG driver - support for Mentor's DMA controller @@ -311140,8 +311140,8 @@ + u8 used_channels; + u8 irq; +}; ---- kernel-2.6.28.orig/drivers/usb/musb/omap2430.c -+++ kernel-2.6.28/drivers/usb/musb/omap2430.c +--- kernel-maemo-2.6.28.orig/drivers/usb/musb/omap2430.c ++++ kernel-maemo-2.6.28/drivers/usb/musb/omap2430.c @@ -49,6 +49,17 @@ static struct timer_list musb_idle_timer; @@ -311456,8 +311456,8 @@ +} +EXPORT_SYMBOL_GPL(musb_restore_ctx_and_resume); +#endif ---- kernel-2.6.28.orig/drivers/usb/musb/tusb6010.c -+++ kernel-2.6.28/drivers/usb/musb/tusb6010.c +--- kernel-maemo-2.6.28.orig/drivers/usb/musb/tusb6010.c ++++ kernel-maemo-2.6.28/drivers/usb/musb/tusb6010.c @@ -270,7 +270,7 @@ */ static int tusb_draw_power(struct otg_transceiver *x, unsigned mA) @@ -311649,8 +311649,8 @@ setup_timer(&musb_idle_timer, musb_do_idle, (unsigned long) musb); ---- kernel-2.6.28.orig/drivers/usb/musb/tusb6010_omap.c -+++ kernel-2.6.28/drivers/usb/musb/tusb6010_omap.c +--- kernel-maemo-2.6.28.orig/drivers/usb/musb/tusb6010_omap.c ++++ kernel-maemo-2.6.28/drivers/usb/musb/tusb6010_omap.c @@ -15,8 +15,8 @@ #include #include @@ -311663,7 +311663,7 @@ #include "musb_core.h" --- /dev/null -+++ kernel-2.6.28/drivers/usb/otg/Kconfig ++++ kernel-maemo-2.6.28/drivers/usb/otg/Kconfig @@ -0,0 +1,54 @@ +# +# USB OTG infrastructure may be needed for peripheral-only, host-only, @@ -311720,7 +311720,7 @@ + +endif # USB || OTG --- /dev/null -+++ kernel-2.6.28/drivers/usb/otg/Makefile ++++ kernel-maemo-2.6.28/drivers/usb/otg/Makefile @@ -0,0 +1,15 @@ +# +# OTG infrastructure and transceiver drivers @@ -311738,7 +311738,7 @@ +ccflags-$(CONFIG_USB_GADGET_DEBUG) += -DDEBUG + --- /dev/null -+++ kernel-2.6.28/drivers/usb/otg/gpio_vbus.c ++++ kernel-maemo-2.6.28/drivers/usb/otg/gpio_vbus.c @@ -0,0 +1,335 @@ +/* + * gpio-vbus.c - simple GPIO VBUS sensing driver for B peripheral devices @@ -312076,7 +312076,7 @@ +MODULE_AUTHOR("Philipp Zabel"); +MODULE_LICENSE("GPL"); --- /dev/null -+++ kernel-2.6.28/drivers/usb/otg/isp1301_omap.c ++++ kernel-maemo-2.6.28/drivers/usb/otg/isp1301_omap.c @@ -0,0 +1,1683 @@ +/* + * isp1301_omap - ISP 1301 USB transceiver, talking to OMAP OTG controller @@ -313762,7 +313762,7 @@ +module_exit(isp_exit); + --- /dev/null -+++ kernel-2.6.28/drivers/usb/otg/otg.c ++++ kernel-maemo-2.6.28/drivers/usb/otg/otg.c @@ -0,0 +1,172 @@ +/* + * otg.c -- USB OTG utility code @@ -313937,7 +313937,7 @@ + +#endif /* CONFIG_USB_OTG_WHITELIST */ --- /dev/null -+++ kernel-2.6.28/drivers/usb/otg/twl4030-usb.c ++++ kernel-maemo-2.6.28/drivers/usb/otg/twl4030-usb.c @@ -0,0 +1,829 @@ +/* + * twl4030_usb - TWL4030 USB transceiver, talking to OMAP OTG controller @@ -314768,8 +314768,8 @@ +MODULE_AUTHOR("Texas Instruments, Inc, Nokia Corporation"); +MODULE_DESCRIPTION("TWL4030 USB transceiver driver"); +MODULE_LICENSE("GPL"); ---- kernel-2.6.28.orig/drivers/video/Kconfig -+++ kernel-2.6.28/drivers/video/Kconfig +--- kernel-maemo-2.6.28.orig/drivers/video/Kconfig ++++ kernel-maemo-2.6.28/drivers/video/Kconfig @@ -7,7 +7,7 @@ source "drivers/char/agp/Kconfig" @@ -314787,8 +314787,8 @@ source "drivers/video/backlight/Kconfig" source "drivers/video/display/Kconfig" ---- kernel-2.6.28.orig/drivers/video/Makefile -+++ kernel-2.6.28/drivers/video/Makefile +--- kernel-maemo-2.6.28.orig/drivers/video/Makefile ++++ kernel-maemo-2.6.28/drivers/video/Makefile @@ -120,6 +120,7 @@ obj-$(CONFIG_FB_XILINX) += xilinxfb.o obj-$(CONFIG_FB_SH_MOBILE_LCDC) += sh_mobile_lcdcfb.o @@ -314797,8 +314797,8 @@ obj-$(CONFIG_XEN_FBDEV_FRONTEND) += xen-fbfront.o obj-$(CONFIG_FB_CARMINE) += carminefb.o obj-$(CONFIG_FB_MB862XX) += mb862xx/ ---- kernel-2.6.28.orig/drivers/video/omap/Kconfig -+++ kernel-2.6.28/drivers/video/omap/Kconfig +--- kernel-maemo-2.6.28.orig/drivers/video/omap/Kconfig ++++ kernel-maemo-2.6.28/drivers/video/omap/Kconfig @@ -1,15 +1,81 @@ config FB_OMAP tristate "OMAP frame buffer support (EXPERIMENTAL)" @@ -314912,8 +314912,8 @@ - help - Say Y here if you want to have support for the external - Epson Blizzard LCD controller. ---- kernel-2.6.28.orig/drivers/video/omap/Makefile -+++ kernel-2.6.28/drivers/video/omap/Makefile +--- kernel-maemo-2.6.28.orig/drivers/video/omap/Makefile ++++ kernel-maemo-2.6.28/drivers/video/omap/Makefile @@ -6,8 +6,11 @@ objs-yy := omapfb_main.o @@ -314951,8 +314951,8 @@ +obj-$(CONFIG_FB_OMAP_LCD_MIPID) += lcd_mipid.o + +omapfb-objs := $(objs-yy) ---- kernel-2.6.28.orig/drivers/video/omap/blizzard.c -+++ kernel-2.6.28/drivers/video/omap/blizzard.c +--- kernel-maemo-2.6.28.orig/drivers/video/omap/blizzard.c ++++ kernel-maemo-2.6.28/drivers/video/omap/blizzard.c @@ -25,9 +25,9 @@ #include #include @@ -315119,8 +315119,8 @@ .update_window = blizzard_update_window_async, .sync = blizzard_sync, .suspend = blizzard_suspend, ---- kernel-2.6.28.orig/drivers/video/omap/dispc.c -+++ kernel-2.6.28/drivers/video/omap/dispc.c +--- kernel-maemo-2.6.28.orig/drivers/video/omap/dispc.c ++++ kernel-maemo-2.6.28/drivers/video/omap/dispc.c @@ -24,17 +24,35 @@ #include #include @@ -316855,8 +316855,8 @@ .set_color_key = omap_dispc_set_color_key, .get_color_key = omap_dispc_get_color_key, .mmap = omap_dispc_mmap_user, ---- kernel-2.6.28.orig/drivers/video/omap/dispc.h -+++ kernel-2.6.28/drivers/video/omap/dispc.h +--- kernel-maemo-2.6.28.orig/drivers/video/omap/dispc.h ++++ kernel-maemo-2.6.28/drivers/video/omap/dispc.h @@ -2,6 +2,7 @@ #define _DISPC_H @@ -316919,8 +316919,8 @@ +#endif + #endif ---- kernel-2.6.28.orig/drivers/video/omap/hwa742.c -+++ kernel-2.6.28/drivers/video/omap/hwa742.c +--- kernel-maemo-2.6.28.orig/drivers/video/omap/hwa742.c ++++ kernel-maemo-2.6.28/drivers/video/omap/hwa742.c @@ -25,9 +25,9 @@ #include #include @@ -316933,7 +316933,7 @@ #define HWA742_REV_CODE_REG 0x0 --- /dev/null -+++ kernel-2.6.28/drivers/video/omap/lcd_2430sdp.c ++++ kernel-maemo-2.6.28/drivers/video/omap/lcd_2430sdp.c @@ -0,0 +1,199 @@ +/* + * LCD panel support for the TI 2430SDP board @@ -317135,7 +317135,7 @@ +module_init(sdp2430_panel_drv_init); +module_exit(sdp2430_panel_drv_exit); --- /dev/null -+++ kernel-2.6.28/drivers/video/omap/lcd_ams_delta.c ++++ kernel-maemo-2.6.28/drivers/video/omap/lcd_ams_delta.c @@ -0,0 +1,140 @@ +/* + * File: drivers/video/omap/lcd_ams_delta.c @@ -317278,7 +317278,7 @@ +module_init(ams_delta_panel_drv_init); +module_exit(ams_delta_panel_drv_cleanup); --- /dev/null -+++ kernel-2.6.28/drivers/video/omap/lcd_apollon.c ++++ kernel-maemo-2.6.28/drivers/video/omap/lcd_apollon.c @@ -0,0 +1,137 @@ +/* + * LCD panel support for the Samsung OMAP2 Apollon board @@ -317417,8 +317417,8 @@ + +module_init(apollon_panel_drv_init); +module_exit(apollon_panel_drv_exit); ---- kernel-2.6.28.orig/drivers/video/omap/lcd_h3.c -+++ kernel-2.6.28/drivers/video/omap/lcd_h3.c +--- kernel-maemo-2.6.28.orig/drivers/video/omap/lcd_h3.c ++++ kernel-maemo-2.6.28/drivers/video/omap/lcd_h3.c @@ -22,9 +22,9 @@ #include #include @@ -317430,8 +317430,8 @@ #define MODULE_NAME "omapfb-lcd_h3" ---- kernel-2.6.28.orig/drivers/video/omap/lcd_h4.c -+++ kernel-2.6.28/drivers/video/omap/lcd_h4.c +--- kernel-maemo-2.6.28.orig/drivers/video/omap/lcd_h4.c ++++ kernel-maemo-2.6.28/drivers/video/omap/lcd_h4.c @@ -21,8 +21,7 @@ #include @@ -317442,8 +317442,8 @@ static int h4_panel_init(struct lcd_panel *panel, struct omapfb_device *fbdev) { ---- kernel-2.6.28.orig/drivers/video/omap/lcd_inn1510.c -+++ kernel-2.6.28/drivers/video/omap/lcd_inn1510.c +--- kernel-maemo-2.6.28.orig/drivers/video/omap/lcd_inn1510.c ++++ kernel-maemo-2.6.28/drivers/video/omap/lcd_inn1510.c @@ -22,9 +22,9 @@ #include #include @@ -317455,8 +317455,8 @@ static int innovator1510_panel_init(struct lcd_panel *panel, struct omapfb_device *fbdev) ---- kernel-2.6.28.orig/drivers/video/omap/lcd_inn1610.c -+++ kernel-2.6.28/drivers/video/omap/lcd_inn1610.c +--- kernel-maemo-2.6.28.orig/drivers/video/omap/lcd_inn1610.c ++++ kernel-maemo-2.6.28/drivers/video/omap/lcd_inn1610.c @@ -21,9 +21,9 @@ #include @@ -317469,7 +317469,7 @@ #define MODULE_NAME "omapfb-lcd_h3" --- /dev/null -+++ kernel-2.6.28/drivers/video/omap/lcd_ldp.c ++++ kernel-maemo-2.6.28/drivers/video/omap/lcd_ldp.c @@ -0,0 +1,200 @@ +/* + * LCD panel support for the TI LDP board @@ -317672,7 +317672,7 @@ +module_init(ldp_panel_drv_init); +module_exit(ldp_panel_drv_exit); --- /dev/null -+++ kernel-2.6.28/drivers/video/omap/lcd_mipid.c ++++ kernel-maemo-2.6.28/drivers/video/omap/lcd_mipid.c @@ -0,0 +1,901 @@ +/* + * LCD driver for MIPI DBI-C / DCS compatible LCDs @@ -318576,7 +318576,7 @@ +MODULE_DESCRIPTION("MIPI display driver"); +MODULE_LICENSE("GPL"); --- /dev/null -+++ kernel-2.6.28/drivers/video/omap/lcd_omap2evm.c ++++ kernel-maemo-2.6.28/drivers/video/omap/lcd_omap2evm.c @@ -0,0 +1,189 @@ +/* + * LCD panel support for the MISTRAL OMAP2EVM board @@ -318768,7 +318768,7 @@ +module_init(omap2evm_panel_drv_init); +module_exit(omap2evm_panel_drv_exit); --- /dev/null -+++ kernel-2.6.28/drivers/video/omap/lcd_omap3beagle.c ++++ kernel-maemo-2.6.28/drivers/video/omap/lcd_omap3beagle.c @@ -0,0 +1,133 @@ +/* + * LCD panel support for the TI OMAP3 Beagle board @@ -318904,7 +318904,7 @@ +module_init(omap3beagle_panel_drv_init); +module_exit(omap3beagle_panel_drv_exit); --- /dev/null -+++ kernel-2.6.28/drivers/video/omap/lcd_omap3evm.c ++++ kernel-maemo-2.6.28/drivers/video/omap/lcd_omap3evm.c @@ -0,0 +1,191 @@ +/* + * LCD panel support for the TI OMAP3 EVM board @@ -319097,8 +319097,8 @@ + +module_init(omap3evm_panel_drv_init); +module_exit(omap3evm_panel_drv_exit); ---- kernel-2.6.28.orig/drivers/video/omap/lcd_osk.c -+++ kernel-2.6.28/drivers/video/omap/lcd_osk.c +--- kernel-maemo-2.6.28.orig/drivers/video/omap/lcd_osk.c ++++ kernel-maemo-2.6.28/drivers/video/omap/lcd_osk.c @@ -22,10 +22,10 @@ #include @@ -319112,7 +319112,7 @@ static int osk_panel_init(struct lcd_panel *panel, struct omapfb_device *fbdev) { --- /dev/null -+++ kernel-2.6.28/drivers/video/omap/lcd_overo.c ++++ kernel-maemo-2.6.28/drivers/video/omap/lcd_overo.c @@ -0,0 +1,179 @@ +/* + * LCD panel support for the Gumstix Overo @@ -319294,7 +319294,7 @@ +module_init(overo_panel_drv_init); +module_exit(overo_panel_drv_exit); --- /dev/null -+++ kernel-2.6.28/drivers/video/omap/lcd_p2.c ++++ kernel-maemo-2.6.28/drivers/video/omap/lcd_p2.c @@ -0,0 +1,340 @@ +/* + * LCD panel support for the TI OMAP P2 board @@ -319636,8 +319636,8 @@ +module_init(p2_panel_drv_init); +module_exit(p2_panel_drv_cleanup); + ---- kernel-2.6.28.orig/drivers/video/omap/lcd_palmte.c -+++ kernel-2.6.28/drivers/video/omap/lcd_palmte.c +--- kernel-maemo-2.6.28.orig/drivers/video/omap/lcd_palmte.c ++++ kernel-maemo-2.6.28/drivers/video/omap/lcd_palmte.c @@ -22,9 +22,9 @@ #include #include @@ -319649,8 +319649,8 @@ static int palmte_panel_init(struct lcd_panel *panel, struct omapfb_device *fbdev) ---- kernel-2.6.28.orig/drivers/video/omap/lcd_palmtt.c -+++ kernel-2.6.28/drivers/video/omap/lcd_palmtt.c +--- kernel-maemo-2.6.28.orig/drivers/video/omap/lcd_palmtt.c ++++ kernel-maemo-2.6.28/drivers/video/omap/lcd_palmtt.c @@ -28,9 +28,9 @@ #include #include @@ -319662,8 +319662,8 @@ static int palmtt_panel_init(struct lcd_panel *panel, struct omapfb_device *fbdev) ---- kernel-2.6.28.orig/drivers/video/omap/lcd_palmz71.c -+++ kernel-2.6.28/drivers/video/omap/lcd_palmz71.c +--- kernel-maemo-2.6.28.orig/drivers/video/omap/lcd_palmz71.c ++++ kernel-maemo-2.6.28/drivers/video/omap/lcd_palmz71.c @@ -23,8 +23,7 @@ #include #include @@ -319674,8 +319674,8 @@ static int palmz71_panel_init(struct lcd_panel *panel, struct omapfb_device *fbdev) ---- kernel-2.6.28.orig/drivers/video/omap/lcdc.c -+++ kernel-2.6.28/drivers/video/omap/lcdc.c +--- kernel-maemo-2.6.28.orig/drivers/video/omap/lcdc.c ++++ kernel-maemo-2.6.28/drivers/video/omap/lcdc.c @@ -28,9 +28,9 @@ #include #include @@ -319687,8 +319687,8 @@ #include ---- kernel-2.6.28.orig/drivers/video/omap/omapfb_main.c -+++ kernel-2.6.28/drivers/video/omap/omapfb_main.c +--- kernel-maemo-2.6.28.orig/drivers/video/omap/omapfb_main.c ++++ kernel-maemo-2.6.28/drivers/video/omap/omapfb_main.c @@ -27,9 +27,9 @@ #include #include @@ -320470,8 +320470,8 @@ return 0; } ---- kernel-2.6.28.orig/drivers/video/omap/rfbi.c -+++ kernel-2.6.28/drivers/video/omap/rfbi.c +--- kernel-maemo-2.6.28.orig/drivers/video/omap/rfbi.c ++++ kernel-maemo-2.6.28/drivers/video/omap/rfbi.c @@ -2,7 +2,7 @@ * OMAP2 Remote Frame Buffer Interface support * @@ -320518,8 +320518,8 @@ rfbi_put_clocks(); iounmap(rfbi.base); } ---- kernel-2.6.28.orig/drivers/video/omap/sossi.c -+++ kernel-2.6.28/drivers/video/omap/sossi.c +--- kernel-maemo-2.6.28.orig/drivers/video/omap/sossi.c ++++ kernel-maemo-2.6.28/drivers/video/omap/sossi.c @@ -2,7 +2,7 @@ * OMAP1 Special OptimiSed Screen Interface support * @@ -320541,7 +320541,7 @@ #include "lcdc.h" --- /dev/null -+++ kernel-2.6.28/drivers/video/omap/venc.c ++++ kernel-maemo-2.6.28/drivers/video/omap/venc.c @@ -0,0 +1,557 @@ +/* + * linux/arch/arm/plat-omap/dss/venc.c @@ -321101,20 +321101,20 @@ + iounmap(venc.base); +} --- /dev/null -+++ kernel-2.6.28/drivers/video/omap2/Kconfig ++++ kernel-maemo-2.6.28/drivers/video/omap2/Kconfig @@ -0,0 +1,3 @@ +source "drivers/video/omap2/dss/Kconfig" +source "drivers/video/omap2/displays/Kconfig" +source "drivers/video/omap2/omapfb/Kconfig" --- /dev/null -+++ kernel-2.6.28/drivers/video/omap2/Makefile ++++ kernel-maemo-2.6.28/drivers/video/omap2/Makefile @@ -0,0 +1,4 @@ +# OMAP2/3 Display Subsystem +obj-y += dss/ +obj-y += displays/ +obj-y += omapfb/ --- /dev/null -+++ kernel-2.6.28/drivers/video/omap2/displays/Kconfig ++++ kernel-maemo-2.6.28/drivers/video/omap2/displays/Kconfig @@ -0,0 +1,45 @@ +menu "OMAP2/3 Display Device Drivers" + depends on OMAP2_DSS @@ -321162,7 +321162,7 @@ + LCD Panel used in TI's SDP3430 and EVM boards +endmenu --- /dev/null -+++ kernel-2.6.28/drivers/video/omap2/displays/Makefile ++++ kernel-maemo-2.6.28/drivers/video/omap2/displays/Makefile @@ -0,0 +1,9 @@ +obj-$(CONFIG_PANEL_NEVADA) += panel-nevada.o +obj-$(CONFIG_CTRL_ZONDA) += ctrl-zonda.o @@ -321174,7 +321174,7 @@ +obj-$(CONFIG_PANEL_SAMSUNG_LTE430WQ_F0C) += panel-samsung-lte430wq-f0c.o +obj-$(CONFIG_PANEL_SHARP_LS037V7DW01) += panel-sharp-ls037v7dw01.o --- /dev/null -+++ kernel-2.6.28/drivers/video/omap2/displays/ctrl-zonda.c ++++ kernel-maemo-2.6.28/drivers/video/omap2/displays/ctrl-zonda.c @@ -0,0 +1,631 @@ +/* + * TC358731XBG, eDisco @@ -321808,7 +321808,7 @@ +MODULE_DESCRIPTION("Zonda Driver"); +MODULE_LICENSE("GPL"); --- /dev/null -+++ kernel-2.6.28/drivers/video/omap2/displays/panel-acx565akm.c ++++ kernel-maemo-2.6.28/drivers/video/omap2/displays/panel-acx565akm.c @@ -0,0 +1,737 @@ +#include +#include @@ -322548,7 +322548,7 @@ +MODULE_DESCRIPTION("acx565akm LCD Driver"); +MODULE_LICENSE("GPL"); --- /dev/null -+++ kernel-2.6.28/drivers/video/omap2/displays/panel-acx565akm.h ++++ kernel-maemo-2.6.28/drivers/video/omap2/displays/panel-acx565akm.h @@ -0,0 +1,9 @@ +#ifndef __DRIVERS_VIDEO_OMAP2_DISPLAYS_PANEL_ACX565AKM_H +#define __DRIVERS_VIDEO_OMAP2_DISPLAYS_PANEL_ACX565AKM_H @@ -322560,7 +322560,7 @@ +#endif + --- /dev/null -+++ kernel-2.6.28/drivers/video/omap2/displays/panel-generic.c ++++ kernel-maemo-2.6.28/drivers/video/omap2/displays/panel-generic.c @@ -0,0 +1,96 @@ +/* + * Generic panel support @@ -322659,7 +322659,7 @@ +module_exit(generic_panel_drv_exit); +MODULE_LICENSE("GPL"); --- /dev/null -+++ kernel-2.6.28/drivers/video/omap2/displays/panel-nevada.c ++++ kernel-maemo-2.6.28/drivers/video/omap2/displays/panel-nevada.c @@ -0,0 +1,558 @@ +/* + * DMIF-S99AL-V225 @@ -323220,7 +323220,7 @@ +MODULE_DESCRIPTION("Caucasus LCD Driver"); +MODULE_LICENSE("GPL"); --- /dev/null -+++ kernel-2.6.28/drivers/video/omap2/displays/panel-samsung-lte430wq-f0c.c ++++ kernel-maemo-2.6.28/drivers/video/omap2/displays/panel-samsung-lte430wq-f0c.c @@ -0,0 +1,108 @@ +/* + * LCD panel driver for Samsung LTE430WQ-F0C @@ -323331,7 +323331,7 @@ +module_exit(samsung_lte_panel_drv_exit); +MODULE_LICENSE("GPL"); --- /dev/null -+++ kernel-2.6.28/drivers/video/omap2/displays/panel-sharp-ls037v7dw01.c ++++ kernel-maemo-2.6.28/drivers/video/omap2/displays/panel-sharp-ls037v7dw01.c @@ -0,0 +1,112 @@ +/* + * LCD panel driver for Sharp LS037V7DW01 @@ -323446,7 +323446,7 @@ +module_exit(sharp_ls_panel_drv_exit); +MODULE_LICENSE("GPL"); --- /dev/null -+++ kernel-2.6.28/drivers/video/omap2/displays/panel-taal.c ++++ kernel-maemo-2.6.28/drivers/video/omap2/displays/panel-taal.c @@ -0,0 +1,620 @@ +/* + * Taal @@ -324069,7 +324069,7 @@ +MODULE_DESCRIPTION("Taal Driver"); +MODULE_LICENSE("GPL"); --- /dev/null -+++ kernel-2.6.28/drivers/video/omap2/dss/Kconfig ++++ kernel-maemo-2.6.28/drivers/video/omap2/dss/Kconfig @@ -0,0 +1,99 @@ +menuconfig OMAP2_DSS + tristate "OMAP2/3 Display Subsystem support (EXPERIMENTAL)" @@ -324171,7 +324171,7 @@ + +endif --- /dev/null -+++ kernel-2.6.28/drivers/video/omap2/dss/Makefile ++++ kernel-maemo-2.6.28/drivers/video/omap2/dss/Makefile @@ -0,0 +1,6 @@ +obj-$(CONFIG_OMAP2_DSS) += omapdss.o +omapdss-y := core.o dss.o dispc.o dpi.o display.o manager.o overlay.o @@ -324180,7 +324180,7 @@ +omapdss-$(CONFIG_OMAP2_DSS_SDI) += sdi.o +omapdss-$(CONFIG_OMAP2_DSS_DSI) += dsi.o --- /dev/null -+++ kernel-2.6.28/drivers/video/omap2/dss/core.c ++++ kernel-maemo-2.6.28/drivers/video/omap2/dss/core.c @@ -0,0 +1,854 @@ +/* + * linux/drivers/video/omap2/dss/core.c @@ -325037,7 +325037,7 @@ +MODULE_LICENSE("GPL v2"); + --- /dev/null -+++ kernel-2.6.28/drivers/video/omap2/dss/dispc.c ++++ kernel-maemo-2.6.28/drivers/video/omap2/dss/dispc.c @@ -0,0 +1,3568 @@ +/* + * linux/drivers/video/omap2/dss/dispc.c @@ -328608,7 +328608,7 @@ +} + --- /dev/null -+++ kernel-2.6.28/drivers/video/omap2/dss/display.c ++++ kernel-maemo-2.6.28/drivers/video/omap2/dss/display.c @@ -0,0 +1,800 @@ +/* + * linux/drivers/video/omap2/dss/display.c @@ -329411,7 +329411,7 @@ +} +EXPORT_SYMBOL(omap_dss_unregister_panel); --- /dev/null -+++ kernel-2.6.28/drivers/video/omap2/dss/dpi.c ++++ kernel-maemo-2.6.28/drivers/video/omap2/dss/dpi.c @@ -0,0 +1,395 @@ +/* + * linux/drivers/video/omap2/dss/dpi.c @@ -329809,7 +329809,7 @@ +} + --- /dev/null -+++ kernel-2.6.28/drivers/video/omap2/dss/dsi.c ++++ kernel-maemo-2.6.28/drivers/video/omap2/dss/dsi.c @@ -0,0 +1,3873 @@ +/* + * linux/drivers/video/omap2/dss/dsi.c @@ -333685,7 +333685,7 @@ +} + --- /dev/null -+++ kernel-2.6.28/drivers/video/omap2/dss/dss.c ++++ kernel-maemo-2.6.28/drivers/video/omap2/dss/dss.c @@ -0,0 +1,387 @@ +/* + * linux/drivers/video/omap2/dss/dss.c @@ -334075,7 +334075,7 @@ +} + --- /dev/null -+++ kernel-2.6.28/drivers/video/omap2/dss/dss.h ++++ kernel-maemo-2.6.28/drivers/video/omap2/dss/dss.h @@ -0,0 +1,352 @@ +/* + * linux/drivers/video/omap2/dss/dss.h @@ -334430,7 +334430,7 @@ + +#endif --- /dev/null -+++ kernel-2.6.28/drivers/video/omap2/dss/manager.c ++++ kernel-maemo-2.6.28/drivers/video/omap2/dss/manager.c @@ -0,0 +1,747 @@ +/* + * linux/drivers/video/omap2/dss/manager.c @@ -335180,7 +335180,7 @@ +#endif + --- /dev/null -+++ kernel-2.6.28/drivers/video/omap2/dss/overlay.c ++++ kernel-maemo-2.6.28/drivers/video/omap2/dss/overlay.c @@ -0,0 +1,655 @@ +/* + * linux/drivers/video/omap2/dss/overlay.c @@ -335838,7 +335838,7 @@ +} + --- /dev/null -+++ kernel-2.6.28/drivers/video/omap2/dss/rfbi.c ++++ kernel-maemo-2.6.28/drivers/video/omap2/dss/rfbi.c @@ -0,0 +1,1306 @@ +/* + * linux/drivers/video/omap2/dss/rfbi.c @@ -337147,7 +337147,7 @@ + return 0; +} --- /dev/null -+++ kernel-2.6.28/drivers/video/omap2/dss/sdi.c ++++ kernel-maemo-2.6.28/drivers/video/omap2/dss/sdi.c @@ -0,0 +1,387 @@ +/* + * linux/drivers/video/omap2/dss/sdi.c @@ -337537,7 +337537,7 @@ +{ +} --- /dev/null -+++ kernel-2.6.28/drivers/video/omap2/dss/venc.c ++++ kernel-maemo-2.6.28/drivers/video/omap2/dss/venc.c @@ -0,0 +1,718 @@ +/* + * linux/drivers/video/omap2/dss/venc.c @@ -338258,7 +338258,7 @@ +#undef DUMPREG +} --- /dev/null -+++ kernel-2.6.28/drivers/video/omap2/omapfb/Kconfig ++++ kernel-maemo-2.6.28/drivers/video/omap2/omapfb/Kconfig @@ -0,0 +1,35 @@ +menuconfig FB_OMAP2 + tristate "OMAP2/3 frame buffer support (EXPERIMENTAL)" @@ -338296,12 +338296,12 @@ + Select the number of framebuffers created. OMAP2/3 has 3 overlays + so normally this would be 3. --- /dev/null -+++ kernel-2.6.28/drivers/video/omap2/omapfb/Makefile ++++ kernel-maemo-2.6.28/drivers/video/omap2/omapfb/Makefile @@ -0,0 +1,2 @@ +obj-$(CONFIG_FB_OMAP2) += omapfb.o +omapfb-y := omapfb-main.o omapfb-sysfs.o omapfb-ioctl.o --- /dev/null -+++ kernel-2.6.28/drivers/video/omap2/omapfb/omapfb-ioctl.c ++++ kernel-maemo-2.6.28/drivers/video/omap2/omapfb/omapfb-ioctl.c @@ -0,0 +1,760 @@ +/* + * linux/drivers/video/omap2/omapfb-ioctl.c @@ -339064,7 +339064,7 @@ + + --- /dev/null -+++ kernel-2.6.28/drivers/video/omap2/omapfb/omapfb-main.c ++++ kernel-maemo-2.6.28/drivers/video/omap2/omapfb/omapfb-main.c @@ -0,0 +1,2232 @@ +/* + * linux/drivers/video/omap2/omapfb-main.c @@ -341299,7 +341299,7 @@ +MODULE_DESCRIPTION("OMAP2/3 Framebuffer"); +MODULE_LICENSE("GPL v2"); --- /dev/null -+++ kernel-2.6.28/drivers/video/omap2/omapfb/omapfb-sysfs.c ++++ kernel-maemo-2.6.28/drivers/video/omap2/omapfb/omapfb-sysfs.c @@ -0,0 +1,496 @@ +/* + * linux/drivers/video/omap2/omapfb-sysfs.c @@ -341798,7 +341798,7 @@ +} + --- /dev/null -+++ kernel-2.6.28/drivers/video/omap2/omapfb/omapfb.h ++++ kernel-maemo-2.6.28/drivers/video/omap2/omapfb/omapfb.h @@ -0,0 +1,149 @@ +/* + * linux/drivers/video/omap2/omapfb.h @@ -341949,8 +341949,8 @@ +} + +#endif ---- kernel-2.6.28.orig/drivers/watchdog/Kconfig -+++ kernel-2.6.28/drivers/watchdog/Kconfig +--- kernel-maemo-2.6.28.orig/drivers/watchdog/Kconfig ++++ kernel-maemo-2.6.28/drivers/watchdog/Kconfig @@ -180,10 +180,10 @@ config OMAP_WATCHDOG @@ -341979,8 +341979,8 @@ # ARM26 Architecture # AVR32 Architecture ---- kernel-2.6.28.orig/drivers/watchdog/Makefile -+++ kernel-2.6.28/drivers/watchdog/Makefile +--- kernel-maemo-2.6.28.orig/drivers/watchdog/Makefile ++++ kernel-maemo-2.6.28/drivers/watchdog/Makefile @@ -28,6 +28,7 @@ obj-$(CONFIG_AT91RM9200_WATCHDOG) += at91rm9200_wdt.o obj-$(CONFIG_AT91SAM9X_WATCHDOG) += at91sam9_wdt.o @@ -341989,8 +341989,8 @@ obj-$(CONFIG_21285_WATCHDOG) += wdt285.o obj-$(CONFIG_977_WATCHDOG) += wdt977.o obj-$(CONFIG_IXP2000_WATCHDOG) += ixp2000_wdt.o ---- kernel-2.6.28.orig/drivers/watchdog/omap_wdt.c -+++ kernel-2.6.28/drivers/watchdog/omap_wdt.c +--- kernel-maemo-2.6.28.orig/drivers/watchdog/omap_wdt.c ++++ kernel-maemo-2.6.28/drivers/watchdog/omap_wdt.c @@ -53,18 +53,27 @@ module_param(timer_margin, uint, 0); MODULE_PARM_DESC(timer_margin, "initial watchdog timeout (in seconds)"); @@ -342342,7 +342342,7 @@ } --- /dev/null -+++ kernel-2.6.28/drivers/watchdog/twl4030_wdt.c ++++ kernel-maemo-2.6.28/drivers/watchdog/twl4030_wdt.c @@ -0,0 +1,299 @@ +/* + * Copyright (C) Nokia Corporation @@ -342643,8 +342643,8 @@ +MODULE_AUTHOR("Nokia Corporation"); +MODULE_LICENSE("GPL"); +MODULE_ALIAS("platform:twl4030_wdt"); ---- kernel-2.6.28.orig/fs/affs/bitmap.c -+++ kernel-2.6.28/fs/affs/bitmap.c +--- kernel-maemo-2.6.28.orig/fs/affs/bitmap.c ++++ kernel-maemo-2.6.28/fs/affs/bitmap.c @@ -102,7 +102,7 @@ *(__be32 *)bh->b_data = cpu_to_be32(tmp - mask); @@ -342663,8 +342663,8 @@ mutex_unlock(&sbi->s_bmlock); ---- kernel-2.6.28.orig/fs/affs/super.c -+++ kernel-2.6.28/fs/affs/super.c +--- kernel-maemo-2.6.28.orig/fs/affs/super.c ++++ kernel-maemo-2.6.28/fs/affs/super.c @@ -60,9 +60,13 @@ &AFFS_ROOT_TAIL(sb, sbi->s_root_bh)->disk_change); affs_fix_checksum(sb, sbi->s_root_bh); @@ -342692,8 +342692,8 @@ affs_write_super(sb); affs_free_bitmap(sb); } else ---- kernel-2.6.28.orig/fs/bfs/inode.c -+++ kernel-2.6.28/fs/bfs/inode.c +--- kernel-maemo-2.6.28.orig/fs/bfs/inode.c ++++ kernel-maemo-2.6.28/fs/bfs/inode.c @@ -244,7 +244,7 @@ mutex_lock(&info->bfs_lock); if (!(s->s_flags & MS_RDONLY)) @@ -342712,8 +342712,8 @@ } dump_imap("read_super", s); mutex_init(&info->bfs_lock); ---- kernel-2.6.28.orig/fs/eventpoll.c -+++ kernel-2.6.28/fs/eventpoll.c +--- kernel-maemo-2.6.28.orig/fs/eventpoll.c ++++ kernel-maemo-2.6.28/fs/eventpoll.c @@ -234,8 +234,6 @@ /* * Configuration options available inside /proc/sys/fs/epoll/ @@ -342778,8 +342778,8 @@ EP_ITEM_COST; /* Initialize the structure used to perform safe poll wait head wake ups */ ---- kernel-2.6.28.orig/fs/exec.c -+++ kernel-2.6.28/fs/exec.c +--- kernel-maemo-2.6.28.orig/fs/exec.c ++++ kernel-maemo-2.6.28/fs/exec.c @@ -1778,6 +1778,14 @@ goto fail_unlock; @@ -342811,8 +342811,8 @@ &file)) { printk(KERN_INFO "Core dump to %s pipe failed\n", corename); ---- kernel-2.6.28.orig/fs/ext2/balloc.c -+++ kernel-2.6.28/fs/ext2/balloc.c +--- kernel-maemo-2.6.28.orig/fs/ext2/balloc.c ++++ kernel-maemo-2.6.28/fs/ext2/balloc.c @@ -164,7 +164,7 @@ struct ext2_sb_info *sbi = EXT2_SB(sb); @@ -342831,8 +342831,8 @@ mark_buffer_dirty(bh); } } ---- kernel-2.6.28.orig/fs/ext2/ialloc.c -+++ kernel-2.6.28/fs/ext2/ialloc.c +--- kernel-maemo-2.6.28.orig/fs/ext2/ialloc.c ++++ kernel-maemo-2.6.28/fs/ext2/ialloc.c @@ -81,7 +81,7 @@ spin_unlock(sb_bgl_lock(EXT2_SB(sb), group)); if (dir) @@ -342851,8 +342851,8 @@ mark_buffer_dirty(bh2); inode->i_uid = current->fsuid; if (test_opt (sb, GRPID)) ---- kernel-2.6.28.orig/fs/ext2/super.c -+++ kernel-2.6.28/fs/ext2/super.c +--- kernel-maemo-2.6.28.orig/fs/ext2/super.c ++++ kernel-maemo-2.6.28/fs/ext2/super.c @@ -1094,7 +1094,7 @@ { es->s_wtime = cpu_to_le32(get_seconds()); @@ -342880,8 +342880,8 @@ unlock_kernel(); } ---- kernel-2.6.28.orig/fs/ext2/xattr.c -+++ kernel-2.6.28/fs/ext2/xattr.c +--- kernel-maemo-2.6.28.orig/fs/ext2/xattr.c ++++ kernel-maemo-2.6.28/fs/ext2/xattr.c @@ -343,7 +343,7 @@ return; @@ -342891,8 +342891,8 @@ mark_buffer_dirty(EXT2_SB(sb)->s_sbh); } ---- kernel-2.6.28.orig/fs/ext3/balloc.c -+++ kernel-2.6.28/fs/ext3/balloc.c +--- kernel-maemo-2.6.28.orig/fs/ext3/balloc.c ++++ kernel-maemo-2.6.28/fs/ext3/balloc.c @@ -649,7 +649,7 @@ count = overflow; goto do_more; @@ -342911,8 +342911,8 @@ if (fatal) goto out; ---- kernel-2.6.28.orig/fs/ext3/ialloc.c -+++ kernel-2.6.28/fs/ext3/ialloc.c +--- kernel-maemo-2.6.28.orig/fs/ext3/ialloc.c ++++ kernel-maemo-2.6.28/fs/ext3/ialloc.c @@ -181,7 +181,7 @@ err = ext3_journal_dirty_metadata(handle, bitmap_bh); if (!fatal) @@ -342931,8 +342931,8 @@ inode->i_uid = current->fsuid; if (test_opt (sb, GRPID)) ---- kernel-2.6.28.orig/fs/ext3/inode.c -+++ kernel-2.6.28/fs/ext3/inode.c +--- kernel-maemo-2.6.28.orig/fs/ext3/inode.c ++++ kernel-maemo-2.6.28/fs/ext3/inode.c @@ -2924,7 +2924,7 @@ ext3_update_dynamic_rev(sb); EXT3_SET_RO_COMPAT_FEATURE(sb, @@ -342942,8 +342942,8 @@ handle->h_sync = 1; err = ext3_journal_dirty_metadata(handle, EXT3_SB(sb)->s_sbh); ---- kernel-2.6.28.orig/fs/ext3/resize.c -+++ kernel-2.6.28/fs/ext3/resize.c +--- kernel-maemo-2.6.28.orig/fs/ext3/resize.c ++++ kernel-maemo-2.6.28/fs/ext3/resize.c @@ -934,7 +934,7 @@ EXT3_INODES_PER_GROUP(sb)); @@ -342962,8 +342962,8 @@ unlock_super(sb); ext3_debug("freeing blocks %lu through "E3FSBLK"\n", o_blocks_count, o_blocks_count + add); ---- kernel-2.6.28.orig/fs/ext3/super.c -+++ kernel-2.6.28/fs/ext3/super.c +--- kernel-maemo-2.6.28.orig/fs/ext3/super.c ++++ kernel-maemo-2.6.28/fs/ext3/super.c @@ -2221,7 +2221,7 @@ if (journal_devnum && journal_devnum != le32_to_cpu(es->s_journal_dev)) { @@ -343024,8 +343024,8 @@ if (!(sb->s_flags & MS_RDONLY)) { journal_t *journal = EXT3_SB(sb)->s_journal; ---- kernel-2.6.28.orig/fs/ext3/xattr.c -+++ kernel-2.6.28/fs/ext3/xattr.c +--- kernel-maemo-2.6.28.orig/fs/ext3/xattr.c ++++ kernel-maemo-2.6.28/fs/ext3/xattr.c @@ -463,7 +463,7 @@ if (ext3_journal_get_write_access(handle, EXT3_SB(sb)->s_sbh) == 0) { @@ -343035,8 +343035,8 @@ ext3_journal_dirty_metadata(handle, EXT3_SB(sb)->s_sbh); } } ---- kernel-2.6.28.orig/fs/ext4/balloc.c -+++ kernel-2.6.28/fs/ext4/balloc.c +--- kernel-maemo-2.6.28.orig/fs/ext4/balloc.c ++++ kernel-maemo-2.6.28/fs/ext4/balloc.c @@ -544,7 +544,7 @@ count = overflow; goto do_more; @@ -343046,8 +343046,8 @@ error_return: brelse(bitmap_bh); ext4_std_error(sb, err); ---- kernel-2.6.28.orig/fs/ext4/ialloc.c -+++ kernel-2.6.28/fs/ext4/ialloc.c +--- kernel-maemo-2.6.28.orig/fs/ext4/ialloc.c ++++ kernel-maemo-2.6.28/fs/ext4/ialloc.c @@ -261,7 +261,7 @@ err = ext4_journal_dirty_metadata(handle, bitmap_bh); if (!fatal) @@ -343066,8 +343066,8 @@ if (sbi->s_log_groups_per_flex) { flex_group = ext4_flex_group(sbi, group); ---- kernel-2.6.28.orig/fs/ext4/inode.c -+++ kernel-2.6.28/fs/ext4/inode.c +--- kernel-maemo-2.6.28.orig/fs/ext4/inode.c ++++ kernel-maemo-2.6.28/fs/ext4/inode.c @@ -4309,7 +4309,7 @@ ext4_update_dynamic_rev(sb); EXT4_SET_RO_COMPAT_FEATURE(sb, @@ -343077,8 +343077,8 @@ handle->h_sync = 1; err = ext4_journal_dirty_metadata(handle, EXT4_SB(sb)->s_sbh); ---- kernel-2.6.28.orig/fs/ext4/mballoc.c -+++ kernel-2.6.28/fs/ext4/mballoc.c +--- kernel-maemo-2.6.28.orig/fs/ext4/mballoc.c ++++ kernel-maemo-2.6.28/fs/ext4/mballoc.c @@ -2905,7 +2905,7 @@ err = ext4_journal_dirty_metadata(handle, gdp_bh); @@ -343097,8 +343097,8 @@ error_return: brelse(bitmap_bh); ext4_std_error(sb, err); ---- kernel-2.6.28.orig/fs/ext4/resize.c -+++ kernel-2.6.28/fs/ext4/resize.c +--- kernel-maemo-2.6.28.orig/fs/ext4/resize.c ++++ kernel-maemo-2.6.28/fs/ext4/resize.c @@ -938,7 +938,7 @@ } @@ -343117,8 +343117,8 @@ unlock_super(sb); ext4_debug("freeing blocks %llu through %llu\n", o_blocks_count, o_blocks_count + add); ---- kernel-2.6.28.orig/fs/ext4/super.c -+++ kernel-2.6.28/fs/ext4/super.c +--- kernel-maemo-2.6.28.orig/fs/ext4/super.c ++++ kernel-maemo-2.6.28/fs/ext4/super.c @@ -2710,7 +2710,7 @@ if (journal_devnum && journal_devnum != le32_to_cpu(es->s_journal_dev)) { @@ -343182,8 +343182,8 @@ if (!(sb->s_flags & MS_RDONLY)) { journal_t *journal = EXT4_SB(sb)->s_journal; ---- kernel-2.6.28.orig/fs/ext4/xattr.c -+++ kernel-2.6.28/fs/ext4/xattr.c +--- kernel-maemo-2.6.28.orig/fs/ext4/xattr.c ++++ kernel-maemo-2.6.28/fs/ext4/xattr.c @@ -456,7 +456,7 @@ if (ext4_journal_get_write_access(handle, EXT4_SB(sb)->s_sbh) == 0) { @@ -343193,8 +343193,8 @@ ext4_journal_dirty_metadata(handle, EXT4_SB(sb)->s_sbh); } } ---- kernel-2.6.28.orig/fs/fat/cache.c -+++ kernel-2.6.28/fs/fat/cache.c +--- kernel-maemo-2.6.28.orig/fs/fat/cache.c ++++ kernel-maemo-2.6.28/fs/fat/cache.c @@ -241,7 +241,7 @@ while (*fclus < cluster) { /* prevent the infinite loop of cluster chain */ @@ -343222,8 +343222,8 @@ __func__, MSDOS_I(inode)->i_pos); return -EIO; } ---- kernel-2.6.28.orig/fs/fat/dir.c -+++ kernel-2.6.28/fs/fat/dir.c +--- kernel-maemo-2.6.28.orig/fs/fat/dir.c ++++ kernel-maemo-2.6.28/fs/fat/dir.c @@ -1335,7 +1335,7 @@ goto error_remove; } @@ -343233,8 +343233,8 @@ dir->i_size = (dir->i_size + sbi->cluster_size - 1) & ~((loff_t)sbi->cluster_size - 1); } ---- kernel-2.6.28.orig/fs/fat/fat.h -+++ kernel-2.6.28/fs/fat/fat.h +--- kernel-maemo-2.6.28.orig/fs/fat/fat.h ++++ kernel-maemo-2.6.28/fs/fat/fat.h @@ -17,6 +17,10 @@ #define VFAT_SFN_CREATE_WIN95 0x0100 /* emulate win95 rule for create */ #define VFAT_SFN_CREATE_WINNT 0x0200 /* emulate winnt rule for create */ @@ -343263,8 +343263,8 @@ __attribute__ ((format (printf, 2, 3))) __cold; extern void fat_clusters_flush(struct super_block *sb); extern int fat_chain_add(struct inode *inode, int new_dclus, int nr_cluster); ---- kernel-2.6.28.orig/fs/fat/fatent.c -+++ kernel-2.6.28/fs/fat/fatent.c +--- kernel-maemo-2.6.28.orig/fs/fat/fatent.c ++++ kernel-maemo-2.6.28/fs/fat/fatent.c @@ -345,7 +345,7 @@ if (entry < FAT_START_ENT || sbi->max_cluster <= entry) { @@ -343319,8 +343319,8 @@ fatent_brelse(&fatent); out: unlock_fat(sbi); ---- kernel-2.6.28.orig/fs/fat/file.c -+++ kernel-2.6.28/fs/fat/file.c +--- kernel-maemo-2.6.28.orig/fs/fat/file.c ++++ kernel-maemo-2.6.28/fs/fat/file.c @@ -213,7 +213,7 @@ fatent_brelse(&fatent); return 0; @@ -343330,8 +343330,8 @@ "%s: invalid cluster chain (i_pos %lld)", __func__, MSDOS_I(inode)->i_pos); ret = -EIO; ---- kernel-2.6.28.orig/fs/fat/inode.c -+++ kernel-2.6.28/fs/fat/inode.c +--- kernel-maemo-2.6.28.orig/fs/fat/inode.c ++++ kernel-maemo-2.6.28/fs/fat/inode.c @@ -76,7 +76,7 @@ return 0; @@ -343407,8 +343407,8 @@ /* msdos specific */ case Opt_dots: ---- kernel-2.6.28.orig/fs/fat/misc.c -+++ kernel-2.6.28/fs/fat/misc.c +--- kernel-maemo-2.6.28.orig/fs/fat/misc.c ++++ kernel-maemo-2.6.28/fs/fat/misc.c @@ -12,14 +12,19 @@ #include "fat.h" @@ -343461,8 +343461,8 @@ new_fclus, (llu)(inode->i_blocks >> (sbi->cluster_bits - 9))); fat_cache_inval_inode(inode); ---- kernel-2.6.28.orig/fs/fat/namei_msdos.c -+++ kernel-2.6.28/fs/fat/namei_msdos.c +--- kernel-maemo-2.6.28.orig/fs/fat/namei_msdos.c ++++ kernel-maemo-2.6.28/fs/fat/namei_msdos.c @@ -608,7 +608,7 @@ sinfo.bh = NULL; } @@ -343472,8 +343472,8 @@ "%s: Filesystem corrupted (i_pos %lld)", __func__, sinfo.i_pos); } ---- kernel-2.6.28.orig/fs/fat/namei_vfat.c -+++ kernel-2.6.28/fs/fat/namei_vfat.c +--- kernel-maemo-2.6.28.orig/fs/fat/namei_vfat.c ++++ kernel-maemo-2.6.28/fs/fat/namei_vfat.c @@ -1030,7 +1030,7 @@ sinfo.bh = NULL; } @@ -343483,8 +343483,8 @@ "%s: Filesystem corrupted (i_pos %lld)", __func__, sinfo.i_pos); } ---- kernel-2.6.28.orig/fs/fs-writeback.c -+++ kernel-2.6.28/fs/fs-writeback.c +--- kernel-maemo-2.6.28.orig/fs/fs-writeback.c ++++ kernel-maemo-2.6.28/fs/fs-writeback.c @@ -65,6 +65,24 @@ } @@ -343547,8 +343547,8 @@ static int write_inode(struct inode *inode, int sync) { if (inode->i_sb->s_op->write_inode && !is_bad_inode(inode)) ---- kernel-2.6.28.orig/fs/gfs2/log.c -+++ kernel-2.6.28/fs/gfs2/log.c +--- kernel-maemo-2.6.28.orig/fs/gfs2/log.c ++++ kernel-maemo-2.6.28/fs/gfs2/log.c @@ -765,7 +765,7 @@ } gfs2_log_unlock(sdp); @@ -343567,8 +343567,8 @@ up_read(&sdp->sd_log_flush_lock); gfs2_log_lock(sdp); ---- kernel-2.6.28.orig/fs/gfs2/ops_super.c -+++ kernel-2.6.28/fs/gfs2/ops_super.c +--- kernel-maemo-2.6.28.orig/fs/gfs2/ops_super.c ++++ kernel-maemo-2.6.28/fs/gfs2/ops_super.c @@ -196,7 +196,7 @@ static void gfs2_write_super(struct super_block *sb) @@ -343587,8 +343587,8 @@ if (wait && sb->s_fs_info) gfs2_log_flush(sb->s_fs_info, NULL); return 0; ---- kernel-2.6.28.orig/fs/hfs/extent.c -+++ kernel-2.6.28/fs/hfs/extent.c +--- kernel-maemo-2.6.28.orig/fs/hfs/extent.c ++++ kernel-maemo-2.6.28/fs/hfs/extent.c @@ -432,7 +432,7 @@ if (inode->i_ino < HFS_FIRSTUSER_CNID) set_bit(HFS_FLG_ALT_MDB_DIRTY, &HFS_SB(sb)->flags); @@ -343598,8 +343598,8 @@ } return res; ---- kernel-2.6.28.orig/fs/hfs/hfs_fs.h -+++ kernel-2.6.28/fs/hfs/hfs_fs.h +--- kernel-maemo-2.6.28.orig/fs/hfs/hfs_fs.h ++++ kernel-maemo-2.6.28/fs/hfs/hfs_fs.h @@ -251,7 +251,7 @@ static inline void hfs_bitmap_dirty(struct super_block *sb) { @@ -343609,8 +343609,8 @@ } static inline void hfs_buffer_sync(struct buffer_head *bh) ---- kernel-2.6.28.orig/fs/hfs/inode.c -+++ kernel-2.6.28/fs/hfs/inode.c +--- kernel-maemo-2.6.28.orig/fs/hfs/inode.c ++++ kernel-maemo-2.6.28/fs/hfs/inode.c @@ -194,7 +194,7 @@ insert_inode_hash(inode); mark_inode_dirty(inode); @@ -343638,8 +343638,8 @@ } void hfs_inode_read_fork(struct inode *inode, struct hfs_extent *ext, ---- kernel-2.6.28.orig/fs/hfs/super.c -+++ kernel-2.6.28/fs/hfs/super.c +--- kernel-maemo-2.6.28.orig/fs/hfs/super.c ++++ kernel-maemo-2.6.28/fs/hfs/super.c @@ -49,7 +49,7 @@ */ static void hfs_write_super(struct super_block *sb) @@ -343649,8 +343649,8 @@ if (sb->s_flags & MS_RDONLY) return; /* sync everything to the buffers */ ---- kernel-2.6.28.orig/fs/hfsplus/bitmap.c -+++ kernel-2.6.28/fs/hfsplus/bitmap.c +--- kernel-maemo-2.6.28.orig/fs/hfsplus/bitmap.c ++++ kernel-maemo-2.6.28/fs/hfsplus/bitmap.c @@ -151,7 +151,7 @@ kunmap(page); *max = offset + (curr - pptr) * 32 + i - start; @@ -343669,8 +343669,8 @@ mutex_unlock(&HFSPLUS_SB(sb).alloc_file->i_mutex); return 0; ---- kernel-2.6.28.orig/fs/hfsplus/dir.c -+++ kernel-2.6.28/fs/hfsplus/dir.c +--- kernel-maemo-2.6.28.orig/fs/hfsplus/dir.c ++++ kernel-maemo-2.6.28/fs/hfsplus/dir.c @@ -305,7 +305,7 @@ inode->i_ctime = CURRENT_TIME_SEC; mark_inode_dirty(inode); @@ -343680,8 +343680,8 @@ return 0; } ---- kernel-2.6.28.orig/fs/hfsplus/inode.c -+++ kernel-2.6.28/fs/hfsplus/inode.c +--- kernel-maemo-2.6.28.orig/fs/hfsplus/inode.c ++++ kernel-maemo-2.6.28/fs/hfsplus/inode.c @@ -333,7 +333,7 @@ HFSPLUS_SB(sb).file_count++; insert_inode_hash(inode); @@ -343709,8 +343709,8 @@ } void hfsplus_inode_read_fork(struct inode *inode, struct hfsplus_fork_raw *fork) ---- kernel-2.6.28.orig/fs/hfsplus/super.c -+++ kernel-2.6.28/fs/hfsplus/super.c +--- kernel-maemo-2.6.28.orig/fs/hfsplus/super.c ++++ kernel-maemo-2.6.28/fs/hfsplus/super.c @@ -104,7 +104,7 @@ case HFSPLUS_EXT_CNID: if (vhdr->ext_file.total_size != cpu_to_be64(inode->i_size)) { @@ -343763,8 +343763,8 @@ if (sb->s_flags & MS_RDONLY) /* warn? */ return; ---- kernel-2.6.28.orig/fs/jffs2/fs.c -+++ kernel-2.6.28/fs/jffs2/fs.c +--- kernel-maemo-2.6.28.orig/fs/jffs2/fs.c ++++ kernel-maemo-2.6.28/fs/jffs2/fs.c @@ -405,7 +405,7 @@ void jffs2_write_super (struct super_block *sb) { @@ -343774,8 +343774,8 @@ if (sb->s_flags & MS_RDONLY) return; ---- kernel-2.6.28.orig/fs/jffs2/os-linux.h -+++ kernel-2.6.28/fs/jffs2/os-linux.h +--- kernel-maemo-2.6.28.orig/fs/jffs2/os-linux.h ++++ kernel-maemo-2.6.28/fs/jffs2/os-linux.h @@ -147,7 +147,7 @@ /* erase.c */ static inline void jffs2_erase_pending_trigger(struct jffs2_sb_info *c) @@ -343785,8 +343785,8 @@ } /* background.c */ ---- kernel-2.6.28.orig/fs/ocfs2/super.c -+++ kernel-2.6.28/fs/ocfs2/super.c +--- kernel-maemo-2.6.28.orig/fs/ocfs2/super.c ++++ kernel-maemo-2.6.28/fs/ocfs2/super.c @@ -190,7 +190,7 @@ { if (mutex_trylock(&sb->s_lock) != 0) @@ -343805,8 +343805,8 @@ if (ocfs2_is_hard_readonly(osb)) return -EROFS; ---- kernel-2.6.28.orig/fs/proc/generic.c -+++ kernel-2.6.28/fs/proc/generic.c +--- kernel-maemo-2.6.28.orig/fs/proc/generic.c ++++ kernel-maemo-2.6.28/fs/proc/generic.c @@ -14,7 +14,6 @@ #include #include @@ -343857,8 +343857,8 @@ .read = generic_read_dir, .readdir = proc_readdir, }; ---- kernel-2.6.28.orig/fs/proc/inode.c -+++ kernel-2.6.28/fs/proc/inode.c +--- kernel-maemo-2.6.28.orig/fs/proc/inode.c ++++ kernel-maemo-2.6.28/fs/proc/inode.c @@ -35,16 +35,13 @@ */ void de_put(struct proc_dir_entry *de) @@ -343876,8 +343876,8 @@ } /* ---- kernel-2.6.28.orig/fs/proc/proc_net.c -+++ kernel-2.6.28/fs/proc/proc_net.c +--- kernel-maemo-2.6.28.orig/fs/proc/proc_net.c ++++ kernel-maemo-2.6.28/fs/proc/proc_net.c @@ -18,7 +18,6 @@ #include #include @@ -343894,8 +343894,8 @@ .read = generic_read_dir, .readdir = proc_tgid_net_readdir, }; ---- kernel-2.6.28.orig/fs/proc/root.c -+++ kernel-2.6.28/fs/proc/root.c +--- kernel-maemo-2.6.28.orig/fs/proc/root.c ++++ kernel-maemo-2.6.28/fs/proc/root.c @@ -16,7 +16,6 @@ #include #include @@ -343923,8 +343923,8 @@ ret = proc_pid_readdir(filp, dirent, filldir); return ret; ---- kernel-2.6.28.orig/fs/qnx4/inode.c -+++ kernel-2.6.28/fs/qnx4/inode.c +--- kernel-maemo-2.6.28.orig/fs/qnx4/inode.c ++++ kernel-maemo-2.6.28/fs/qnx4/inode.c @@ -74,7 +74,7 @@ { lock_kernel(); @@ -343934,8 +343934,8 @@ unlock_kernel(); } ---- kernel-2.6.28.orig/fs/reiserfs/journal.c -+++ kernel-2.6.28/fs/reiserfs/journal.c +--- kernel-maemo-2.6.28.orig/fs/reiserfs/journal.c ++++ kernel-maemo-2.6.28/fs/reiserfs/journal.c @@ -3251,7 +3251,7 @@ th->t_trans_id, journal->j_trans_id); } @@ -343963,8 +343963,8 @@ wake_queued_writers(p_s_sb); reiserfs_async_progress_wait(p_s_sb); goto out; ---- kernel-2.6.28.orig/fs/reiserfs/resize.c -+++ kernel-2.6.28/fs/reiserfs/resize.c +--- kernel-maemo-2.6.28.orig/fs/reiserfs/resize.c ++++ kernel-maemo-2.6.28/fs/reiserfs/resize.c @@ -202,7 +202,7 @@ (bmap_nr_new - bmap_nr))); PUT_SB_BLOCK_COUNT(s, block_count_new); @@ -343974,8 +343974,8 @@ journal_mark_dirty(&th, s, SB_BUFFER_WITH_SB(s)); ---- kernel-2.6.28.orig/fs/reiserfs/super.c -+++ kernel-2.6.28/fs/reiserfs/super.c +--- kernel-maemo-2.6.28.orig/fs/reiserfs/super.c ++++ kernel-maemo-2.6.28/fs/reiserfs/super.c @@ -69,11 +69,11 @@ if (!journal_begin(&th, s, 1)) if (!journal_end_sync(&th, s, 1)) @@ -344009,8 +344009,8 @@ if (!(*mount_flags & MS_RDONLY)) { finish_unfinished(s); ---- kernel-2.6.28.orig/fs/super.c -+++ kernel-2.6.28/fs/super.c +--- kernel-maemo-2.6.28.orig/fs/super.c ++++ kernel-maemo-2.6.28/fs/super.c @@ -251,7 +251,7 @@ sync_inodes_sb(sb, 0); DQUOT_SYNC(sb); @@ -344056,8 +344056,8 @@ sb->s_op->sync_fs(sb, wait); up_read(&sb->s_umount); /* restart only when sb is no longer on the list */ ---- kernel-2.6.28.orig/fs/sync.c -+++ kernel-2.6.28/fs/sync.c +--- kernel-maemo-2.6.28.orig/fs/sync.c ++++ kernel-maemo-2.6.28/fs/sync.c @@ -64,7 +64,7 @@ /* sync the superblock to buffers */ sb = inode->i_sb; @@ -344067,8 +344067,8 @@ sb->s_op->write_super(sb); unlock_super(sb); ---- kernel-2.6.28.orig/fs/sysv/inode.c -+++ kernel-2.6.28/fs/sysv/inode.c +--- kernel-maemo-2.6.28.orig/fs/sysv/inode.c ++++ kernel-maemo-2.6.28/fs/sysv/inode.c @@ -30,7 +30,7 @@ #include #include "sysv.h" @@ -344096,8 +344096,8 @@ return 0; } ---- kernel-2.6.28.orig/fs/sysv/super.c -+++ kernel-2.6.28/fs/sysv/super.c +--- kernel-maemo-2.6.28.orig/fs/sysv/super.c ++++ kernel-maemo-2.6.28/fs/sysv/super.c @@ -347,7 +347,7 @@ sb->s_flags |= MS_RDONLY; if (sbi->s_truncate) @@ -344107,8 +344107,8 @@ return 1; } ---- kernel-2.6.28.orig/fs/sysv/sysv.h -+++ kernel-2.6.28/fs/sysv/sysv.h +--- kernel-maemo-2.6.28.orig/fs/sysv/sysv.h ++++ kernel-maemo-2.6.28/fs/sysv/sysv.h @@ -118,7 +118,7 @@ mark_buffer_dirty(sbi->s_bh1); if (sbi->s_bh1 != sbi->s_bh2) @@ -344118,8 +344118,8 @@ } ---- kernel-2.6.28.orig/fs/ubifs/budget.c -+++ kernel-2.6.28/fs/ubifs/budget.c +--- kernel-maemo-2.6.28.orig/fs/ubifs/budget.c ++++ kernel-maemo-2.6.28/fs/ubifs/budget.c @@ -32,18 +32,15 @@ #include "ubifs.h" @@ -344532,8 +344532,8 @@ + + return free; +} ---- kernel-2.6.28.orig/fs/ubifs/commit.c -+++ kernel-2.6.28/fs/ubifs/commit.c +--- kernel-maemo-2.6.28.orig/fs/ubifs/commit.c ++++ kernel-maemo-2.6.28/fs/ubifs/commit.c @@ -470,12 +470,12 @@ { struct ubifs_idx_node *idx; @@ -344598,8 +344598,8 @@ err = 3; goto out_dump; } ---- kernel-2.6.28.orig/fs/ubifs/compress.c -+++ kernel-2.6.28/fs/ubifs/compress.c +--- kernel-maemo-2.6.28.orig/fs/ubifs/compress.c ++++ kernel-maemo-2.6.28/fs/ubifs/compress.c @@ -33,7 +33,7 @@ /* Fake description object for the "none" compressor */ static struct ubifs_compressor none_compr = { @@ -344707,8 +344707,8 @@ compr_exit(&lzo_compr); compr_exit(&zlib_compr); } ---- kernel-2.6.28.orig/fs/ubifs/debug.c -+++ kernel-2.6.28/fs/ubifs/debug.c +--- kernel-maemo-2.6.28.orig/fs/ubifs/debug.c ++++ kernel-maemo-2.6.28/fs/ubifs/debug.c @@ -32,6 +32,8 @@ #include "ubifs.h" #include @@ -345240,8 +345240,8 @@ +} + #endif /* CONFIG_UBIFS_FS_DEBUG */ ---- kernel-2.6.28.orig/fs/ubifs/debug.h -+++ kernel-2.6.28/fs/ubifs/debug.h +--- kernel-maemo-2.6.28.orig/fs/ubifs/debug.h ++++ kernel-maemo-2.6.28/fs/ubifs/debug.h @@ -25,7 +25,61 @@ #ifdef CONFIG_UBIFS_FS_DEBUG @@ -345438,8 +345438,8 @@ +#endif /* !CONFIG_UBIFS_FS_DEBUG */ #endif /* !__UBIFS_DEBUG_H__ */ ---- kernel-2.6.28.orig/fs/ubifs/dir.c -+++ kernel-2.6.28/fs/ubifs/dir.c +--- kernel-maemo-2.6.28.orig/fs/ubifs/dir.c ++++ kernel-maemo-2.6.28/fs/ubifs/dir.c @@ -482,30 +482,29 @@ } @@ -345645,8 +345645,8 @@ .llseek = ubifs_dir_llseek, .release = ubifs_dir_release, .read = generic_read_dir, ---- kernel-2.6.28.orig/fs/ubifs/file.c -+++ kernel-2.6.28/fs/ubifs/file.c +--- kernel-maemo-2.6.28.orig/fs/ubifs/file.c ++++ kernel-maemo-2.6.28/fs/ubifs/file.c @@ -72,8 +72,8 @@ return err; } @@ -345747,8 +345747,8 @@ .llseek = generic_file_llseek, .read = do_sync_read, .write = do_sync_write, ---- kernel-2.6.28.orig/fs/ubifs/gc.c -+++ kernel-2.6.28/fs/ubifs/gc.c +--- kernel-maemo-2.6.28.orig/fs/ubifs/gc.c ++++ kernel-maemo-2.6.28/fs/ubifs/gc.c @@ -31,6 +31,26 @@ * to be reused. Garbage collection will cause the number of dirty index nodes * to grow, however sufficient space is reserved for the index to ensure the @@ -345805,8 +345805,8 @@ } /** ---- kernel-2.6.28.orig/fs/ubifs/io.c -+++ kernel-2.6.28/fs/ubifs/io.c +--- kernel-maemo-2.6.28.orig/fs/ubifs/io.c ++++ kernel-maemo-2.6.28/fs/ubifs/io.c @@ -29,7 +29,7 @@ * would have been wasted for padding to the nearest minimal I/O unit boundary. * Instead, data first goes to the write-buffer and is flushed when the @@ -346026,8 +346026,8 @@ * @inum: the inode number * * This function adds an inode number to the inode array of the write-buffer. ---- kernel-2.6.28.orig/fs/ubifs/ioctl.c -+++ kernel-2.6.28/fs/ubifs/ioctl.c +--- kernel-maemo-2.6.28.orig/fs/ubifs/ioctl.c ++++ kernel-maemo-2.6.28/fs/ubifs/ioctl.c @@ -154,6 +154,7 @@ case FS_IOC_GETFLAGS: flags = ubifs2ioctl(ubifs_inode(inode)->flags); @@ -346044,8 +346044,8 @@ err = setflags(inode, flags); mnt_drop_write(file->f_path.mnt); return err; ---- kernel-2.6.28.orig/fs/ubifs/journal.c -+++ kernel-2.6.28/fs/ubifs/journal.c +--- kernel-maemo-2.6.28.orig/fs/ubifs/journal.c ++++ kernel-maemo-2.6.28/fs/ubifs/journal.c @@ -208,7 +208,7 @@ offs = 0; @@ -346085,8 +346085,8 @@ data_key_init(c, &to_key, inum, blk); err = ubifs_tnc_remove_range(c, &key, &to_key); ---- kernel-2.6.28.orig/fs/ubifs/key.h -+++ kernel-2.6.28/fs/ubifs/key.h +--- kernel-maemo-2.6.28.orig/fs/ubifs/key.h ++++ kernel-maemo-2.6.28/fs/ubifs/key.h @@ -38,6 +38,22 @@ #define __UBIFS_KEY_H__ @@ -346140,8 +346140,8 @@ } /** ---- kernel-2.6.28.orig/fs/ubifs/lprops.c -+++ kernel-2.6.28/fs/ubifs/lprops.c +--- kernel-maemo-2.6.28.orig/fs/ubifs/lprops.c ++++ kernel-maemo-2.6.28/fs/ubifs/lprops.c @@ -520,13 +520,13 @@ * @flags: new flags * @idx_gc_cnt: change to the count of idx_gc list @@ -346214,8 +346214,8 @@ if (IS_ERR(sleb)) { /* * After an unclean unmount, empty and freeable LEBs ---- kernel-2.6.28.orig/fs/ubifs/lpt.c -+++ kernel-2.6.28/fs/ubifs/lpt.c +--- kernel-maemo-2.6.28.orig/fs/ubifs/lpt.c ++++ kernel-maemo-2.6.28/fs/ubifs/lpt.c @@ -36,15 +36,16 @@ * can be written into a single eraseblock. In that case, garbage collection * consists of just writing the whole table, which therefore makes all other @@ -346391,8 +346391,8 @@ if (err) return ERR_PTR(err); } ---- kernel-2.6.28.orig/fs/ubifs/lpt_commit.c -+++ kernel-2.6.28/fs/ubifs/lpt_commit.c +--- kernel-maemo-2.6.28.orig/fs/ubifs/lpt_commit.c ++++ kernel-maemo-2.6.28/fs/ubifs/lpt_commit.c @@ -229,7 +229,7 @@ while (offs + len > c->leb_size) { alen = ALIGN(offs, c->min_io_size); @@ -346916,8 +346916,8 @@ +} + #endif /* CONFIG_UBIFS_FS_DEBUG */ ---- kernel-2.6.28.orig/fs/ubifs/master.c -+++ kernel-2.6.28/fs/ubifs/master.c +--- kernel-maemo-2.6.28.orig/fs/ubifs/master.c ++++ kernel-maemo-2.6.28/fs/ubifs/master.c @@ -354,7 +354,7 @@ int err, lnum, offs, len; @@ -346927,8 +346927,8 @@ lnum = UBIFS_MST_LNUM; offs = c->mst_offs + c->mst_node_alsz; ---- kernel-2.6.28.orig/fs/ubifs/orphan.c -+++ kernel-2.6.28/fs/ubifs/orphan.c +--- kernel-maemo-2.6.28.orig/fs/ubifs/orphan.c ++++ kernel-maemo-2.6.28/fs/ubifs/orphan.c @@ -46,7 +46,7 @@ * Orphans are accumulated in a rb-tree. When an inode's link count drops to * zero, the inode number is added to the rb-tree. It is removed from the tree @@ -347060,8 +347060,8 @@ if (IS_ERR(sleb)) { err = PTR_ERR(sleb); break; ---- kernel-2.6.28.orig/fs/ubifs/recovery.c -+++ kernel-2.6.28/fs/ubifs/recovery.c +--- kernel-maemo-2.6.28.orig/fs/ubifs/recovery.c ++++ kernel-maemo-2.6.28/fs/ubifs/recovery.c @@ -425,59 +425,35 @@ * @lnum: LEB number of the LEB from which @buf was read * @offs: offset from which @buf was read @@ -347145,8 +347145,8 @@ } /** ---- kernel-2.6.28.orig/fs/ubifs/replay.c -+++ kernel-2.6.28/fs/ubifs/replay.c +--- kernel-maemo-2.6.28.orig/fs/ubifs/replay.c ++++ kernel-maemo-2.6.28/fs/ubifs/replay.c @@ -144,7 +144,7 @@ /* * If the replay order was perfect the dirty space would now be @@ -347199,8 +347199,8 @@ ubifs_assert(c->bud_bytes <= c->max_bud_bytes || c->need_recovery); dbg_mnt("finished, log head LEB %d:%d, max_sqnum %llu, " "highest_inum %lu", c->lhead_lnum, c->lhead_offs, c->max_sqnum, ---- kernel-2.6.28.orig/fs/ubifs/sb.c -+++ kernel-2.6.28/fs/ubifs/sb.c +--- kernel-maemo-2.6.28.orig/fs/ubifs/sb.c ++++ kernel-maemo-2.6.28/fs/ubifs/sb.c @@ -28,6 +28,7 @@ #include "ubifs.h" @@ -347270,8 +347270,8 @@ c->big_lpt = !!(sup_flags & UBIFS_FLG_BIGLPT); /* Automatically increase file system size to the maximum size */ ---- kernel-2.6.28.orig/fs/ubifs/super.c -+++ kernel-2.6.28/fs/ubifs/super.c +--- kernel-maemo-2.6.28.orig/fs/ubifs/super.c ++++ kernel-maemo-2.6.28/fs/ubifs/super.c @@ -34,6 +34,8 @@ #include #include @@ -348077,8 +348077,8 @@ ubifs_compressors_exit(); unregister_shrinker(&ubifs_shrinker_info); kmem_cache_destroy(ubifs_inode_slab); ---- kernel-2.6.28.orig/fs/ubifs/tnc.c -+++ kernel-2.6.28/fs/ubifs/tnc.c +--- kernel-maemo-2.6.28.orig/fs/ubifs/tnc.c ++++ kernel-maemo-2.6.28/fs/ubifs/tnc.c @@ -443,6 +443,11 @@ * This function performs that same function as ubifs_read_node except that * it does not require that there is actually a node present and instead @@ -348164,8 +348164,8 @@ } /* Remove all keys in range except the first */ ---- kernel-2.6.28.orig/fs/ubifs/tnc_commit.c -+++ kernel-2.6.28/fs/ubifs/tnc_commit.c +--- kernel-maemo-2.6.28.orig/fs/ubifs/tnc_commit.c ++++ kernel-maemo-2.6.28/fs/ubifs/tnc_commit.c @@ -553,8 +553,8 @@ } @@ -348198,8 +348198,8 @@ ubifs_err("inconsistent ihead"); return -EINVAL; } ---- kernel-2.6.28.orig/fs/ubifs/ubifs-media.h -+++ kernel-2.6.28/fs/ubifs/ubifs-media.h +--- kernel-maemo-2.6.28.orig/fs/ubifs/ubifs-media.h ++++ kernel-maemo-2.6.28/fs/ubifs/ubifs-media.h @@ -51,6 +51,13 @@ */ #define UBIFS_MIN_COMPR_LEN 128 @@ -348229,8 +348229,8 @@ UBIFS_COMPR_TYPES_CNT, }; ---- kernel-2.6.28.orig/fs/ubifs/ubifs.h -+++ kernel-2.6.28/fs/ubifs/ubifs.h +--- kernel-maemo-2.6.28.orig/fs/ubifs/ubifs.h ++++ kernel-maemo-2.6.28/fs/ubifs/ubifs.h @@ -63,6 +63,14 @@ #define SQNUM_WARN_WATERMARK 0xFFFFFFFF00000000ULL #define SQNUM_WATERMARK 0xFFFFFFFFFF000000ULL @@ -348589,8 +348589,8 @@ void ubifs_compress(const void *in_buf, int in_len, void *out_buf, int *out_len, int *compr_type); int ubifs_decompress(const void *buf, int len, void *out, int *out_len, ---- kernel-2.6.28.orig/fs/udf/balloc.c -+++ kernel-2.6.28/fs/udf/balloc.c +--- kernel-maemo-2.6.28.orig/fs/udf/balloc.c ++++ kernel-maemo-2.6.28/fs/udf/balloc.c @@ -218,7 +218,7 @@ } while (overflow); @@ -348645,8 +348645,8 @@ mutex_unlock(&sbi->s_alloc_mutex); *err = 0; return newblock; ---- kernel-2.6.28.orig/fs/udf/super.c -+++ kernel-2.6.28/fs/udf/super.c +--- kernel-maemo-2.6.28.orig/fs/udf/super.c ++++ kernel-maemo-2.6.28/fs/udf/super.c @@ -546,7 +546,7 @@ if (!(sb->s_flags & MS_RDONLY)) @@ -348674,8 +348674,8 @@ } va_start(args, fmt); vsnprintf(error_buf, sizeof(error_buf), fmt, args); ---- kernel-2.6.28.orig/fs/ufs/balloc.c -+++ kernel-2.6.28/fs/ufs/balloc.c +--- kernel-maemo-2.6.28.orig/fs/ufs/balloc.c ++++ kernel-maemo-2.6.28/fs/ufs/balloc.c @@ -122,7 +122,7 @@ ubh_ll_rw_block(SWRITE, UCPI_UBH(ucpi)); ubh_wait_on_buffer (UCPI_UBH(ucpi)); @@ -348712,8 +348712,8 @@ result += cgno * uspi->s_fpg; UFSD("EXIT3, result %llu\n", (unsigned long long)result); ---- kernel-2.6.28.orig/fs/ufs/ialloc.c -+++ kernel-2.6.28/fs/ufs/ialloc.c +--- kernel-maemo-2.6.28.orig/fs/ufs/ialloc.c ++++ kernel-maemo-2.6.28/fs/ufs/ialloc.c @@ -124,7 +124,7 @@ ubh_wait_on_buffer (UCPI_UBH(ucpi)); } @@ -348732,8 +348732,8 @@ inode->i_ino = cg * uspi->s_ipg + bit; inode->i_mode = mode; ---- kernel-2.6.28.orig/fs/ufs/super.c -+++ kernel-2.6.28/fs/ufs/super.c +--- kernel-maemo-2.6.28.orig/fs/ufs/super.c ++++ kernel-maemo-2.6.28/fs/ufs/super.c @@ -237,7 +237,7 @@ if (!(sb->s_flags & MS_RDONLY)) { usb1->fs_clean = UFS_FSBAD; @@ -348770,8 +348770,8 @@ sb->s_flags |= MS_RDONLY; } else { /* ---- kernel-2.6.28.orig/fs/xfs/linux-2.6/xfs_super.c -+++ kernel-2.6.28/fs/xfs/linux-2.6/xfs_super.c +--- kernel-maemo-2.6.28.orig/fs/xfs/linux-2.6/xfs_super.c ++++ kernel-maemo-2.6.28/fs/xfs/linux-2.6/xfs_super.c @@ -1162,7 +1162,7 @@ { if (!(sb->s_flags & MS_RDONLY)) @@ -348799,8 +348799,8 @@ sb->s_magic = XFS_SB_MAGIC; sb->s_blocksize = mp->m_sb.sb_blocksize; sb->s_blocksize_bits = ffs(sb->s_blocksize) - 1; ---- kernel-2.6.28.orig/fs/xfs/xfs_trans.c -+++ kernel-2.6.28/fs/xfs/xfs_trans.c +--- kernel-maemo-2.6.28.orig/fs/xfs/xfs_trans.c ++++ kernel-maemo-2.6.28/fs/xfs/xfs_trans.c @@ -629,7 +629,7 @@ offsetof(xfs_dsb_t, sb_frextents) + sizeof(sbp->sb_frextents) - 1); @@ -348810,14 +348810,14 @@ } /* ---- kernel-2.6.28.orig/include/asm-arm/.gitignore -+++ kernel-2.6.28/include/asm-arm/.gitignore +--- kernel-maemo-2.6.28.orig/include/asm-arm/.gitignore ++++ kernel-maemo-2.6.28/include/asm-arm/.gitignore @@ -1,2 +1,3 @@ arch +asm-offsets.h mach-types.h --- /dev/null -+++ kernel-2.6.28/include/asm-arm/hardware/tsc2101.h ++++ kernel-maemo-2.6.28/include/asm-arm/hardware/tsc2101.h @@ -0,0 +1,300 @@ +/* + * @@ -349119,8 +349119,8 @@ +#define CAC_CDEBSN(ARG) (((ARG) & 0x07) << 3) + +#endif /* __ASM_HARDWARE_TSC2101_H */ ---- kernel-2.6.28.orig/include/drm/Kbuild -+++ kernel-2.6.28/include/drm/Kbuild +--- kernel-maemo-2.6.28.orig/include/drm/Kbuild ++++ kernel-maemo-2.6.28/include/drm/Kbuild @@ -3,6 +3,7 @@ unifdef-y += i830_drm.h unifdef-y += i915_drm.h @@ -349130,7 +349130,7 @@ unifdef-y += radeon_drm.h unifdef-y += sis_drm.h --- /dev/null -+++ kernel-2.6.28/include/drm/pvr2d_drm.h ++++ kernel-maemo-2.6.28/include/drm/pvr2d_drm.h @@ -0,0 +1,45 @@ +/* pvr2d_drm.h -- Public header for the PVR2D helper module -*- linux-c -*- + * @@ -349178,7 +349178,7 @@ + +#endif /* __PVR2D_DRM_H__ */ --- /dev/null -+++ kernel-2.6.28/include/linux/camera_button.h ++++ kernel-maemo-2.6.28/include/linux/camera_button.h @@ -0,0 +1,13 @@ +/* + * Camera Button Interface @@ -349193,8 +349193,8 @@ + +#endif /* _LINUX_CAMERA_BUTTON_H */ + ---- kernel-2.6.28.orig/include/linux/clockchips.h -+++ kernel-2.6.28/include/linux/clockchips.h +--- kernel-maemo-2.6.28.orig/include/linux/clockchips.h ++++ kernel-maemo-2.6.28/include/linux/clockchips.h @@ -76,7 +76,7 @@ struct clock_event_device { const char *name; @@ -349213,8 +349213,8 @@ struct clock_event_device *evt); extern void clockevents_register_device(struct clock_event_device *dev); ---- kernel-2.6.28.orig/include/linux/connector.h -+++ kernel-2.6.28/include/linux/connector.h +--- kernel-maemo-2.6.28.orig/include/linux/connector.h ++++ kernel-maemo-2.6.28/include/linux/connector.h @@ -36,6 +36,8 @@ #define CN_VAL_CIFS 0x1 #define CN_W1_IDX 0x3 /* w1 communication */ @@ -349225,7 +349225,7 @@ #define CN_VAL_V86D_UVESAFB 0x1 #define CN_IDX_BB 0x5 /* BlackBoard, from the TSP GPL sampling framework */ --- /dev/null -+++ kernel-2.6.28/include/linux/cs-protocol.h ++++ kernel-maemo-2.6.28/include/linux/cs-protocol.h @@ -0,0 +1,128 @@ +/* + * cs-protocol.h @@ -349355,8 +349355,8 @@ +}; + +#endif /* _CS_PROTOCOL_H */ ---- kernel-2.6.28.orig/include/linux/fs.h -+++ kernel-2.6.28/include/linux/fs.h +--- kernel-maemo-2.6.28.orig/include/linux/fs.h ++++ kernel-maemo-2.6.28/include/linux/fs.h @@ -1580,6 +1580,19 @@ extern int simple_set_mnt(struct vfsmount *mnt, struct super_block *sb); int __put_super_and_need_restart(struct super_block *sb); @@ -349377,8 +349377,8 @@ /* Alas, no aliases. Too much hassle with bringing module.h everywhere */ #define fops_get(fops) \ (((fops) && try_module_get((fops)->owner) ? (fops) : NULL)) ---- kernel-2.6.28.orig/include/linux/gpio_keys.h -+++ kernel-2.6.28/include/linux/gpio_keys.h +--- kernel-maemo-2.6.28.orig/include/linux/gpio_keys.h ++++ kernel-maemo-2.6.28/include/linux/gpio_keys.h @@ -15,6 +15,7 @@ struct gpio_keys_platform_data { struct gpio_keys_button *buttons; @@ -349387,8 +349387,8 @@ }; #endif ---- kernel-2.6.28.orig/include/linux/i2c-id.h -+++ kernel-2.6.28/include/linux/i2c-id.h +--- kernel-maemo-2.6.28.orig/include/linux/i2c-id.h ++++ kernel-maemo-2.6.28/include/linux/i2c-id.h @@ -33,18 +33,24 @@ #define I2C_DRIVERID_MSP3400 1 @@ -349450,7 +349450,7 @@ #define I2C_HW_SMBUS_ALI1563 0x040013 --- /dev/null -+++ kernel-2.6.28/include/linux/i2c/lm8323.h ++++ kernel-maemo-2.6.28/include/linux/i2c/lm8323.h @@ -0,0 +1,37 @@ +/* + * include/lm8323.h @@ -349490,7 +349490,7 @@ + +#endif /* __LINUX_LM8323_H */ --- /dev/null -+++ kernel-2.6.28/include/linux/i2c/menelaus.h ++++ kernel-maemo-2.6.28/include/linux/i2c/menelaus.h @@ -0,0 +1,163 @@ +/* + * include/linux/i2c/menelaus.h @@ -349656,7 +349656,7 @@ + +#endif --- /dev/null -+++ kernel-2.6.28/include/linux/i2c/tpa6130a2.h ++++ kernel-maemo-2.6.28/include/linux/i2c/tpa6130a2.h @@ -0,0 +1,34 @@ +/* + * TPA6130A2 driver headers @@ -349693,7 +349693,7 @@ + +#endif --- /dev/null -+++ kernel-2.6.28/include/linux/i2c/tsl2563.h ++++ kernel-maemo-2.6.28/include/linux/i2c/tsl2563.h @@ -0,0 +1,9 @@ +#ifndef __LINUX_TSL2563_H +#define __LINUX_TSL2563_H @@ -349705,7 +349705,7 @@ +#endif /* __LINUX_TSL2563_H */ + --- /dev/null -+++ kernel-2.6.28/include/linux/i2c/twl4030-madc.h ++++ kernel-maemo-2.6.28/include/linux/i2c/twl4030-madc.h @@ -0,0 +1,126 @@ +/* + * include/linux/i2c/twl4030-madc.h @@ -349833,8 +349833,8 @@ +int twl4030_madc_conversion(struct twl4030_madc_request *conv); + +#endif ---- kernel-2.6.28.orig/include/linux/i2c/twl4030.h -+++ kernel-2.6.28/include/linux/i2c/twl4030.h +--- kernel-maemo-2.6.28.orig/include/linux/i2c/twl4030.h ++++ kernel-maemo-2.6.28/include/linux/i2c/twl4030.h @@ -78,8 +78,8 @@ * IMPORTANT: For twl4030_i2c_write(), allocate num_bytes + 1 * for the value, and populate your data starting at offset 1. @@ -350136,8 +350136,8 @@ +extern int twl4030_enable_regulator(int res); +extern int twl4030_disable_regulator(int res); #endif /* End of __TWL4030_H */ ---- kernel-2.6.28.orig/include/linux/if_arp.h -+++ kernel-2.6.28/include/linux/if_arp.h +--- kernel-maemo-2.6.28.orig/include/linux/if_arp.h ++++ kernel-maemo-2.6.28/include/linux/if_arp.h @@ -87,6 +87,9 @@ #define ARPHRD_IEEE80211_PRISM 802 /* IEEE 802.11 + Prism2 header */ #define ARPHRD_IEEE80211_RADIOTAP 803 /* IEEE 802.11 + radiotap header */ @@ -350148,8 +350148,8 @@ #define ARPHRD_VOID 0xFFFF /* Void type, nothing is known */ #define ARPHRD_NONE 0xFFFE /* zero header length */ ---- kernel-2.6.28.orig/include/linux/input.h -+++ kernel-2.6.28/include/linux/input.h +--- kernel-maemo-2.6.28.orig/include/linux/input.h ++++ kernel-maemo-2.6.28/include/linux/input.h @@ -659,6 +659,9 @@ #define SW_RADIO SW_RFKILL_ALL /* deprecated */ #define SW_MICROPHONE_INSERT 0x04 /* set = inserted */ @@ -350160,8 +350160,8 @@ #define SW_MAX 0x0f #define SW_CNT (SW_MAX+1) ---- kernel-2.6.28.orig/include/linux/kfifo.h -+++ kernel-2.6.28/include/linux/kfifo.h +--- kernel-maemo-2.6.28.orig/include/linux/kfifo.h ++++ kernel-maemo-2.6.28/include/linux/kfifo.h @@ -41,6 +41,9 @@ unsigned char *buffer, unsigned int len); extern unsigned int __kfifo_get(struct kfifo *fifo, @@ -350210,7 +350210,7 @@ + #endif --- /dev/null -+++ kernel-2.6.28/include/linux/leds-lp5523.h ++++ kernel-maemo-2.6.28/include/linux/leds-lp5523.h @@ -0,0 +1,18 @@ +#ifndef __LINUX_LP5523_H +#define __LINUX_LP5523_H @@ -350231,7 +350231,7 @@ +#endif /* __LINUX_LP5523_H */ + --- /dev/null -+++ kernel-2.6.28/include/linux/lis302dl.h ++++ kernel-maemo-2.6.28/include/linux/lis302dl.h @@ -0,0 +1,9 @@ +#ifndef _LINUX_LIS302DL_H +#define _LINUX_LIS302DL_H @@ -350242,8 +350242,8 @@ +}; + +#endif ---- kernel-2.6.28.orig/include/linux/lzo.h -+++ kernel-2.6.28/include/linux/lzo.h +--- kernel-maemo-2.6.28.orig/include/linux/lzo.h ++++ kernel-maemo-2.6.28/include/linux/lzo.h @@ -17,6 +17,8 @@ #define LZO1X_MEM_COMPRESS (16384 * sizeof(unsigned char *)) #define LZO1X_1_MEM_COMPRESS LZO1X_MEM_COMPRESS @@ -350281,8 +350281,8 @@ /* * Return values (< 0 = Error) */ ---- kernel-2.6.28.orig/include/linux/mmc/card.h -+++ kernel-2.6.28/include/linux/mmc/card.h +--- kernel-maemo-2.6.28.orig/include/linux/mmc/card.h ++++ kernel-maemo-2.6.28/include/linux/mmc/card.h @@ -40,6 +40,8 @@ }; @@ -350292,8 +350292,8 @@ unsigned int hs_max_dtr; unsigned int sectors; }; ---- kernel-2.6.28.orig/include/linux/mmc/core.h -+++ kernel-2.6.28/include/linux/mmc/core.h +--- kernel-maemo-2.6.28.orig/include/linux/mmc/core.h ++++ kernel-maemo-2.6.28/include/linux/mmc/core.h @@ -139,6 +139,7 @@ extern int __mmc_claim_host(struct mmc_host *host, atomic_t *abort); @@ -350302,8 +350302,8 @@ /** * mmc_claim_host - exclusively claim a host ---- kernel-2.6.28.orig/include/linux/mmc/host.h -+++ kernel-2.6.28/include/linux/mmc/host.h +--- kernel-maemo-2.6.28.orig/include/linux/mmc/host.h ++++ kernel-maemo-2.6.28/include/linux/mmc/host.h @@ -41,6 +41,7 @@ #define MMC_BUS_WIDTH_1 0 @@ -350414,8 +350414,8 @@ + #endif ---- kernel-2.6.28.orig/include/linux/mmc/mmc.h -+++ kernel-2.6.28/include/linux/mmc/mmc.h +--- kernel-maemo-2.6.28.orig/include/linux/mmc/mmc.h ++++ kernel-maemo-2.6.28/include/linux/mmc/mmc.h @@ -31,6 +31,7 @@ #define MMC_ALL_SEND_CID 2 /* bcr R2 */ #define MMC_SET_RELATIVE_ADDR 3 /* ac [31:16] RCA R1 */ @@ -350440,8 +350440,8 @@ /* * EXT_CSD field definitions ---- kernel-2.6.28.orig/include/linux/mtd/mtd.h -+++ kernel-2.6.28/include/linux/mtd/mtd.h +--- kernel-maemo-2.6.28.orig/include/linux/mtd/mtd.h ++++ kernel-maemo-2.6.28/include/linux/mtd/mtd.h @@ -219,6 +219,14 @@ * supposed to be called by MTD users */ int (*get_device) (struct mtd_info *mtd); @@ -350457,8 +350457,8 @@ }; ---- kernel-2.6.28.orig/include/linux/mtd/onenand.h -+++ kernel-2.6.28/include/linux/mtd/onenand.h +--- kernel-maemo-2.6.28.orig/include/linux/mtd/onenand.h ++++ kernel-maemo-2.6.28/include/linux/mtd/onenand.h @@ -176,6 +176,7 @@ * OneNAND Flash Manufacturer ID Codes */ @@ -350468,7 +350468,7 @@ /** * struct onenand_manufacturers - NAND Flash Manufacturer ID Structure --- /dev/null -+++ kernel-2.6.28/include/linux/netfilter_ipv4/ipt_IDLETIMER.h ++++ kernel-maemo-2.6.28/include/linux/netfilter_ipv4/ipt_IDLETIMER.h @@ -0,0 +1,22 @@ +/* + * linux/include/linux/netfilter_ipv4/ipt_IDLETIMER.h @@ -350493,7 +350493,7 @@ + +#endif --- /dev/null -+++ kernel-2.6.28/include/linux/nokia-av.h ++++ kernel-maemo-2.6.28/include/linux/nokia-av.h @@ -0,0 +1,29 @@ +/* + * nokia-av.h - Nokia AV accessory detection @@ -350525,7 +350525,7 @@ + +#endif /* __NOKIA_AV_H */ --- /dev/null -+++ kernel-2.6.28/include/linux/omap34xxcam-daemon-req.h ++++ kernel-maemo-2.6.28/include/linux/omap34xxcam-daemon-req.h @@ -0,0 +1,77 @@ +/* + * drivers/media/video/omap/omap34xcam-daemon-req.h @@ -350605,7 +350605,7 @@ + +#endif --- /dev/null -+++ kernel-2.6.28/include/linux/omap34xxcam-daemon.h ++++ kernel-maemo-2.6.28/include/linux/omap34xxcam-daemon.h @@ -0,0 +1,133 @@ +/* + * drivers/media/video/omap/omap34xcam-daemon.h @@ -350741,7 +350741,7 @@ + +#endif --- /dev/null -+++ kernel-2.6.28/include/linux/omapfb.h ++++ kernel-maemo-2.6.28/include/linux/omapfb.h @@ -0,0 +1,450 @@ +/* + * Framebuffer driver for TI OMAP boards @@ -351193,8 +351193,8 @@ +#endif /* __KERNEL__ */ + +#endif /* __OMAPFB_H */ ---- kernel-2.6.28.orig/include/linux/sched.h -+++ kernel-2.6.28/include/linux/sched.h +--- kernel-maemo-2.6.28.orig/include/linux/sched.h ++++ kernel-maemo-2.6.28/include/linux/sched.h @@ -631,7 +631,6 @@ atomic_t inotify_devs; /* How many inotify devs does this user have opened? */ #endif @@ -351203,8 +351203,8 @@ atomic_t epoll_watches; /* The number of file descriptors currently watched */ #endif #ifdef CONFIG_POSIX_MQUEUE ---- kernel-2.6.28.orig/include/linux/serial.h -+++ kernel-2.6.28/include/linux/serial.h +--- kernel-maemo-2.6.28.orig/include/linux/serial.h ++++ kernel-maemo-2.6.28/include/linux/serial.h @@ -10,8 +10,9 @@ #ifndef _LINUX_SERIAL_H #define _LINUX_SERIAL_H @@ -351216,8 +351216,8 @@ #include /* ---- kernel-2.6.28.orig/include/linux/serial_reg.h -+++ kernel-2.6.28/include/linux/serial_reg.h +--- kernel-maemo-2.6.28.orig/include/linux/serial_reg.h ++++ kernel-maemo-2.6.28/include/linux/serial_reg.h @@ -111,6 +111,7 @@ #define UART_MCR_DTR 0x01 /* DTR complement */ @@ -351234,8 +351234,8 @@ #endif /* _LINUX_SERIAL_REG_H */ ---- kernel-2.6.28.orig/include/linux/slub_def.h -+++ kernel-2.6.28/include/linux/slub_def.h +--- kernel-maemo-2.6.28.orig/include/linux/slub_def.h ++++ kernel-maemo-2.6.28/include/linux/slub_def.h @@ -139,8 +139,10 @@ return KMALLOC_SHIFT_LOW; @@ -351247,8 +351247,8 @@ if (size > 128 && size <= 192) return 2; #endif ---- kernel-2.6.28.orig/include/linux/spi/ads7846.h -+++ kernel-2.6.28/include/linux/spi/ads7846.h +--- kernel-maemo-2.6.28.orig/include/linux/spi/ads7846.h ++++ kernel-maemo-2.6.28/include/linux/spi/ads7846.h @@ -51,5 +51,10 @@ void **filter_data); int (*filter) (void *filter_data, int data_idx, int *val); @@ -351261,7 +351261,7 @@ }; --- /dev/null -+++ kernel-2.6.28/include/linux/spi/tsc2005.h ++++ kernel-maemo-2.6.28/include/linux/spi/tsc2005.h @@ -0,0 +1,30 @@ +#ifndef _LINUX_SPI_TSC2005_H +#define _LINUX_SPI_TSC2005_H @@ -351294,7 +351294,7 @@ + +#endif --- /dev/null -+++ kernel-2.6.28/include/linux/spi/tsc210x.h ++++ kernel-maemo-2.6.28/include/linux/spi/tsc210x.h @@ -0,0 +1,231 @@ +/* + * include/linux/spi/tsc210x.h @@ -351528,7 +351528,7 @@ + +#endif /* __LINUX_SPI_TSC210X_H */ --- /dev/null -+++ kernel-2.6.28/include/linux/spi/tsc2301.h ++++ kernel-maemo-2.6.28/include/linux/spi/tsc2301.h @@ -0,0 +1,197 @@ +#ifndef _LINUX_SPI_TSC2301_H +#define _LINUX_SPI_TSC2301_H @@ -351728,7 +351728,7 @@ + +#endif --- /dev/null -+++ kernel-2.6.28/include/linux/spi/wl12xx.h ++++ kernel-maemo-2.6.28/include/linux/spi/wl12xx.h @@ -0,0 +1,8 @@ +#ifndef _LINUX_SPI_WL12XX_H +#define _LINUX_SPI_WL12XX_H @@ -351739,7 +351739,7 @@ + +#endif --- /dev/null -+++ kernel-2.6.28/include/linux/ssi_char.h ++++ kernel-maemo-2.6.28/include/linux/ssi_char.h @@ -0,0 +1,71 @@ +/* + * ssi_char.h @@ -351813,7 +351813,7 @@ + +#endif /* SSI_CHAR_H */ --- /dev/null -+++ kernel-2.6.28/include/linux/ssi_driver_if.h ++++ kernel-maemo-2.6.28/include/linux/ssi_driver_if.h @@ -0,0 +1,164 @@ +/* + * ssi_driver_if.h @@ -351979,8 +351979,8 @@ + void (*port_event_cb)(struct ssi_device *dev, + unsigned int event, void *arg)); +#endif /* __SSI_H__ */ ---- kernel-2.6.28.orig/include/linux/swap.h -+++ kernel-2.6.28/include/linux/swap.h +--- kernel-maemo-2.6.28.orig/include/linux/swap.h ++++ kernel-maemo-2.6.28/include/linux/swap.h @@ -142,6 +142,21 @@ struct swap_extent *curr_swap_extent; unsigned old_block_size; @@ -352012,8 +352012,8 @@ extern sector_t swapdev_block(int, pgoff_t); extern struct swap_info_struct *get_swap_info_struct(unsigned); extern int can_share_swap_page(struct page *); ---- kernel-2.6.28.orig/include/linux/tty_ldisc.h -+++ kernel-2.6.28/include/linux/tty_ldisc.h +--- kernel-maemo-2.6.28.orig/include/linux/tty_ldisc.h ++++ kernel-maemo-2.6.28/include/linux/tty_ldisc.h @@ -133,7 +133,7 @@ /* * The following routines are called from below. @@ -352023,8 +352023,8 @@ char *fp, int count); void (*write_wakeup)(struct tty_struct *); ---- kernel-2.6.28.orig/include/linux/usb/gadget.h -+++ kernel-2.6.28/include/linux/usb/gadget.h +--- kernel-maemo-2.6.28.orig/include/linux/usb/gadget.h ++++ kernel-maemo-2.6.28/include/linux/usb/gadget.h @@ -484,6 +484,17 @@ unsigned b_hnp_enable:1; unsigned a_hnp_support:1; @@ -352052,7 +352052,7 @@ void (*resume)(struct usb_gadget *); --- /dev/null -+++ kernel-2.6.28/include/linux/usb/gpio_vbus.h ++++ kernel-maemo-2.6.28/include/linux/usb/gpio_vbus.h @@ -0,0 +1,30 @@ +/* + * A simple GPIO VBUS sensing driver for B peripheral only devices @@ -352084,8 +352084,8 @@ + bool gpio_vbus_inverted; + bool gpio_pullup_inverted; +}; ---- kernel-2.6.28.orig/include/linux/usb/musb.h -+++ kernel-2.6.28/include/linux/usb/musb.h +--- kernel-maemo-2.6.28.orig/include/linux/usb/musb.h ++++ kernel-maemo-2.6.28/include/linux/usb/musb.h @@ -46,7 +46,27 @@ u8 dma_req_chan; /* bitmask for required dma channels */ u8 ram_bits; /* ram address size */ @@ -352124,8 +352124,8 @@ }; ---- kernel-2.6.28.orig/include/linux/usb/otg.h -+++ kernel-2.6.28/include/linux/usb/otg.h +--- kernel-maemo-2.6.28.orig/include/linux/usb/otg.h ++++ kernel-maemo-2.6.28/include/linux/usb/otg.h @@ -84,6 +84,7 @@ /* for usb host and peripheral controller drivers */ @@ -352135,7 +352135,7 @@ static inline int otg_start_hnp(struct otg_transceiver *otg) --- /dev/null -+++ kernel-2.6.28/include/linux/usb/raw.h ++++ kernel-maemo-2.6.28/include/linux/usb/raw.h @@ -0,0 +1,50 @@ +/* + * raw.h -- USB Raw Access Header @@ -352187,8 +352187,8 @@ + +#endif /* __LINUX_USB_RAW_H */ + ---- kernel-2.6.28.orig/include/linux/videodev2.h -+++ kernel-2.6.28/include/linux/videodev2.h +--- kernel-maemo-2.6.28.orig/include/linux/videodev2.h ++++ kernel-maemo-2.6.28/include/linux/videodev2.h @@ -793,6 +793,7 @@ #define V4L2_CTRL_CLASS_USER 0x00980000 /* Old-style 'user' controls */ #define V4L2_CTRL_CLASS_MPEG 0x00990000 /* MPEG-compression controls */ @@ -352276,7 +352276,7 @@ #define BASE_VIDIOC_PRIVATE 192 /* 192-255 are private */ --- /dev/null -+++ kernel-2.6.28/include/media/ad5820.h ++++ kernel-maemo-2.6.28/include/media/ad5820.h @@ -0,0 +1,56 @@ +/* + * include/media/ad5820.h @@ -352335,7 +352335,7 @@ + +#endif /* AD5820_H */ --- /dev/null -+++ kernel-2.6.28/include/media/adp1653.h ++++ kernel-maemo-2.6.28/include/media/adp1653.h @@ -0,0 +1,86 @@ +/* + * include/media/adp1653.h @@ -352424,7 +352424,7 @@ + +#endif /* ADP1653_H */ --- /dev/null -+++ kernel-2.6.28/include/media/radio-bcm2048.h ++++ kernel-maemo-2.6.28/include/media/radio-bcm2048.h @@ -0,0 +1,30 @@ +/* + * drivers/media/radio/radio-bcm2048.h @@ -352457,7 +352457,7 @@ + +#endif /* ifndef BCM2048_H */ --- /dev/null -+++ kernel-2.6.28/include/media/smiaregs.h ++++ kernel-maemo-2.6.28/include/media/smiaregs.h @@ -0,0 +1,148 @@ +/* + * include/media/smiaregs.h @@ -352607,8 +352607,8 @@ + struct smia_meta_reglist *meta, u16 type); + +#endif ---- kernel-2.6.28.orig/include/media/v4l2-int-device.h -+++ kernel-2.6.28/include/media/v4l2-int-device.h +--- kernel-maemo-2.6.28.orig/include/media/v4l2-int-device.h ++++ kernel-maemo-2.6.28/include/media/v4l2-int-device.h @@ -84,6 +84,8 @@ void *priv; }; @@ -352663,8 +352663,8 @@ V4L2_INT_WRAPPER_0(reset); V4L2_INT_WRAPPER_0(init); ---- kernel-2.6.28.orig/include/net/bluetooth/bluetooth.h -+++ kernel-2.6.28/include/net/bluetooth/bluetooth.h +--- kernel-maemo-2.6.28.orig/include/net/bluetooth/bluetooth.h ++++ kernel-maemo-2.6.28/include/net/bluetooth/bluetooth.h @@ -53,9 +53,20 @@ #define SOL_SCO 17 #define SOL_RFCOMM 18 @@ -352696,8 +352696,8 @@ }; struct bt_sock_list { ---- kernel-2.6.28.orig/include/net/bluetooth/hci.h -+++ kernel-2.6.28/include/net/bluetooth/hci.h +--- kernel-maemo-2.6.28.orig/include/net/bluetooth/hci.h ++++ kernel-maemo-2.6.28/include/net/bluetooth/hci.h @@ -54,7 +54,7 @@ /* HCI device quirks */ @@ -352760,8 +352760,8 @@ /* ---- HCI Events ---- */ #define HCI_EV_INQUIRY_COMPLETE 0x01 ---- kernel-2.6.28.orig/include/net/bluetooth/hci_core.h -+++ kernel-2.6.28/include/net/bluetooth/hci_core.h +--- kernel-maemo-2.6.28.orig/include/net/bluetooth/hci_core.h ++++ kernel-maemo-2.6.28/include/net/bluetooth/hci_core.h @@ -169,7 +169,9 @@ __u16 link_policy; __u32 link_mode; @@ -352987,8 +352987,8 @@ } read_unlock_bh(&hci_cb_list_lock); } ---- kernel-2.6.28.orig/include/net/bluetooth/l2cap.h -+++ kernel-2.6.28/include/net/bluetooth/l2cap.h +--- kernel-maemo-2.6.28.orig/include/net/bluetooth/l2cap.h ++++ kernel-maemo-2.6.28/include/net/bluetooth/l2cap.h @@ -37,6 +37,7 @@ sa_family_t l2_family; __le16 l2_psm; @@ -353041,8 +353041,8 @@ #define L2CAP_CONF_MAX_RETRIES 2 ---- kernel-2.6.28.orig/include/net/bluetooth/rfcomm.h -+++ kernel-2.6.28/include/net/bluetooth/rfcomm.h +--- kernel-maemo-2.6.28.orig/include/net/bluetooth/rfcomm.h ++++ kernel-maemo-2.6.28/include/net/bluetooth/rfcomm.h @@ -29,6 +29,7 @@ #define RFCOMM_CONN_TIMEOUT (HZ * 30) #define RFCOMM_DISC_TIMEOUT (HZ * 20) @@ -353114,8 +353114,8 @@ }; struct rfcomm_dev_info { ---- kernel-2.6.28.orig/include/net/mac80211.h -+++ kernel-2.6.28/include/net/mac80211.h +--- kernel-maemo-2.6.28.orig/include/net/mac80211.h ++++ kernel-maemo-2.6.28/include/net/mac80211.h @@ -172,8 +172,12 @@ * @assoc: association status * @aid: association ID number, valid only when @assoc is true @@ -353245,8 +353245,8 @@ + enum ieee80211_rssi_state state); + #endif /* MAC80211_H */ ---- kernel-2.6.28.orig/include/net/neighbour.h -+++ kernel-2.6.28/include/net/neighbour.h +--- kernel-maemo-2.6.28.orig/include/net/neighbour.h ++++ kernel-maemo-2.6.28/include/net/neighbour.h @@ -24,6 +24,7 @@ #include @@ -353272,8 +353272,8 @@ struct pneigh_entry **phash_buckets; #ifdef CONFIG_PROC_FS struct proc_dir_entry *pde; ---- kernel-2.6.28.orig/include/net/phonet/pep.h -+++ kernel-2.6.28/include/net/phonet/pep.h +--- kernel-maemo-2.6.28.orig/include/net/phonet/pep.h ++++ kernel-maemo-2.6.28/include/net/phonet/pep.h @@ -35,12 +35,12 @@ struct sock *listener; struct sk_buff_head ctrlreq_queue; @@ -353288,8 +353288,8 @@ u8 rx_fc; /* RX flow control */ u8 tx_fc; /* TX flow control */ u8 init_enable; /* auto-enable at creation */ ---- kernel-2.6.28.orig/include/net/phonet/phonet.h -+++ kernel-2.6.28/include/net/phonet/phonet.h +--- kernel-maemo-2.6.28.orig/include/net/phonet/phonet.h ++++ kernel-maemo-2.6.28/include/net/phonet/phonet.h @@ -46,7 +46,7 @@ extern const struct proto_ops phonet_dgram_ops; @@ -353307,8 +353307,8 @@ int isi_register(void); void isi_unregister(void); ---- kernel-2.6.28.orig/include/net/phonet/pn_dev.h -+++ kernel-2.6.28/include/net/phonet/pn_dev.h +--- kernel-maemo-2.6.28.orig/include/net/phonet/pn_dev.h ++++ kernel-maemo-2.6.28/include/net/phonet/pn_dev.h @@ -28,7 +28,7 @@ spinlock_t lock; }; @@ -353336,8 +353336,8 @@ #define PN_NO_ADDR 0xff ---- kernel-2.6.28.orig/include/sound/jack.h -+++ kernel-2.6.28/include/sound/jack.h +--- kernel-maemo-2.6.28.orig/include/sound/jack.h ++++ kernel-maemo-2.6.28/include/sound/jack.h @@ -30,11 +30,18 @@ /** * Jack types which can be reported. These values are used as a @@ -353357,8 +353357,8 @@ }; struct snd_jack { ---- kernel-2.6.28.orig/kernel/cgroup.c -+++ kernel-2.6.28/kernel/cgroup.c +--- kernel-maemo-2.6.28.orig/kernel/cgroup.c ++++ kernel-maemo-2.6.28/kernel/cgroup.c @@ -2942,7 +2942,11 @@ parent = task_cgroup(tsk, subsys->subsys_id); @@ -353372,8 +353372,8 @@ /* Keep the cgroup alive */ get_css_set(cg); ---- kernel-2.6.28.orig/kernel/hrtimer.c -+++ kernel-2.6.28/kernel/hrtimer.c +--- kernel-maemo-2.6.28.orig/kernel/hrtimer.c ++++ kernel-maemo-2.6.28/kernel/hrtimer.c @@ -333,6 +333,8 @@ return res; } @@ -353383,8 +353383,8 @@ #ifdef CONFIG_DEBUG_OBJECTS_TIMERS static struct debug_obj_descr hrtimer_debug_descr; ---- kernel-2.6.28.orig/kernel/kfifo.c -+++ kernel-2.6.28/kernel/kfifo.c +--- kernel-maemo-2.6.28.orig/kernel/kfifo.c ++++ kernel-maemo-2.6.28/kernel/kfifo.c @@ -25,6 +25,7 @@ #include #include @@ -353453,8 +353453,8 @@ + return len; +} +EXPORT_SYMBOL(__kfifo_get_to_user); ---- kernel-2.6.28.orig/kernel/panic.c -+++ kernel-2.6.28/kernel/panic.c +--- kernel-maemo-2.6.28.orig/kernel/panic.c ++++ kernel-maemo-2.6.28/kernel/panic.c @@ -73,7 +73,6 @@ vsnprintf(buf, sizeof(buf), fmt, args); va_end(args); @@ -353472,8 +353472,8 @@ if (!panic_blink) panic_blink = no_blink; ---- kernel-2.6.28.orig/kernel/posix-timers.c -+++ kernel-2.6.28/kernel/posix-timers.c +--- kernel-maemo-2.6.28.orig/kernel/posix-timers.c ++++ kernel-maemo-2.6.28/kernel/posix-timers.c @@ -202,6 +202,12 @@ return -EOPNOTSUPP; } @@ -353495,8 +353495,8 @@ }; register_posix_clock(CLOCK_REALTIME, &clock_realtime); ---- kernel-2.6.28.orig/kernel/printk.c -+++ kernel-2.6.28/kernel/printk.c +--- kernel-maemo-2.6.28.orig/kernel/printk.c ++++ kernel-maemo-2.6.28/kernel/printk.c @@ -44,6 +44,10 @@ #define __LOG_BUF_LEN (1 << CONFIG_LOG_BUF_SHIFT) @@ -353518,8 +353518,8 @@ /* * Copy the output into log_buf. If the caller didn't provide ---- kernel-2.6.28.orig/kernel/time/clockevents.c -+++ kernel-2.6.28/kernel/time/clockevents.c +--- kernel-maemo-2.6.28.orig/kernel/time/clockevents.c ++++ kernel-maemo-2.6.28/kernel/time/clockevents.c @@ -36,7 +36,7 @@ * * Math helper, returns latch value converted to nanoseconds (bound checked) @@ -353543,8 +353543,8 @@ } /** ---- kernel-2.6.28.orig/kernel/time/tick-sched.c -+++ kernel-2.6.28/kernel/time/tick-sched.c +--- kernel-maemo-2.6.28.orig/kernel/time/tick-sched.c ++++ kernel-maemo-2.6.28/kernel/time/tick-sched.c @@ -222,6 +222,15 @@ cpu = smp_processor_id(); @@ -353635,8 +353635,8 @@ ts->idle_expires = expires; if (ts->nohz_mode == NOHZ_MODE_HIGHRES) { ---- kernel-2.6.28.orig/kernel/time/timer_list.c -+++ kernel-2.6.28/kernel/time/timer_list.c +--- kernel-maemo-2.6.28.orig/kernel/time/timer_list.c ++++ kernel-maemo-2.6.28/kernel/time/timer_list.c @@ -204,7 +204,7 @@ return; } @@ -353646,8 +353646,8 @@ SEQ_printf(m, " min_delta_ns: %lu\n", dev->min_delta_ns); SEQ_printf(m, " mult: %lu\n", dev->mult); SEQ_printf(m, " shift: %d\n", dev->shift); ---- kernel-2.6.28.orig/kernel/timer.c -+++ kernel-2.6.28/kernel/timer.c +--- kernel-maemo-2.6.28.orig/kernel/timer.c ++++ kernel-maemo-2.6.28/kernel/timer.c @@ -930,6 +930,9 @@ index = slot = timer_jiffies & TVN_MASK; do { @@ -353658,8 +353658,8 @@ found = 1; if (time_before(nte->expires, expires)) expires = nte->expires; ---- kernel-2.6.28.orig/lib/Kconfig.debug -+++ kernel-2.6.28/lib/Kconfig.debug +--- kernel-maemo-2.6.28.orig/lib/Kconfig.debug ++++ kernel-maemo-2.6.28/lib/Kconfig.debug @@ -731,6 +731,12 @@ help Enable configuration of fault-injection capabilities via debugfs. @@ -353673,8 +353673,8 @@ config FAULT_INJECTION_STACKTRACE_FILTER bool "stacktrace filter for fault-injection capabilities" depends on FAULT_INJECTION_DEBUG_FS && STACKTRACE_SUPPORT ---- kernel-2.6.28.orig/lib/bust_spinlocks.c -+++ kernel-2.6.28/lib/bust_spinlocks.c +--- kernel-maemo-2.6.28.orig/lib/bust_spinlocks.c ++++ kernel-maemo-2.6.28/lib/bust_spinlocks.c @@ -12,6 +12,7 @@ #include #include @@ -353691,8 +353691,8 @@ if (--oops_in_progress == 0) wake_up_klogd(); } ---- kernel-2.6.28.orig/lib/lzo/Makefile -+++ kernel-2.6.28/lib/lzo/Makefile +--- kernel-maemo-2.6.28.orig/lib/lzo/Makefile ++++ kernel-maemo-2.6.28/lib/lzo/Makefile @@ -1,4 +1,4 @@ -lzo_compress-objs := lzo1x_compress.o +lzo_compress-objs := lzo1x_compress.o lzo1x_9x.o @@ -353700,7 +353700,7 @@ obj-$(CONFIG_LZO_COMPRESS) += lzo_compress.o --- /dev/null -+++ kernel-2.6.28/lib/lzo/lzo1x_9x.c ++++ kernel-maemo-2.6.28/lib/lzo/lzo1x_9x.c @@ -0,0 +1,1272 @@ +/* lzo1x_9x.c -- implementation of the LZO1X-999 compression algorithm + @@ -354974,8 +354974,8 @@ +} +EXPORT_SYMBOL_GPL(lzo1x_999_compress); + ---- kernel-2.6.28.orig/mm/memory.c -+++ kernel-2.6.28/mm/memory.c +--- kernel-maemo-2.6.28.orig/mm/memory.c ++++ kernel-maemo-2.6.28/mm/memory.c @@ -1110,6 +1110,7 @@ } return page; @@ -354984,8 +354984,8 @@ /* Can we do the FOLL_ANON optimization? */ static inline int use_zero_page(struct vm_area_struct *vma) ---- kernel-2.6.28.orig/mm/page-writeback.c -+++ kernel-2.6.28/mm/page-writeback.c +--- kernel-maemo-2.6.28.orig/mm/page-writeback.c ++++ kernel-maemo-2.6.28/mm/page-writeback.c @@ -34,6 +34,7 @@ #include #include @@ -355164,8 +355164,8 @@ writeback_set_ratelimit(); register_cpu_notifier(&ratelimit_nb); ---- kernel-2.6.28.orig/mm/page_io.c -+++ kernel-2.6.28/mm/page_io.c +--- kernel-maemo-2.6.28.orig/mm/page_io.c ++++ kernel-maemo-2.6.28/mm/page_io.c @@ -20,7 +20,8 @@ #include @@ -355206,8 +355206,8 @@ if (bio == NULL) { unlock_page(page); ret = -ENOMEM; ---- kernel-2.6.28.orig/mm/slub.c -+++ kernel-2.6.28/mm/slub.c +--- kernel-maemo-2.6.28.orig/mm/slub.c ++++ kernel-maemo-2.6.28/mm/slub.c @@ -9,6 +9,7 @@ */ @@ -355305,8 +355305,8 @@ return s; } kfree(s); ---- kernel-2.6.28.orig/mm/swapfile.c -+++ kernel-2.6.28/mm/swapfile.c +--- kernel-maemo-2.6.28.orig/mm/swapfile.c ++++ kernel-maemo-2.6.28/mm/swapfile.c @@ -273,22 +273,41 @@ static int swap_entry_free(struct swap_info_struct *p, unsigned long offset) { @@ -355552,8 +355552,8 @@ vfree(swap_map); if (swap_file) filp_close(swap_file, NULL); ---- kernel-2.6.28.orig/mm/vmalloc.c -+++ kernel-2.6.28/mm/vmalloc.c +--- kernel-maemo-2.6.28.orig/mm/vmalloc.c ++++ kernel-maemo-2.6.28/mm/vmalloc.c @@ -1085,6 +1085,7 @@ return __get_vm_area_node(size, flags, VMALLOC_START, VMALLOC_END, -1, GFP_KERNEL, __builtin_return_address(0)); @@ -355562,8 +355562,8 @@ struct vm_struct *get_vm_area_caller(unsigned long size, unsigned long flags, void *caller) ---- kernel-2.6.28.orig/net/Kconfig -+++ kernel-2.6.28/net/Kconfig +--- kernel-maemo-2.6.28.orig/net/Kconfig ++++ kernel-maemo-2.6.28/net/Kconfig @@ -190,6 +190,7 @@ source "net/lapb/Kconfig" source "net/econet/Kconfig" @@ -355580,8 +355580,8 @@ config FIB_RULES bool ---- kernel-2.6.28.orig/net/bluetooth/af_bluetooth.c -+++ kernel-2.6.28/net/bluetooth/af_bluetooth.c +--- kernel-maemo-2.6.28.orig/net/bluetooth/af_bluetooth.c ++++ kernel-maemo-2.6.28/net/bluetooth/af_bluetooth.c @@ -41,18 +41,13 @@ #include @@ -355703,8 +355703,8 @@ return POLLIN | POLLRDNORM; } ---- kernel-2.6.28.orig/net/bluetooth/bnep/bnep.h -+++ kernel-2.6.28/net/bluetooth/bnep/bnep.h +--- kernel-maemo-2.6.28.orig/net/bluetooth/bnep/bnep.h ++++ kernel-maemo-2.6.28/net/bluetooth/bnep/bnep.h @@ -161,7 +161,7 @@ struct msghdr msg; @@ -355714,8 +355714,8 @@ struct socket *sock; struct net_device *dev; ---- kernel-2.6.28.orig/net/bluetooth/bnep/core.c -+++ kernel-2.6.28/net/bluetooth/bnep/core.c +--- kernel-maemo-2.6.28.orig/net/bluetooth/bnep/core.c ++++ kernel-maemo-2.6.28/net/bluetooth/bnep/core.c @@ -52,11 +52,6 @@ #include "bnep.h" @@ -355728,8 +355728,8 @@ #define VERSION "1.3" static int compress_src = 1; ---- kernel-2.6.28.orig/net/bluetooth/bnep/netdev.c -+++ kernel-2.6.28/net/bluetooth/bnep/netdev.c +--- kernel-maemo-2.6.28.orig/net/bluetooth/bnep/netdev.c ++++ kernel-maemo-2.6.28/net/bluetooth/bnep/netdev.c @@ -41,11 +41,6 @@ #include "bnep.h" @@ -355742,8 +355742,8 @@ #define BNEP_TX_QUEUE_LEN 20 static int bnep_net_open(struct net_device *dev) ---- kernel-2.6.28.orig/net/bluetooth/bnep/sock.c -+++ kernel-2.6.28/net/bluetooth/bnep/sock.c +--- kernel-maemo-2.6.28.orig/net/bluetooth/bnep/sock.c ++++ kernel-maemo-2.6.28/net/bluetooth/bnep/sock.c @@ -46,11 +46,6 @@ #include "bnep.h" @@ -355756,8 +355756,8 @@ static int bnep_sock_release(struct socket *sock) { struct sock *sk = sock->sk; ---- kernel-2.6.28.orig/net/bluetooth/cmtp/capi.c -+++ kernel-2.6.28/net/bluetooth/cmtp/capi.c +--- kernel-maemo-2.6.28.orig/net/bluetooth/cmtp/capi.c ++++ kernel-maemo-2.6.28/net/bluetooth/cmtp/capi.c @@ -42,11 +42,6 @@ #include "cmtp.h" @@ -355770,8 +355770,8 @@ #define CAPI_INTEROPERABILITY 0x20 #define CAPI_INTEROPERABILITY_REQ CAPICMD(CAPI_INTEROPERABILITY, CAPI_REQ) ---- kernel-2.6.28.orig/net/bluetooth/cmtp/core.c -+++ kernel-2.6.28/net/bluetooth/cmtp/core.c +--- kernel-maemo-2.6.28.orig/net/bluetooth/cmtp/core.c ++++ kernel-maemo-2.6.28/net/bluetooth/cmtp/core.c @@ -44,11 +44,6 @@ #include "cmtp.h" @@ -355794,8 +355794,8 @@ } static inline int cmtp_recv_frame(struct cmtp_session *session, struct sk_buff *skb) ---- kernel-2.6.28.orig/net/bluetooth/cmtp/sock.c -+++ kernel-2.6.28/net/bluetooth/cmtp/sock.c +--- kernel-maemo-2.6.28.orig/net/bluetooth/cmtp/sock.c ++++ kernel-maemo-2.6.28/net/bluetooth/cmtp/sock.c @@ -43,11 +43,6 @@ #include "cmtp.h" @@ -355808,8 +355808,8 @@ static int cmtp_sock_release(struct socket *sock) { struct sock *sk = sock->sk; ---- kernel-2.6.28.orig/net/bluetooth/hci_conn.c -+++ kernel-2.6.28/net/bluetooth/hci_conn.c +--- kernel-maemo-2.6.28.orig/net/bluetooth/hci_conn.c ++++ kernel-maemo-2.6.28/net/bluetooth/hci_conn.c @@ -45,11 +45,6 @@ #include #include @@ -356045,8 +356045,8 @@ hci_conn_del(c); } } ---- kernel-2.6.28.orig/net/bluetooth/hci_core.c -+++ kernel-2.6.28/net/bluetooth/hci_core.c +--- kernel-maemo-2.6.28.orig/net/bluetooth/hci_core.c ++++ kernel-maemo-2.6.28/net/bluetooth/hci_core.c @@ -48,11 +48,6 @@ #include #include @@ -356096,8 +356096,8 @@ if ((hdev->sent_cmd = skb_clone(skb, GFP_ATOMIC))) { atomic_dec(&hdev->cmd_cnt); ---- kernel-2.6.28.orig/net/bluetooth/hci_event.c -+++ kernel-2.6.28/net/bluetooth/hci_event.c +--- kernel-maemo-2.6.28.orig/net/bluetooth/hci_event.c ++++ kernel-maemo-2.6.28/net/bluetooth/hci_event.c @@ -45,11 +45,6 @@ #include #include @@ -356301,8 +356301,8 @@ hci_proto_connect_cfm(conn, ev->status); if (ev->status) ---- kernel-2.6.28.orig/net/bluetooth/hci_sock.c -+++ kernel-2.6.28/net/bluetooth/hci_sock.c +--- kernel-maemo-2.6.28.orig/net/bluetooth/hci_sock.c ++++ kernel-maemo-2.6.28/net/bluetooth/hci_sock.c @@ -49,11 +49,6 @@ #include #include @@ -356315,8 +356315,8 @@ /* ----- HCI socket interface ----- */ static inline int hci_test_bit(int nr, void *addr) ---- kernel-2.6.28.orig/net/bluetooth/hci_sysfs.c -+++ kernel-2.6.28/net/bluetooth/hci_sysfs.c +--- kernel-maemo-2.6.28.orig/net/bluetooth/hci_sysfs.c ++++ kernel-maemo-2.6.28/net/bluetooth/hci_sysfs.c @@ -6,16 +6,10 @@ #include #include @@ -356491,8 +356491,8 @@ class_destroy(bt_class); } ---- kernel-2.6.28.orig/net/bluetooth/hidp/core.c -+++ kernel-2.6.28/net/bluetooth/hidp/core.c +--- kernel-maemo-2.6.28.orig/net/bluetooth/hidp/core.c ++++ kernel-maemo-2.6.28/net/bluetooth/hidp/core.c @@ -47,11 +47,6 @@ #include "hidp.h" @@ -356505,8 +356505,8 @@ #define VERSION "1.2" static DECLARE_RWSEM(hidp_session_sem); ---- kernel-2.6.28.orig/net/bluetooth/hidp/sock.c -+++ kernel-2.6.28/net/bluetooth/hidp/sock.c +--- kernel-maemo-2.6.28.orig/net/bluetooth/hidp/sock.c ++++ kernel-maemo-2.6.28/net/bluetooth/hidp/sock.c @@ -39,11 +39,6 @@ #include "hidp.h" @@ -356519,8 +356519,8 @@ static int hidp_sock_release(struct socket *sock) { struct sock *sk = sock->sk; ---- kernel-2.6.28.orig/net/bluetooth/l2cap.c -+++ kernel-2.6.28/net/bluetooth/l2cap.c +--- kernel-maemo-2.6.28.orig/net/bluetooth/l2cap.c ++++ kernel-maemo-2.6.28/net/bluetooth/l2cap.c @@ -50,14 +50,10 @@ #include #include @@ -357510,8 +357510,8 @@ .recv_acldata = l2cap_recv_acldata }; ---- kernel-2.6.28.orig/net/bluetooth/rfcomm/core.c -+++ kernel-2.6.28/net/bluetooth/rfcomm/core.c +--- kernel-maemo-2.6.28.orig/net/bluetooth/rfcomm/core.c ++++ kernel-maemo-2.6.28/net/bluetooth/rfcomm/core.c @@ -46,12 +46,7 @@ #include #include @@ -357931,8 +357931,8 @@ }; static ssize_t rfcomm_dlc_sysfs_show(struct class *dev, char *buf) ---- kernel-2.6.28.orig/net/bluetooth/rfcomm/sock.c -+++ kernel-2.6.28/net/bluetooth/rfcomm/sock.c +--- kernel-maemo-2.6.28.orig/net/bluetooth/rfcomm/sock.c ++++ kernel-maemo-2.6.28/net/bluetooth/rfcomm/sock.c @@ -50,11 +50,6 @@ #include #include @@ -358235,8 +358235,8 @@ return result; } ---- kernel-2.6.28.orig/net/bluetooth/rfcomm/tty.c -+++ kernel-2.6.28/net/bluetooth/rfcomm/tty.c +--- kernel-maemo-2.6.28.orig/net/bluetooth/rfcomm/tty.c ++++ kernel-maemo-2.6.28/net/bluetooth/rfcomm/tty.c @@ -39,11 +39,6 @@ #include #include @@ -358323,8 +358323,8 @@ } rfcomm_dev_put(dev); ---- kernel-2.6.28.orig/net/bluetooth/sco.c -+++ kernel-2.6.28/net/bluetooth/sco.c +--- kernel-maemo-2.6.28.orig/net/bluetooth/sco.c ++++ kernel-maemo-2.6.28/net/bluetooth/sco.c @@ -48,11 +48,6 @@ #include #include @@ -358511,8 +358511,8 @@ .recv_scodata = sco_recv_scodata }; ---- kernel-2.6.28.orig/net/core/dev.c -+++ kernel-2.6.28/net/core/dev.c +--- kernel-maemo-2.6.28.orig/net/core/dev.c ++++ kernel-maemo-2.6.28/net/core/dev.c @@ -281,8 +281,8 @@ ARPHRD_PIMREG, ARPHRD_HIPPI, ARPHRD_ASH, ARPHRD_ECONET, ARPHRD_IRDA, ARPHRD_FCPP, ARPHRD_FCAL, ARPHRD_FCPL, @@ -358535,8 +358535,8 @@ static struct lock_class_key netdev_xmit_lock_key[ARRAY_SIZE(netdev_lock_type)]; static struct lock_class_key netdev_addr_lock_key[ARRAY_SIZE(netdev_lock_type)]; ---- kernel-2.6.28.orig/net/core/neighbour.c -+++ kernel-2.6.28/net/core/neighbour.c +--- kernel-maemo-2.6.28.orig/net/core/neighbour.c ++++ kernel-maemo-2.6.28/net/core/neighbour.c @@ -694,75 +694,74 @@ hh->hh_output = neigh->ops->hh_output; } @@ -358683,8 +358683,8 @@ .ndtc_proxy_qlen = tbl->proxy_queue.qlen, }; ---- kernel-2.6.28.orig/net/core/sock.c -+++ kernel-2.6.28/net/core/sock.c +--- kernel-maemo-2.6.28.orig/net/core/sock.c ++++ kernel-maemo-2.6.28/net/core/sock.c @@ -886,8 +886,23 @@ struct kmem_cache *slab; @@ -358711,8 +358711,8 @@ else sk = kmalloc(prot->obj_size, priority); ---- kernel-2.6.28.orig/net/ipv4/netfilter/Kconfig -+++ kernel-2.6.28/net/ipv4/netfilter/Kconfig +--- kernel-maemo-2.6.28.orig/net/ipv4/netfilter/Kconfig ++++ kernel-maemo-2.6.28/net/ipv4/netfilter/Kconfig @@ -204,6 +204,19 @@ To compile it as a module, choose M here. If unsure, say N. @@ -358763,8 +358763,8 @@ + endmenu ---- kernel-2.6.28.orig/net/ipv4/netfilter/Makefile -+++ kernel-2.6.28/net/ipv4/netfilter/Makefile +--- kernel-maemo-2.6.28.orig/net/ipv4/netfilter/Makefile ++++ kernel-maemo-2.6.28/net/ipv4/netfilter/Makefile @@ -61,6 +61,7 @@ obj-$(CONFIG_IP_NF_TARGET_NETMAP) += ipt_NETMAP.o obj-$(CONFIG_IP_NF_TARGET_REDIRECT) += ipt_REDIRECT.o @@ -358779,7 +358779,7 @@ +obj-$(CONFIG_IP_NF_HB) += iphb.o --- /dev/null -+++ kernel-2.6.28/net/ipv4/netfilter/iphb.c ++++ kernel-maemo-2.6.28/net/ipv4/netfilter/iphb.c @@ -0,0 +1,439 @@ +/* + * linux/net/ipv4/netfilter/iphb.c @@ -359221,7 +359221,7 @@ +MODULE_DESCRIPTION("netfilter module for delaying TCP keepalive packets"); +MODULE_LICENSE("GPL"); --- /dev/null -+++ kernel-2.6.28/net/ipv4/netfilter/ipt_IDLETIMER.c ++++ kernel-maemo-2.6.28/net/ipv4/netfilter/ipt_IDLETIMER.c @@ -0,0 +1,305 @@ +/* + * linux/net/ipv4/netfilter/ipt_IDLETIMER.c @@ -359528,8 +359528,8 @@ +MODULE_AUTHOR("Timo Teras "); +MODULE_DESCRIPTION("iptables idletimer target module"); +MODULE_LICENSE("GPL"); ---- kernel-2.6.28.orig/net/mac80211/debugfs.c -+++ kernel-2.6.28/net/mac80211/debugfs.c +--- kernel-maemo-2.6.28.orig/net/mac80211/debugfs.c ++++ kernel-maemo-2.6.28/net/mac80211/debugfs.c @@ -190,6 +190,64 @@ DEBUGFS_DEVSTATS_FILE(dot11RTSSuccessCount); @@ -359606,8 +359606,8 @@ statsd = debugfs_create_dir("statistics", phyd); local->debugfs.statistics = statsd; ---- kernel-2.6.28.orig/net/mac80211/ieee80211_i.h -+++ kernel-2.6.28/net/mac80211/ieee80211_i.h +--- kernel-maemo-2.6.28.orig/net/mac80211/ieee80211_i.h ++++ kernel-maemo-2.6.28/net/mac80211/ieee80211_i.h @@ -107,6 +107,7 @@ * otherwise, you probably don't want to use them. */ int has_erp_value; @@ -359714,8 +359714,8 @@ #ifdef CONFIG_MAC80211_NOINLINE #define debug_noinline noinline #else ---- kernel-2.6.28.orig/net/mac80211/iface.c -+++ kernel-2.6.28/net/mac80211/iface.c +--- kernel-maemo-2.6.28.orig/net/mac80211/iface.c ++++ kernel-maemo-2.6.28/net/mac80211/iface.c @@ -154,6 +154,16 @@ goto err_del_bss; need_hw_reconfig = 1; @@ -359754,8 +359754,8 @@ flush_workqueue(local->hw.workqueue); ---- kernel-2.6.28.orig/net/mac80211/main.c -+++ kernel-2.6.28/net/mac80211/main.c +--- kernel-maemo-2.6.28.orig/net/mac80211/main.c ++++ kernel-maemo-2.6.28/net/mac80211/main.c @@ -342,9 +342,12 @@ u32 ieee80211_reset_erp_info(struct ieee80211_sub_if_data *sdata) @@ -359790,8 +359790,8 @@ sta_info_init(local); tasklet_init(&local->tx_pending_tasklet, ieee80211_tx_pending, ---- kernel-2.6.28.orig/net/mac80211/mlme.c -+++ kernel-2.6.28/net/mac80211/mlme.c +--- kernel-maemo-2.6.28.orig/net/mac80211/mlme.c ++++ kernel-maemo-2.6.28/net/mac80211/mlme.c @@ -34,7 +34,6 @@ #define IEEE80211_ASSOC_TIMEOUT (HZ / 5) #define IEEE80211_ASSOC_MAX_TRIES 3 @@ -360322,8 +360322,8 @@ + + queue_work(local->hw.workqueue, &local->dynamic_ps_enable_work); +} ---- kernel-2.6.28.orig/net/mac80211/rc80211_minstrel.c -+++ kernel-2.6.28/net/mac80211/rc80211_minstrel.c +--- kernel-maemo-2.6.28.orig/net/mac80211/rc80211_minstrel.c ++++ kernel-maemo-2.6.28/net/mac80211/rc80211_minstrel.c @@ -389,13 +389,16 @@ { struct minstrel_sta_info *mi = priv_sta; @@ -360365,8 +360365,8 @@ max_rates = sband->n_bitrates; } ---- kernel-2.6.28.orig/net/mac80211/rx.c -+++ kernel-2.6.28/net/mac80211/rx.c +--- kernel-maemo-2.6.28.orig/net/mac80211/rx.c ++++ kernel-maemo-2.6.28/net/mac80211/rx.c @@ -733,12 +733,19 @@ * Mesh beacons will update last_rx when if they are found to * match the current local configuration when processed. @@ -360388,8 +360388,8 @@ sta->rx_fragments++; sta->rx_bytes += rx->skb->len; sta->last_signal = rx->status->signal; ---- kernel-2.6.28.orig/net/mac80211/scan.c -+++ kernel-2.6.28/net/mac80211/scan.c +--- kernel-maemo-2.6.28.orig/net/mac80211/scan.c ++++ kernel-maemo-2.6.28/net/mac80211/scan.c @@ -759,7 +759,12 @@ struct iw_event iwe; char *buf; @@ -360404,8 +360404,8 @@ bss->last_update + IEEE80211_SCAN_RESULT_EXPIRE)) return current_ev; ---- kernel-2.6.28.orig/net/mac80211/sta_info.c -+++ kernel-2.6.28/net/mac80211/sta_info.c +--- kernel-maemo-2.6.28.orig/net/mac80211/sta_info.c ++++ kernel-maemo-2.6.28/net/mac80211/sta_info.c @@ -538,7 +538,7 @@ } @@ -360461,8 +360461,8 @@ } #ifdef CONFIG_MAC80211_DEBUGFS ---- kernel-2.6.28.orig/net/mac80211/tx.c -+++ kernel-2.6.28/net/mac80211/tx.c +--- kernel-maemo-2.6.28.orig/net/mac80211/tx.c ++++ kernel-maemo-2.6.28/net/mac80211/tx.c @@ -330,6 +330,7 @@ struct sta_info *sta = tx->sta; struct ieee80211_tx_info *info = IEEE80211_SKB_CB(tx->skb); @@ -360500,8 +360500,8 @@ nh_pos = skb_network_header(skb) - skb->data; h_pos = skb_transport_header(skb) - skb->data; ---- kernel-2.6.28.orig/net/mac80211/util.c -+++ kernel-2.6.28/net/mac80211/util.c +--- kernel-maemo-2.6.28.orig/net/mac80211/util.c ++++ kernel-maemo-2.6.28/net/mac80211/util.c @@ -330,10 +330,20 @@ } EXPORT_SYMBOL(ieee80211_ctstoself_duration); @@ -360629,8 +360629,8 @@ } EXPORT_SYMBOL(ieee80211_wake_queues); ---- kernel-2.6.28.orig/net/mac80211/wext.c -+++ kernel-2.6.28/net/mac80211/wext.c +--- kernel-maemo-2.6.28.orig/net/mac80211/wext.c ++++ kernel-maemo-2.6.28/net/mac80211/wext.c @@ -864,15 +864,20 @@ { struct ieee80211_sub_if_data *sdata; @@ -360726,8 +360726,8 @@ return 0; } ---- kernel-2.6.28.orig/net/phonet/af_phonet.c -+++ kernel-2.6.28/net/phonet/af_phonet.c +--- kernel-maemo-2.6.28.orig/net/phonet/af_phonet.c ++++ kernel-maemo-2.6.28/net/phonet/af_phonet.c @@ -67,9 +67,6 @@ struct phonet_protocol *pnp; int err; @@ -360831,8 +360831,8 @@ phonet_device_exit(); return err; } ---- kernel-2.6.28.orig/net/phonet/pep-gprs.c -+++ kernel-2.6.28/net/phonet/pep-gprs.c +--- kernel-maemo-2.6.28.orig/net/phonet/pep-gprs.c ++++ kernel-maemo-2.6.28/net/phonet/pep-gprs.c @@ -40,23 +40,17 @@ void (*old_data_ready)(struct sock *, int); void (*old_write_space)(struct sock *); @@ -361196,8 +361196,8 @@ + unregister_netdev(dev); sock_put(sk); } ---- kernel-2.6.28.orig/net/phonet/pep.c -+++ kernel-2.6.28/net/phonet/pep.c +--- kernel-maemo-2.6.28.orig/net/phonet/pep.c ++++ kernel-maemo-2.6.28/net/phonet/pep.c @@ -225,6 +225,7 @@ { struct pep_sock *pn = pep_sk(sk); @@ -361378,8 +361378,8 @@ } int pep_write(struct sock *sk, struct sk_buff *skb) ---- kernel-2.6.28.orig/net/phonet/pn_dev.c -+++ kernel-2.6.28/net/phonet/pn_dev.c +--- kernel-maemo-2.6.28.orig/net/phonet/pn_dev.c ++++ kernel-maemo-2.6.28/net/phonet/pn_dev.c @@ -28,32 +28,41 @@ #include #include @@ -361629,8 +361629,8 @@ unregister_netdevice_notifier(&phonet_device_notifier); + unregister_pernet_gen_device(phonet_net_id, &phonet_net_ops); } ---- kernel-2.6.28.orig/net/phonet/pn_netlink.c -+++ kernel-2.6.28/net/phonet/pn_netlink.c +--- kernel-maemo-2.6.28.orig/net/phonet/pn_netlink.c ++++ kernel-maemo-2.6.28/net/phonet/pn_netlink.c @@ -123,17 +123,16 @@ static int getaddr_dumpit(struct sk_buff *skb, struct netlink_callback *cb) @@ -361680,8 +361680,8 @@ + __rtnl_register(PF_PHONET, RTM_GETADDR, NULL, getaddr_dumpit); + return 0; } ---- kernel-2.6.28.orig/net/phonet/socket.c -+++ kernel-2.6.28/net/phonet/socket.c +--- kernel-maemo-2.6.28.orig/net/phonet/socket.c ++++ kernel-maemo-2.6.28/net/phonet/socket.c @@ -57,7 +57,7 @@ * Find address based on socket address, match only certain fields. * Also grab sock if it was found. Remember to sock_put it later. @@ -361744,8 +361744,8 @@ if (tmpsk == NULL) /* No sock there! We can use that port... */ goto found; ---- kernel-2.6.28.orig/net/phonet/sysctl.c -+++ kernel-2.6.28/net/phonet/sysctl.c +--- kernel-maemo-2.6.28.orig/net/phonet/sysctl.c ++++ kernel-maemo-2.6.28/net/phonet/sysctl.c @@ -89,13 +89,13 @@ .data = &local_port_range, .maxlen = sizeof(local_port_range), @@ -361762,8 +361762,8 @@ { .procname = "net", .ctl_name = CTL_NET, }, { .procname = "phonet", .ctl_name = CTL_UNNUMBERED, }, { }, ---- kernel-2.6.28.orig/net/socket.c -+++ kernel-2.6.28/net/socket.c +--- kernel-maemo-2.6.28.orig/net/socket.c ++++ kernel-maemo-2.6.28/net/socket.c @@ -695,7 +695,7 @@ if (more) flags |= MSG_MORE; @@ -361773,8 +361773,8 @@ } static ssize_t sock_splice_read(struct file *file, loff_t *ppos, ---- kernel-2.6.28.orig/net/wireless/nl80211.c -+++ kernel-2.6.28/net/wireless/nl80211.c +--- kernel-maemo-2.6.28.orig/net/wireless/nl80211.c ++++ kernel-maemo-2.6.28/net/wireless/nl80211.c @@ -619,7 +619,7 @@ if (IS_ERR(hdr)) { @@ -361801,8 +361801,8 @@ nlmsg_free(msg); out: cfg80211_put_dev(drv); ---- kernel-2.6.28.orig/net/wireless/reg.c -+++ kernel-2.6.28/net/wireless/reg.c +--- kernel-maemo-2.6.28.orig/net/wireless/reg.c ++++ kernel-maemo-2.6.28/net/wireless/reg.c @@ -98,7 +98,7 @@ .alpha2 = "US", .reg_rules = { @@ -361953,8 +361953,8 @@ print_regdomain_info(cfg80211_regdomain); /* The old code still requests for a new regdomain and if * you have CRDA you get it updated, otherwise you get ---- kernel-2.6.28.orig/scripts/package/Makefile -+++ kernel-2.6.28/scripts/package/Makefile +--- kernel-maemo-2.6.28.orig/scripts/package/Makefile ++++ kernel-maemo-2.6.28/scripts/package/Makefile @@ -74,7 +74,7 @@ $(MAKE) KBUILD_SRC= $(CONFIG_SHELL) $(srctree)/scripts/package/builddeb @@ -361964,8 +361964,8 @@ # tarball targets ---- kernel-2.6.28.orig/security/Kconfig -+++ kernel-2.6.28/security/Kconfig +--- kernel-maemo-2.6.28.orig/security/Kconfig ++++ kernel-maemo-2.6.28/security/Kconfig @@ -103,6 +103,14 @@ If you are unsure how to answer this question, answer N. @@ -361981,16 +361981,16 @@ config SECURITY_DEFAULT_MMAP_MIN_ADDR int "Low address space to protect from user allocation" depends on SECURITY ---- kernel-2.6.28.orig/security/Makefile -+++ kernel-2.6.28/security/Makefile +--- kernel-maemo-2.6.28.orig/security/Makefile ++++ kernel-maemo-2.6.28/security/Makefile @@ -16,4 +16,5 @@ obj-$(CONFIG_SECURITY_SELINUX) += selinux/built-in.o obj-$(CONFIG_SECURITY_SMACK) += smack/built-in.o obj-$(CONFIG_SECURITY_ROOTPLUG) += root_plug.o +obj-$(CONFIG_SECURITY_LOWMEM) += commoncap.o lowmem.o obj-$(CONFIG_CGROUP_DEVICE) += device_cgroup.o ---- kernel-2.6.28.orig/security/device_cgroup.c -+++ kernel-2.6.28/security/device_cgroup.c +--- kernel-maemo-2.6.28.orig/security/device_cgroup.c ++++ kernel-maemo-2.6.28/security/device_cgroup.c @@ -513,6 +513,9 @@ struct dev_cgroup *dev_cgroup; struct dev_whitelist_item *wh; @@ -362002,7 +362002,7 @@ dev_cgroup = task_devcgroup(current); --- /dev/null -+++ kernel-2.6.28/security/lowmem.c ++++ kernel-maemo-2.6.28/security/lowmem.c @@ -0,0 +1,384 @@ +#include +#include @@ -362388,8 +362388,8 @@ + +MODULE_DESCRIPTION("Low watermark LSM module"); +MODULE_LICENSE("GPL"); ---- kernel-2.6.28.orig/sound/core/jack.c -+++ kernel-2.6.28/sound/core/jack.c +--- kernel-maemo-2.6.28.orig/sound/core/jack.c ++++ kernel-maemo-2.6.28/sound/core/jack.c @@ -23,6 +23,14 @@ #include #include @@ -362454,8 +362454,8 @@ input_sync(jack->input_dev); } ---- kernel-2.6.28.orig/sound/soc/codecs/Kconfig -+++ kernel-2.6.28/sound/soc/codecs/Kconfig +--- kernel-maemo-2.6.28.orig/sound/soc/codecs/Kconfig ++++ kernel-maemo-2.6.28/sound/soc/codecs/Kconfig @@ -10,6 +10,7 @@ select SND_SOC_TLV320AIC23 select SND_SOC_TLV320AIC26 @@ -362475,8 +362475,8 @@ config SND_SOC_UDA1380 tristate ---- kernel-2.6.28.orig/sound/soc/codecs/Makefile -+++ kernel-2.6.28/sound/soc/codecs/Makefile +--- kernel-maemo-2.6.28.orig/sound/soc/codecs/Makefile ++++ kernel-maemo-2.6.28/sound/soc/codecs/Makefile @@ -7,6 +7,7 @@ snd-soc-tlv320aic23-objs := tlv320aic23.o snd-soc-tlv320aic26-objs := tlv320aic26.o @@ -362493,8 +362493,8 @@ obj-$(CONFIG_SND_SOC_UDA1380) += snd-soc-uda1380.o obj-$(CONFIG_SND_SOC_WM8510) += snd-soc-wm8510.o obj-$(CONFIG_SND_SOC_WM8580) += snd-soc-wm8580.o ---- kernel-2.6.28.orig/sound/soc/codecs/tlv320aic3x.c -+++ kernel-2.6.28/sound/soc/codecs/tlv320aic3x.c +--- kernel-maemo-2.6.28.orig/sound/soc/codecs/tlv320aic3x.c ++++ kernel-maemo-2.6.28/sound/soc/codecs/tlv320aic3x.c @@ -45,15 +45,20 @@ #include #include @@ -362931,8 +362931,8 @@ i2c_del_driver(&aic3x_i2c_driver); #endif kfree(codec->private_data); ---- kernel-2.6.28.orig/sound/soc/codecs/tlv320aic3x.h -+++ kernel-2.6.28/sound/soc/codecs/tlv320aic3x.h +--- kernel-maemo-2.6.28.orig/sound/soc/codecs/tlv320aic3x.h ++++ kernel-maemo-2.6.28/sound/soc/codecs/tlv320aic3x.h @@ -35,6 +35,8 @@ #define AIC3X_ASD_INTF_CTRLA 8 /* Audio serial data interface control register B */ @@ -362951,7 +362951,7 @@ #define LINE2L_2_LADC_CTRL 20 #define LINE2R_2_RADC_CTRL 23 --- /dev/null -+++ kernel-2.6.28/sound/soc/codecs/twl4030.c ++++ kernel-maemo-2.6.28/sound/soc/codecs/twl4030.c @@ -0,0 +1,653 @@ +/* + * ALSA SoC TWL4030 codec driver @@ -363607,7 +363607,7 @@ +MODULE_AUTHOR("Steve Sakoman"); +MODULE_LICENSE("GPL"); --- /dev/null -+++ kernel-2.6.28/sound/soc/codecs/twl4030.h ++++ kernel-maemo-2.6.28/sound/soc/codecs/twl4030.h @@ -0,0 +1,197 @@ +/* + * ALSA SoC TWL4030 codec driver @@ -363806,8 +363806,8 @@ +extern struct snd_soc_codec_device soc_codec_dev_twl4030; + +#endif /* End of __TWL4030_AUDIO_H__ */ ---- kernel-2.6.28.orig/sound/soc/omap/Kconfig -+++ kernel-2.6.28/sound/soc/omap/Kconfig +--- kernel-maemo-2.6.28.orig/sound/soc/omap/Kconfig ++++ kernel-maemo-2.6.28/sound/soc/omap/Kconfig @@ -14,6 +14,24 @@ help Say Y if you want to add support for SoC audio on Nokia N810. @@ -363847,8 +363847,8 @@ + Say Y if you want to add support for SoC audio on the Gumstix Overo. + + ---- kernel-2.6.28.orig/sound/soc/omap/Makefile -+++ kernel-2.6.28/sound/soc/omap/Makefile +--- kernel-maemo-2.6.28.orig/sound/soc/omap/Makefile ++++ kernel-maemo-2.6.28/sound/soc/omap/Makefile @@ -7,7 +7,14 @@ # OMAP Machine Support @@ -363865,7 +363865,7 @@ +obj-$(CONFIG_SND_OMAP_SOC_OVERO) += snd-soc-overo.o + --- /dev/null -+++ kernel-2.6.28/sound/soc/omap/aic34b_dummy.c ++++ kernel-maemo-2.6.28/sound/soc/omap/aic34b_dummy.c @@ -0,0 +1,270 @@ +/* + * aic34b_dummy.c -- Dummy driver for AIC34 block B parts used in Nokia RX51 @@ -364138,7 +364138,7 @@ +module_init(aic34b_dummy_init); +module_exit(aic34b_dummy_exit); --- /dev/null -+++ kernel-2.6.28/sound/soc/omap/aic34b_dummy.h ++++ kernel-maemo-2.6.28/sound/soc/omap/aic34b_dummy.h @@ -0,0 +1,31 @@ +/* + * aic34b_dummy.h @@ -364171,8 +364171,8 @@ +int aic34b_set_volume(u8 volume); + +#endif ---- kernel-2.6.28.orig/sound/soc/omap/omap-mcbsp.c -+++ kernel-2.6.28/sound/soc/omap/omap-mcbsp.c +--- kernel-maemo-2.6.28.orig/sound/soc/omap/omap-mcbsp.c ++++ kernel-maemo-2.6.28/sound/soc/omap/omap-mcbsp.c @@ -36,9 +36,7 @@ #include "omap-mcbsp.h" #include "omap-pcm.h" @@ -364345,8 +364345,8 @@ .rates = OMAP_MCBSP_RATES, \ .formats = SNDRV_PCM_FMTBIT_S16_LE, \ }, \ ---- kernel-2.6.28.orig/sound/soc/omap/omap-pcm.c -+++ kernel-2.6.28/sound/soc/omap/omap-pcm.c +--- kernel-maemo-2.6.28.orig/sound/soc/omap/omap-pcm.c ++++ kernel-maemo-2.6.28/sound/soc/omap/omap-pcm.c @@ -27,10 +27,11 @@ #include #include @@ -364516,7 +364516,7 @@ if (dai->playback.channels_min) { ret = omap_pcm_preallocate_dma_buffer(pcm, --- /dev/null -+++ kernel-2.6.28/sound/soc/omap/omap3beagle.c ++++ kernel-maemo-2.6.28/sound/soc/omap/omap3beagle.c @@ -0,0 +1,149 @@ +/* + * omap3beagle.c -- SoC audio for OMAP3 Beagle @@ -364668,7 +364668,7 @@ +MODULE_DESCRIPTION("ALSA SoC OMAP3 Beagle"); +MODULE_LICENSE("GPL"); --- /dev/null -+++ kernel-2.6.28/sound/soc/omap/overo.c ++++ kernel-maemo-2.6.28/sound/soc/omap/overo.c @@ -0,0 +1,148 @@ +/* + * overo.c -- SoC audio for Gumstix Overo @@ -364819,7 +364819,7 @@ +MODULE_DESCRIPTION("ALSA SoC overo"); +MODULE_LICENSE("GPL"); --- /dev/null -+++ kernel-2.6.28/sound/soc/omap/rx51.c ++++ kernel-maemo-2.6.28/sound/soc/omap/rx51.c @@ -0,0 +1,923 @@ +/* + * n810.c -- SoC audio for Nokia RX51 @@ -365745,7 +365745,7 @@ +MODULE_DESCRIPTION("ALSA SoC Nokia RX51"); +MODULE_LICENSE("GPL"); --- /dev/null -+++ kernel-2.6.28/sound/soc/omap/rx51.h ++++ kernel-maemo-2.6.28/sound/soc/omap/rx51.h @@ -0,0 +1,27 @@ +#ifndef _RX51_H_ +#define _RX51_H_ @@ -365774,8 +365774,8 @@ +int allow_button_press(void); + +#endif /* _RX51_H_ */ ---- kernel-2.6.28.orig/sound/soc/soc-core.c -+++ kernel-2.6.28/sound/soc/soc-core.c +--- kernel-maemo-2.6.28.orig/sound/soc/soc-core.c ++++ kernel-maemo-2.6.28/sound/soc/soc-core.c @@ -270,13 +270,14 @@ { struct snd_soc_device *socdev = @@ -365868,3 +365868,2041 @@ } out: +--- /dev/null ++++ kernel-maemo-2.6.28/arch/arm/configs/rx51_defconfig +@@ -0,0 +1,2035 @@ ++# ++# Automatically generated make config: don't edit ++# Linux kernel version: 2.6.28-omap1 ++# Thu Jul 9 09:32:52 2009 ++# ++CONFIG_ARM=y ++CONFIG_SYS_SUPPORTS_APM_EMULATION=y ++CONFIG_GENERIC_GPIO=y ++CONFIG_GENERIC_TIME=y ++CONFIG_GENERIC_CLOCKEVENTS=y ++CONFIG_MMU=y ++# CONFIG_NO_IOPORT is not set ++CONFIG_GENERIC_HARDIRQS=y ++CONFIG_STACKTRACE_SUPPORT=y ++CONFIG_HAVE_LATENCYTOP_SUPPORT=y ++CONFIG_LOCKDEP_SUPPORT=y ++CONFIG_TRACE_IRQFLAGS_SUPPORT=y ++CONFIG_HARDIRQS_SW_RESEND=y ++CONFIG_GENERIC_IRQ_PROBE=y ++CONFIG_RWSEM_GENERIC_SPINLOCK=y ++# CONFIG_ARCH_HAS_ILOG2_U32 is not set ++# CONFIG_ARCH_HAS_ILOG2_U64 is not set ++CONFIG_GENERIC_HWEIGHT=y ++CONFIG_GENERIC_CALIBRATE_DELAY=y ++CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y ++CONFIG_OPROFILE_OMAP_GPTIMER=y ++CONFIG_OPROFILE_ARMV7=y ++CONFIG_VECTORS_BASE=0xffff0000 ++CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" ++ ++# ++# General setup ++# ++CONFIG_EXPERIMENTAL=y ++CONFIG_BROKEN_ON_SMP=y ++CONFIG_LOCK_KERNEL=y ++CONFIG_INIT_ENV_ARG_LIMIT=32 ++CONFIG_LOCALVERSION="" ++CONFIG_LOCALVERSION_AUTO=y ++CONFIG_SWAP=y ++CONFIG_SYSVIPC=y ++CONFIG_SYSVIPC_SYSCTL=y ++CONFIG_POSIX_MQUEUE=y ++CONFIG_BSD_PROCESS_ACCT=y ++# CONFIG_BSD_PROCESS_ACCT_V3 is not set ++# CONFIG_TASKSTATS is not set ++# CONFIG_AUDIT is not set ++# CONFIG_IKCONFIG is not set ++CONFIG_LOG_BUF_SHIFT=14 ++CONFIG_CGROUPS=y ++# CONFIG_CGROUP_DEBUG is not set ++# CONFIG_CGROUP_NS is not set ++CONFIG_CGROUP_FREEZER=y ++# CONFIG_CGROUP_DEVICE is not set ++CONFIG_GROUP_SCHED=y ++CONFIG_FAIR_GROUP_SCHED=y ++CONFIG_RT_GROUP_SCHED=y ++# CONFIG_USER_SCHED is not set ++CONFIG_CGROUP_SCHED=y ++# CONFIG_CGROUP_CPUACCT is not set ++CONFIG_RESOURCE_COUNTERS=y ++CONFIG_MM_OWNER=y ++CONFIG_CGROUP_MEM_RES_CTLR=y ++CONFIG_SYSFS_DEPRECATED=y ++CONFIG_SYSFS_DEPRECATED_V2=y ++# CONFIG_RELAY is not set ++# CONFIG_NAMESPACES is not set ++CONFIG_BLK_DEV_INITRD=y ++CONFIG_INITRAMFS_SOURCE="" ++CONFIG_CC_OPTIMIZE_FOR_SIZE=y ++CONFIG_SYSCTL=y ++CONFIG_EMBEDDED=y ++CONFIG_UID16=y ++CONFIG_SYSCTL_SYSCALL=y ++CONFIG_KALLSYMS=y ++CONFIG_KALLSYMS_ALL=y ++CONFIG_KALLSYMS_EXTRA_PASS=y ++CONFIG_HOTPLUG=y ++CONFIG_PRINTK=y ++CONFIG_BUG=y ++CONFIG_ELF_CORE=y ++CONFIG_COMPAT_BRK=y ++CONFIG_BASE_FULL=y ++CONFIG_FUTEX=y ++CONFIG_ANON_INODES=y ++CONFIG_EPOLL=y ++CONFIG_SIGNALFD=y ++CONFIG_TIMERFD=y ++CONFIG_EVENTFD=y ++CONFIG_SHMEM=y ++CONFIG_AIO=y ++CONFIG_VM_EVENT_COUNTERS=y ++CONFIG_SLUB_DEBUG=y ++# CONFIG_SLAB is not set ++CONFIG_SLUB=y ++# CONFIG_SLOB is not set ++CONFIG_PROFILING=y ++# CONFIG_MARKERS is not set ++CONFIG_OPROFILE=m ++CONFIG_HAVE_OPROFILE=y ++CONFIG_KPROBES=y ++CONFIG_KRETPROBES=y ++CONFIG_HAVE_KPROBES=y ++CONFIG_HAVE_KRETPROBES=y ++CONFIG_HAVE_CLK=y ++CONFIG_HAVE_GENERIC_DMA_COHERENT=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=y ++CONFIG_MODULE_UNLOAD=y ++CONFIG_MODULE_FORCE_UNLOAD=y ++CONFIG_MODVERSIONS=y ++CONFIG_MODULE_SRCVERSION_ALL=y ++CONFIG_KMOD=y ++CONFIG_BLOCK=y ++# CONFIG_LBD is not set ++# CONFIG_BLK_DEV_IO_TRACE is not set ++# CONFIG_LSF is not set ++# CONFIG_BLK_DEV_BSG is not set ++# CONFIG_BLK_DEV_INTEGRITY is not set ++ ++# ++# IO Schedulers ++# ++CONFIG_IOSCHED_NOOP=y ++# CONFIG_IOSCHED_AS is not set ++# CONFIG_IOSCHED_DEADLINE is not set ++CONFIG_IOSCHED_CFQ=y ++# CONFIG_DEFAULT_AS is not set ++# CONFIG_DEFAULT_DEADLINE is not set ++CONFIG_DEFAULT_CFQ=y ++# CONFIG_DEFAULT_NOOP is not set ++CONFIG_DEFAULT_IOSCHED="cfq" ++CONFIG_CLASSIC_RCU=y ++CONFIG_FREEZER=y ++ ++# ++# System Type ++# ++# CONFIG_ARCH_AAEC2000 is not set ++# CONFIG_ARCH_INTEGRATOR is not set ++# CONFIG_ARCH_REALVIEW is not set ++# CONFIG_ARCH_VERSATILE is not set ++# CONFIG_ARCH_AT91 is not set ++# CONFIG_ARCH_CLPS7500 is not set ++# CONFIG_ARCH_CLPS711X is not set ++# CONFIG_ARCH_EBSA110 is not set ++# CONFIG_ARCH_EP93XX is not set ++# CONFIG_ARCH_FOOTBRIDGE is not set ++# CONFIG_ARCH_NETX is not set ++# CONFIG_ARCH_H720X is not set ++# CONFIG_ARCH_IMX is not set ++# CONFIG_ARCH_IOP13XX is not set ++# CONFIG_ARCH_IOP32X is not set ++# CONFIG_ARCH_IOP33X is not set ++# CONFIG_ARCH_IXP23XX is not set ++# CONFIG_ARCH_IXP2000 is not set ++# CONFIG_ARCH_IXP4XX is not set ++# CONFIG_ARCH_L7200 is not set ++# CONFIG_ARCH_KIRKWOOD is not set ++# CONFIG_ARCH_KS8695 is not set ++# CONFIG_ARCH_NS9XXX is not set ++# CONFIG_ARCH_LOKI is not set ++# CONFIG_ARCH_MV78XX0 is not set ++# CONFIG_ARCH_MXC is not set ++# CONFIG_ARCH_ORION5X is not set ++# CONFIG_ARCH_PNX4008 is not set ++# CONFIG_ARCH_PXA is not set ++# CONFIG_ARCH_RPC is not set ++# CONFIG_ARCH_SA1100 is not set ++# CONFIG_ARCH_S3C2410 is not set ++# CONFIG_ARCH_SHARK is not set ++# CONFIG_ARCH_LH7A40X is not set ++# CONFIG_ARCH_DAVINCI is not set ++CONFIG_ARCH_OMAP=y ++# CONFIG_ARCH_MSM is not set ++ ++# ++# TI OMAP Implementations ++# ++CONFIG_ARCH_OMAP_OTG=y ++# CONFIG_ARCH_OMAP1 is not set ++# CONFIG_ARCH_OMAP2 is not set ++CONFIG_ARCH_OMAP3=y ++ ++# ++# OMAP Feature Selections ++# ++# CONFIG_OMAP_DEBUG_POWERDOMAIN is not set ++# CONFIG_OMAP_DEBUG_CLOCKDOMAIN is not set ++CONFIG_OMAP_SMARTREFLEX=y ++# CONFIG_OMAP_SMARTREFLEX_TESTING is not set ++CONFIG_OMAP_RESET_CLOCKS=y ++CONFIG_OMAP_BOOT_TAG=y ++CONFIG_OMAP_BOOT_REASON=y ++CONFIG_OMAP_COMPONENT_VERSION=y ++CONFIG_OMAP_GPIO_SWITCH=y ++CONFIG_OMAP_MUX=y ++CONFIG_OMAP_MUX_DEBUG=y ++CONFIG_OMAP_MUX_WARNINGS=y ++CONFIG_OMAP_MCBSP=y ++# CONFIG_OMAP_MMU_FWK is not set ++# CONFIG_OMAP_MBOX_FWK is not set ++CONFIG_OMAP_IOMMU=m ++# CONFIG_OMAP_IOMMU_DEBUG is not set ++# CONFIG_OMAP_MPU_TIMER is not set ++CONFIG_OMAP_32K_TIMER=y ++# CONFIG_OMAP3_DEBOBS is not set ++CONFIG_OMAP_32K_TIMER_HZ=128 ++CONFIG_OMAP_TICK_GPTIMER=1 ++CONFIG_OMAP_DM_TIMER=y ++# CONFIG_OMAP_LL_DEBUG_UART1 is not set ++# CONFIG_OMAP_LL_DEBUG_UART2 is not set ++CONFIG_OMAP_LL_DEBUG_UART3=y ++CONFIG_OMAP_SERIAL_WAKE=y ++# CONFIG_OMAP_PM_NONE is not set ++# CONFIG_OMAP_PM_NOOP is not set ++CONFIG_OMAP_PM_SRF=y ++CONFIG_ARCH_OMAP34XX=y ++CONFIG_ARCH_OMAP3430=y ++ ++# ++# OMAP Board Type ++# ++CONFIG_MACH_NOKIA_RX51=y ++CONFIG_VIDEO_MACH_RX51=m ++# CONFIG_VIDEO_MACH_RX51_OLD_I2C is not set ++CONFIG_MACH_NOKIA_RX71=y ++# CONFIG_MACH_OMAP_LDP is not set ++# CONFIG_MACH_OMAP_3430SDP is not set ++# CONFIG_MACH_OMAP3EVM is not set ++# CONFIG_MACH_OMAP3_BEAGLE is not set ++# CONFIG_MACH_OVERO is not set ++# CONFIG_MACH_OMAP3_PANDORA is not set ++# CONFIG_RX51_CAMERA_BUTTON is not set ++ ++# ++# Boot options ++# ++ ++# ++# Power management ++# ++ ++# ++# Processor Type ++# ++CONFIG_CPU_32=y ++CONFIG_CPU_32v6K=y ++CONFIG_CPU_V7=y ++CONFIG_CPU_32v7=y ++CONFIG_CPU_ABRT_EV7=y ++CONFIG_CPU_PABRT_IFAR=y ++CONFIG_CPU_CACHE_V7=y ++CONFIG_CPU_CACHE_VIPT=y ++CONFIG_CPU_COPY_V6=y ++CONFIG_CPU_TLB_V7=y ++CONFIG_CPU_HAS_ASID=y ++CONFIG_CPU_CP15=y ++CONFIG_CPU_CP15_MMU=y ++ ++# ++# Processor Features ++# ++CONFIG_ARM_THUMB=y ++# CONFIG_ARM_THUMBEE is not set ++# CONFIG_CPU_ICACHE_DISABLE is not set ++# CONFIG_CPU_DCACHE_DISABLE is not set ++# CONFIG_CPU_BPREDICT_DISABLE is not set ++CONFIG_HAS_TLS_REG=y ++# CONFIG_OUTER_CACHE is not set ++ ++# ++# Bus support ++# ++# CONFIG_PCI_SYSCALL is not set ++# CONFIG_ARCH_SUPPORTS_MSI is not set ++# CONFIG_PCCARD is not set ++ ++# ++# Kernel Features ++# ++CONFIG_TICK_ONESHOT=y ++CONFIG_NO_HZ=y ++CONFIG_HIGH_RES_TIMERS=y ++CONFIG_GENERIC_CLOCKEVENTS_BUILD=y ++CONFIG_VMSPLIT_3G=y ++# CONFIG_VMSPLIT_2G is not set ++# CONFIG_VMSPLIT_1G is not set ++CONFIG_PAGE_OFFSET=0xC0000000 ++CONFIG_PREEMPT=y ++CONFIG_HZ=128 ++CONFIG_AEABI=y ++# CONFIG_OABI_COMPAT is not set ++CONFIG_ARCH_FLATMEM_HAS_HOLES=y ++# CONFIG_ARCH_SPARSEMEM_DEFAULT is not set ++# CONFIG_ARCH_SELECT_MEMORY_MODEL is not set ++CONFIG_SELECT_MEMORY_MODEL=y ++CONFIG_FLATMEM_MANUAL=y ++# CONFIG_DISCONTIGMEM_MANUAL is not set ++# CONFIG_SPARSEMEM_MANUAL is not set ++CONFIG_FLATMEM=y ++CONFIG_FLAT_NODE_MEM_MAP=y ++CONFIG_PAGEFLAGS_EXTENDED=y ++CONFIG_SPLIT_PTLOCK_CPUS=4 ++# CONFIG_RESOURCES_64BIT is not set ++# CONFIG_PHYS_ADDR_T_64BIT is not set ++CONFIG_ZONE_DMA_FLAG=0 ++CONFIG_VIRT_TO_BUS=y ++CONFIG_UNEVICTABLE_LRU=y ++# CONFIG_LEDS is not set ++CONFIG_ALIGNMENT_TRAP=y ++ ++# ++# Boot options ++# ++CONFIG_ZBOOT_ROM_TEXT=0x0 ++CONFIG_ZBOOT_ROM_BSS=0x0 ++CONFIG_CMDLINE="init=/sbin/preinit ubi.mtd=rootfs root=ubi0:rootfs rootfstype=ubifs rootflags=bulk_read,no_chk_data_crc rw console=ttyMTD,log console=tty0 snd-soc-rx51.hp_lim=42 snd-soc-tlv320aic3x.hp_dac_lim=6" ++# CONFIG_XIP_KERNEL is not set ++CONFIG_KEXEC=y ++CONFIG_ATAGS_PROC=y ++ ++# ++# CPU Power Management ++# ++CONFIG_CPU_FREQ=y ++CONFIG_CPU_FREQ_TABLE=y ++# CONFIG_CPU_FREQ_DEBUG is not set ++CONFIG_CPU_FREQ_STAT=y ++# CONFIG_CPU_FREQ_STAT_DETAILS is not set ++# CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set ++# CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set ++CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE=y ++# CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set ++# CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set ++# CONFIG_CPU_FREQ_GOV_PERFORMANCE is not set ++# CONFIG_CPU_FREQ_GOV_POWERSAVE is not set ++CONFIG_CPU_FREQ_GOV_USERSPACE=y ++CONFIG_CPU_FREQ_GOV_ONDEMAND=y ++# CONFIG_CPU_FREQ_GOV_CONSERVATIVE is not set ++CONFIG_CPU_IDLE=y ++CONFIG_CPU_IDLE_GOV_LADDER=y ++CONFIG_CPU_IDLE_GOV_MENU=y ++ ++# ++# Floating point emulation ++# ++ ++# ++# At least one emulation must be selected ++# ++CONFIG_VFP=y ++CONFIG_VFPv3=y ++CONFIG_NEON=y ++ ++# ++# Userspace binary formats ++# ++CONFIG_BINFMT_ELF=y ++# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set ++CONFIG_HAVE_AOUT=y ++# CONFIG_BINFMT_AOUT is not set ++CONFIG_BINFMT_MISC=y ++ ++# ++# Power management options ++# ++CONFIG_PM=y ++CONFIG_PM_DEBUG=y ++# CONFIG_PM_VERBOSE is not set ++CONFIG_CAN_PM_TRACE=y ++CONFIG_PM_SLEEP=y ++CONFIG_SUSPEND=y ++CONFIG_SUSPEND_FREEZER=y ++# CONFIG_APM_EMULATION is not set ++CONFIG_ARCH_SUSPEND_POSSIBLE=y ++CONFIG_NET=y ++ ++# ++# Networking options ++# ++CONFIG_PACKET=y ++# CONFIG_PACKET_MMAP is not set ++CONFIG_UNIX=y ++CONFIG_XFRM=y ++# CONFIG_XFRM_USER is not set ++# CONFIG_XFRM_SUB_POLICY is not set ++# CONFIG_XFRM_MIGRATE is not set ++# CONFIG_XFRM_STATISTICS is not set ++CONFIG_NET_KEY=y ++# CONFIG_NET_KEY_MIGRATE is not set ++CONFIG_INET=y ++# CONFIG_IP_MULTICAST is not set ++# CONFIG_IP_ADVANCED_ROUTER is not set ++CONFIG_IP_FIB_HASH=y ++CONFIG_IP_PNP=y ++CONFIG_IP_PNP_DHCP=y ++CONFIG_IP_PNP_BOOTP=y ++CONFIG_IP_PNP_RARP=y ++# CONFIG_NET_IPIP is not set ++# CONFIG_NET_IPGRE is not set ++# CONFIG_ARPD is not set ++# CONFIG_SYN_COOKIES is not set ++# CONFIG_INET_AH is not set ++# CONFIG_INET_ESP is not set ++# CONFIG_INET_IPCOMP is not set ++# CONFIG_INET_XFRM_TUNNEL is not set ++# CONFIG_INET_TUNNEL is not set ++CONFIG_INET_XFRM_MODE_TRANSPORT=y ++CONFIG_INET_XFRM_MODE_TUNNEL=y ++CONFIG_INET_XFRM_MODE_BEET=y ++# CONFIG_INET_LRO is not set ++CONFIG_INET_DIAG=y ++CONFIG_INET_TCP_DIAG=y ++# CONFIG_TCP_CONG_ADVANCED is not set ++CONFIG_TCP_CONG_CUBIC=y ++CONFIG_DEFAULT_TCP_CONG="cubic" ++# CONFIG_TCP_MD5SIG is not set ++# CONFIG_IPV6 is not set ++# CONFIG_NETLABEL is not set ++# CONFIG_NETWORK_SECMARK is not set ++CONFIG_NETFILTER=y ++# CONFIG_NETFILTER_DEBUG is not set ++CONFIG_NETFILTER_ADVANCED=y ++ ++# ++# Core Netfilter Configuration ++# ++# CONFIG_NETFILTER_NETLINK_QUEUE is not set ++# CONFIG_NETFILTER_NETLINK_LOG is not set ++# CONFIG_NF_CONNTRACK is not set ++CONFIG_NETFILTER_XTABLES=m ++# CONFIG_NETFILTER_XT_TARGET_CLASSIFY is not set ++# CONFIG_NETFILTER_XT_TARGET_MARK is not set ++# CONFIG_NETFILTER_XT_TARGET_NFLOG is not set ++# CONFIG_NETFILTER_XT_TARGET_NFQUEUE is not set ++# CONFIG_NETFILTER_XT_TARGET_RATEEST is not set ++# CONFIG_NETFILTER_XT_TARGET_TCPMSS is not set ++# CONFIG_NETFILTER_XT_MATCH_COMMENT is not set ++# CONFIG_NETFILTER_XT_MATCH_DCCP is not set ++# CONFIG_NETFILTER_XT_MATCH_DSCP is not set ++# CONFIG_NETFILTER_XT_MATCH_ESP is not set ++# CONFIG_NETFILTER_XT_MATCH_HASHLIMIT is not set ++# CONFIG_NETFILTER_XT_MATCH_IPRANGE is not set ++# CONFIG_NETFILTER_XT_MATCH_LENGTH is not set ++# CONFIG_NETFILTER_XT_MATCH_LIMIT is not set ++# CONFIG_NETFILTER_XT_MATCH_MAC is not set ++# CONFIG_NETFILTER_XT_MATCH_MARK is not set ++# CONFIG_NETFILTER_XT_MATCH_MULTIPORT is not set ++# CONFIG_NETFILTER_XT_MATCH_OWNER is not set ++# CONFIG_NETFILTER_XT_MATCH_POLICY is not set ++# CONFIG_NETFILTER_XT_MATCH_PKTTYPE is not set ++# CONFIG_NETFILTER_XT_MATCH_QUOTA is not set ++# CONFIG_NETFILTER_XT_MATCH_RATEEST is not set ++# CONFIG_NETFILTER_XT_MATCH_REALM is not set ++# CONFIG_NETFILTER_XT_MATCH_RECENT is not set ++# CONFIG_NETFILTER_XT_MATCH_SCTP is not set ++# CONFIG_NETFILTER_XT_MATCH_STATISTIC is not set ++# CONFIG_NETFILTER_XT_MATCH_STRING is not set ++# CONFIG_NETFILTER_XT_MATCH_TCPMSS is not set ++# CONFIG_NETFILTER_XT_MATCH_TIME is not set ++# CONFIG_NETFILTER_XT_MATCH_U32 is not set ++# CONFIG_IP_VS is not set ++ ++# ++# IP: Netfilter Configuration ++# ++# CONFIG_NF_DEFRAG_IPV4 is not set ++# CONFIG_IP_NF_QUEUE is not set ++CONFIG_IP_NF_IPTABLES=m ++# CONFIG_IP_NF_MATCH_ADDRTYPE is not set ++# CONFIG_IP_NF_MATCH_AH is not set ++# CONFIG_IP_NF_MATCH_ECN is not set ++# CONFIG_IP_NF_MATCH_TTL is not set ++CONFIG_IP_NF_FILTER=m ++# CONFIG_IP_NF_TARGET_REJECT is not set ++# CONFIG_IP_NF_TARGET_LOG is not set ++# CONFIG_IP_NF_TARGET_ULOG is not set ++# CONFIG_IP_NF_TARGET_IDLETIMER is not set ++# CONFIG_IP_NF_MANGLE is not set ++# CONFIG_IP_NF_RAW is not set ++# CONFIG_IP_NF_SECURITY is not set ++# CONFIG_IP_NF_ARPTABLES is not set ++CONFIG_IP_NF_HB=m ++# CONFIG_IP_NF_HB_DEBUG is not set ++# CONFIG_IP_DCCP is not set ++# CONFIG_IP_SCTP is not set ++# CONFIG_TIPC is not set ++# CONFIG_ATM is not set ++# CONFIG_BRIDGE is not set ++# CONFIG_NET_DSA is not set ++# CONFIG_VLAN_8021Q is not set ++# CONFIG_DECNET is not set ++# CONFIG_LLC2 is not set ++# CONFIG_IPX is not set ++# CONFIG_ATALK is not set ++# CONFIG_X25 is not set ++# CONFIG_LAPB is not set ++# CONFIG_ECONET is not set ++# CONFIG_WAN_ROUTER is not set ++CONFIG_PHONET=m ++# CONFIG_NET_SCHED is not set ++ ++# ++# Network testing ++# ++# CONFIG_NET_PKTGEN is not set ++# CONFIG_NET_TCPPROBE is not set ++# CONFIG_HAMRADIO is not set ++# CONFIG_CAN is not set ++# CONFIG_IRDA is not set ++CONFIG_BT=m ++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_HCIUSB is not set ++# CONFIG_BT_HCIBTUSB is not set ++# CONFIG_BT_HCIBTSDIO is not set ++# CONFIG_BT_HCIUART is not set ++# CONFIG_BT_HCIBCM203X is not set ++# CONFIG_BT_HCIBPA10X is not set ++# CONFIG_BT_HCIBFUSB is not set ++# CONFIG_BT_HCIBRF6150 is not set ++CONFIG_BT_HCIH4P=m ++# CONFIG_BT_HCIVHCI is not set ++# CONFIG_AF_RXRPC is not set ++CONFIG_WIRELESS=y ++CONFIG_CFG80211=y ++CONFIG_NL80211=y ++CONFIG_WIRELESS_OLD_REGULATORY=y ++CONFIG_WIRELESS_EXT=y ++CONFIG_WIRELESS_EXT_SYSFS=y ++CONFIG_MAC80211=m ++ ++# ++# Rate control algorithm selection ++# ++# CONFIG_MAC80211_RC_PID is not set ++CONFIG_MAC80211_RC_MINSTREL=y ++# CONFIG_MAC80211_RC_DEFAULT_PID is not set ++CONFIG_MAC80211_RC_DEFAULT_MINSTREL=y ++CONFIG_MAC80211_RC_DEFAULT="minstrel" ++# CONFIG_MAC80211_MESH is not set ++# CONFIG_MAC80211_LEDS is not set ++# CONFIG_MAC80211_DEBUGFS is not set ++# CONFIG_MAC80211_DEBUG_MENU is not set ++# CONFIG_IEEE80211 is not set ++# CONFIG_RFKILL is not set ++# CONFIG_NET_9P is not set ++ ++# ++# Device Drivers ++# ++ ++# ++# Generic Driver Options ++# ++CONFIG_UEVENT_HELPER_PATH="" ++CONFIG_STANDALONE=y ++CONFIG_PREVENT_FIRMWARE_BUILD=y ++CONFIG_FW_LOADER=y ++CONFIG_FIRMWARE_IN_KERNEL=y ++CONFIG_EXTRA_FIRMWARE="" ++# CONFIG_DEBUG_DRIVER is not set ++# CONFIG_DEBUG_DEVRES is not set ++# CONFIG_SYS_HYPERVISOR is not set ++CONFIG_CONNECTOR=y ++CONFIG_PROC_EVENTS=y ++CONFIG_MTD=y ++# CONFIG_MTD_DEBUG is not set ++# CONFIG_MTD_CONCAT is not set ++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_AR7_PARTS is not set ++ ++# ++# User Modules And Translation Layers ++# ++CONFIG_MTD_CHAR=y ++# 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 ++# CONFIG_RFD_FTL is not set ++# CONFIG_SSFDC is not set ++CONFIG_MTD_OOPS=y ++ ++# ++# RAM/ROM/Flash chip drivers ++# ++# CONFIG_MTD_CFI is not set ++# CONFIG_MTD_JEDECPROBE is not set ++CONFIG_MTD_MAP_BANK_WIDTH_1=y ++CONFIG_MTD_MAP_BANK_WIDTH_2=y ++CONFIG_MTD_MAP_BANK_WIDTH_4=y ++# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set ++# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set ++# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set ++CONFIG_MTD_CFI_I1=y ++CONFIG_MTD_CFI_I2=y ++# CONFIG_MTD_CFI_I4 is not set ++# CONFIG_MTD_CFI_I8 is not set ++# CONFIG_MTD_RAM is not set ++# CONFIG_MTD_ROM is not set ++# CONFIG_MTD_ABSENT is not set ++ ++# ++# Mapping drivers for chip access ++# ++# CONFIG_MTD_COMPLEX_MAPPINGS is not set ++# CONFIG_MTD_PLATRAM is not set ++ ++# ++# Self-contained MTD device drivers ++# ++# CONFIG_MTD_DATAFLASH is not set ++# CONFIG_MTD_M25P80 is not set ++# CONFIG_MTD_SLRAM is not set ++# CONFIG_MTD_PHRAM is not set ++# CONFIG_MTD_MTDRAM is not set ++# CONFIG_MTD_BLOCK2MTD is not set ++ ++# ++# Disk-On-Chip Device Drivers ++# ++# CONFIG_MTD_DOC2000 is not set ++# CONFIG_MTD_DOC2001 is not set ++# CONFIG_MTD_DOC2001PLUS is not set ++# CONFIG_MTD_NAND is not set ++CONFIG_MTD_ONENAND=y ++# CONFIG_MTD_ONENAND_VERIFY_WRITE is not set ++# CONFIG_MTD_ONENAND_GENERIC is not set ++CONFIG_MTD_ONENAND_OMAP2=y ++# CONFIG_MTD_ONENAND_OTP is not set ++# CONFIG_MTD_ONENAND_2X_PROGRAM is not set ++# CONFIG_MTD_ONENAND_SIM is not set ++ ++# ++# UBI - Unsorted block images ++# ++CONFIG_MTD_UBI=y ++CONFIG_MTD_UBI_WL_THRESHOLD=4096 ++CONFIG_MTD_UBI_BEB_RESERVE=1 ++# CONFIG_MTD_UBI_GLUEBI is not set ++ ++# ++# UBI debugging options ++# ++# CONFIG_MTD_UBI_DEBUG is not set ++# CONFIG_PARPORT is not set ++CONFIG_BLK_DEV=y ++# CONFIG_BLK_DEV_COW_COMMON is not set ++CONFIG_BLK_DEV_LOOP=y ++# CONFIG_BLK_DEV_CRYPTOLOOP is not set ++# CONFIG_BLK_DEV_NBD is not set ++# CONFIG_BLK_DEV_UB is not set ++CONFIG_BLK_DEV_RAM=y ++CONFIG_BLK_DEV_RAM_COUNT=16 ++CONFIG_BLK_DEV_RAM_SIZE=16384 ++# CONFIG_BLK_DEV_XIP is not set ++# CONFIG_CDROM_PKTCDVD is not set ++# CONFIG_ATA_OVER_ETH is not set ++CONFIG_MISC_DEVICES=y ++# CONFIG_EEPROM_93CX6 is not set ++CONFIG_NOKIA_AV_DETECT=m ++# CONFIG_ICS932S401 is not set ++CONFIG_OMAP_STI=y ++CONFIG_OMAP_STI_CONSOLE=y ++# CONFIG_ENCLOSURE_SERVICES is not set ++# CONFIG_C2PORT is not set ++CONFIG_OMAP_SSI=m ++CONFIG_SSI_MCSAAB_IMP=m ++CONFIG_SSI_CMT_SPEECH=m ++# CONFIG_SSI_CMT_SPEECH_DEBUG is not set ++CONFIG_SSI_CHAR=m ++# CONFIG_SSI_CHAR_DEBUG is not set ++CONFIG_HAVE_IDE=y ++# CONFIG_IDE is not set ++ ++# ++# SCSI device support ++# ++# CONFIG_RAID_ATTRS is not set ++CONFIG_SCSI=m ++CONFIG_SCSI_DMA=y ++# CONFIG_SCSI_TGT is not set ++# CONFIG_SCSI_NETLINK is not set ++CONFIG_SCSI_PROC_FS=y ++ ++# ++# SCSI support type (disk, tape, CD-ROM) ++# ++CONFIG_BLK_DEV_SD=m ++# CONFIG_CHR_DEV_ST is not set ++# CONFIG_CHR_DEV_OSST is not set ++# CONFIG_BLK_DEV_SR is not set ++# CONFIG_CHR_DEV_SG is not set ++# CONFIG_CHR_DEV_SCH is not set ++ ++# ++# Some SCSI devices (e.g. CD jukebox) support multiple LUNs ++# ++CONFIG_SCSI_MULTI_LUN=y ++# CONFIG_SCSI_CONSTANTS is not set ++# CONFIG_SCSI_LOGGING is not set ++CONFIG_SCSI_SCAN_ASYNC=y ++CONFIG_SCSI_WAIT_SCAN=m ++ ++# ++# SCSI Transports ++# ++# CONFIG_SCSI_SPI_ATTRS is not set ++# CONFIG_SCSI_FC_ATTRS is not set ++# CONFIG_SCSI_ISCSI_ATTRS is not set ++# CONFIG_SCSI_SAS_LIBSAS is not set ++# CONFIG_SCSI_SRP_ATTRS is not set ++CONFIG_SCSI_LOWLEVEL=y ++# CONFIG_ISCSI_TCP is not set ++# CONFIG_SCSI_DEBUG is not set ++# CONFIG_SCSI_DH is not set ++# CONFIG_ATA is not set ++# CONFIG_MD is not set ++CONFIG_NETDEVICES=y ++# CONFIG_DUMMY is not set ++# CONFIG_BONDING is not set ++# CONFIG_MACVLAN is not set ++# CONFIG_EQUALIZER is not set ++CONFIG_TUN=m ++# CONFIG_VETH is not set ++# CONFIG_PHYLIB is not set ++CONFIG_NET_ETHERNET=y ++CONFIG_MII=m ++# CONFIG_AX88796 is not set ++CONFIG_SMC91X=m ++# CONFIG_DM9000 is not set ++# CONFIG_ENC28J60 is not set ++# CONFIG_SMC911X is not set ++# CONFIG_IBM_NEW_EMAC_ZMII is not set ++# CONFIG_IBM_NEW_EMAC_RGMII is not set ++# CONFIG_IBM_NEW_EMAC_TAH is not set ++# CONFIG_IBM_NEW_EMAC_EMAC4 is not set ++# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set ++# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set ++# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set ++# CONFIG_B44 is not set ++# CONFIG_NETDEV_1000 is not set ++# CONFIG_NETDEV_10000 is not set ++ ++# ++# Wireless LAN ++# ++# CONFIG_WLAN_PRE80211 is not set ++CONFIG_WLAN_80211=y ++# CONFIG_LIBERTAS is not set ++# CONFIG_LIBERTAS_THINFIRM is not set ++# CONFIG_USB_ZD1201 is not set ++# CONFIG_USB_NET_RNDIS_WLAN is not set ++# CONFIG_RTL8187 is not set ++# CONFIG_MAC80211_HWSIM is not set ++# CONFIG_P54_COMMON is not set ++# CONFIG_IWLWIFI_LEDS is not set ++# CONFIG_HOSTAP is not set ++# CONFIG_B43 is not set ++# CONFIG_B43LEGACY is not set ++# CONFIG_ZD1211RW is not set ++# CONFIG_RT2X00 is not set ++CONFIG_WL12XX=y ++CONFIG_WL1251=m ++# CONFIG_WL1271 is not set ++ ++# ++# USB Network Adapters ++# ++# CONFIG_USB_CATC is not set ++# CONFIG_USB_KAWETH is not set ++# CONFIG_USB_PEGASUS is not set ++# CONFIG_USB_RTL8150 is not set ++# CONFIG_USB_USBNET is not set ++# CONFIG_WAN is not set ++# CONFIG_PPP is not set ++# CONFIG_SLIP is not set ++# CONFIG_NETCONSOLE is not set ++# CONFIG_NETPOLL is not set ++# CONFIG_NET_POLL_CONTROLLER is not set ++# CONFIG_ISDN is not set ++ ++# ++# Input device support ++# ++CONFIG_INPUT=y ++# CONFIG_INPUT_FF_MEMLESS is not set ++# CONFIG_INPUT_POLLDEV is not set ++ ++# ++# Userland interfaces ++# ++# CONFIG_INPUT_MOUSEDEV is not set ++# CONFIG_INPUT_JOYDEV is not set ++CONFIG_INPUT_EVDEV=y ++# CONFIG_INPUT_EVBUG is not set ++ ++# ++# Input Device Drivers ++# ++CONFIG_INPUT_KEYBOARD=y ++# CONFIG_KEYBOARD_ATKBD is not set ++# CONFIG_KEYBOARD_SUNKBD is not set ++# CONFIG_KEYBOARD_LKKBD is not set ++# CONFIG_KEYBOARD_XTKBD is not set ++# CONFIG_KEYBOARD_NEWTON is not set ++# CONFIG_KEYBOARD_STOWAWAY is not set ++CONFIG_KEYBOARD_TWL4030=y ++# CONFIG_KEYBOARD_LM8323 is not set ++# CONFIG_KEYBOARD_GPIO is not set ++# CONFIG_INPUT_MOUSE is not set ++# CONFIG_INPUT_JOYSTICK is not set ++# CONFIG_INPUT_TABLET is not set ++CONFIG_INPUT_TOUCHSCREEN=y ++# CONFIG_TOUCHSCREEN_ADS7846 is not set ++# CONFIG_TOUCHSCREEN_FUJITSU is not set ++# CONFIG_TOUCHSCREEN_GUNZE is not set ++# CONFIG_TOUCHSCREEN_ELO is not set ++# CONFIG_TOUCHSCREEN_MTOUCH is not set ++# CONFIG_TOUCHSCREEN_INEXIO is not set ++# CONFIG_TOUCHSCREEN_MK712 is not set ++# CONFIG_TOUCHSCREEN_PENMOUNT is not set ++# CONFIG_TOUCHSCREEN_TOUCHRIGHT is not set ++# CONFIG_TOUCHSCREEN_TOUCHWIN is not set ++CONFIG_TOUCHSCREEN_TSC2005=m ++# CONFIG_TOUCHSCREEN_TSC210X is not set ++# CONFIG_TOUCHSCREEN_USB_COMPOSITE is not set ++# CONFIG_TOUCHSCREEN_TOUCHIT213 is not set ++CONFIG_INPUT_LIRC=y ++CONFIG_LIRC_DEV=m ++CONFIG_LIRC_RX51=m ++CONFIG_INPUT_MISC=y ++# CONFIG_INPUT_ATI_REMOTE is not set ++# CONFIG_INPUT_ATI_REMOTE2 is not set ++# CONFIG_INPUT_KEYSPAN_REMOTE is not set ++# CONFIG_INPUT_POWERMATE is not set ++# CONFIG_INPUT_YEALINK is not set ++# CONFIG_INPUT_CM109 is not set ++CONFIG_INPUT_UINPUT=m ++ ++# ++# Hardware I/O ports ++# ++# CONFIG_SERIO is not set ++# CONFIG_GAMEPORT is not set ++ ++# ++# Character devices ++# ++CONFIG_VT=y ++CONFIG_CONSOLE_TRANSLATIONS=y ++CONFIG_VT_CONSOLE=y ++CONFIG_HW_CONSOLE=y ++# CONFIG_VT_HW_CONSOLE_BINDING is not set ++CONFIG_DEVKMEM=y ++# CONFIG_SERIAL_NONSTANDARD is not set ++ ++# ++# Serial drivers ++# ++CONFIG_SERIAL_8250=y ++CONFIG_SERIAL_8250_CONSOLE=y ++CONFIG_SERIAL_8250_NR_UARTS=4 ++CONFIG_SERIAL_8250_RUNTIME_UARTS=4 ++# CONFIG_SERIAL_8250_EXTENDED is not set ++ ++# ++# Non-8250 serial port support ++# ++CONFIG_SERIAL_CORE=y ++CONFIG_SERIAL_CORE_CONSOLE=y ++CONFIG_UNIX98_PTYS=y ++# CONFIG_LEGACY_PTYS is not set ++# CONFIG_IPMI_HANDLER is not set ++CONFIG_HW_RANDOM=y ++CONFIG_HW_RANDOM_OMAP3_ROM=y ++# CONFIG_NVRAM is not set ++# CONFIG_R3964 is not set ++# CONFIG_RAW_DRIVER is not set ++# CONFIG_TCG_TPM is not set ++CONFIG_I2C=y ++CONFIG_I2C_BOARDINFO=y ++CONFIG_I2C_CHARDEV=y ++CONFIG_I2C_HELPER_AUTO=y ++ ++# ++# I2C Hardware Bus support ++# ++ ++# ++# I2C system bus drivers (mostly embedded / system-on-chip) ++# ++# CONFIG_I2C_GPIO is not set ++# CONFIG_I2C_OCORES is not set ++CONFIG_I2C_OMAP=y ++# CONFIG_I2C_SIMTEC is not set ++ ++# ++# External I2C/SMBus adapter drivers ++# ++# CONFIG_I2C_PARPORT_LIGHT is not set ++# CONFIG_I2C_TAOS_EVM is not set ++# CONFIG_I2C_TINY_USB is not set ++ ++# ++# Other I2C/SMBus bus drivers ++# ++# CONFIG_I2C_PCA_PLATFORM is not set ++# CONFIG_I2C_STUB is not set ++ ++# ++# Miscellaneous I2C Chip support ++# ++# CONFIG_DS1682 is not set ++# CONFIG_AT24 is not set ++# CONFIG_SENSORS_EEPROM is not set ++CONFIG_TPA6130A2=y ++# CONFIG_SENSORS_PCF8574 is not set ++# CONFIG_PCF8575 is not set ++# CONFIG_SENSORS_PCA9539 is not set ++# CONFIG_SENSORS_PCF8591 is not set ++# CONFIG_TPS65010 is not set ++CONFIG_TWL4030_MADC=y ++CONFIG_TWL4030_PWRBUTTON=y ++CONFIG_TWL4030_POWEROFF=y ++# CONFIG_SENSORS_MAX6875 is not set ++# CONFIG_SENSORS_TSL2550 is not set ++CONFIG_SENSORS_TSL2563=m ++# CONFIG_LP5521 is not set ++CONFIG_LIS302DL=m ++# 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 ++CONFIG_SPI=y ++# CONFIG_SPI_DEBUG is not set ++CONFIG_SPI_MASTER=y ++ ++# ++# SPI Master Controller Drivers ++# ++# CONFIG_SPI_BITBANG is not set ++CONFIG_SPI_OMAP24XX=y ++ ++# ++# SPI Protocol Masters ++# ++# CONFIG_SPI_AT25 is not set ++# CONFIG_SPI_TSC210X is not set ++# CONFIG_SPI_TSC2301 is not set ++# CONFIG_SPI_SPIDEV is not set ++# CONFIG_SPI_TLE62X0 is not set ++CONFIG_ARCH_REQUIRE_GPIOLIB=y ++CONFIG_GPIOLIB=y ++# CONFIG_DEBUG_GPIO is not set ++CONFIG_GPIO_SYSFS=y ++ ++# ++# Memory mapped GPIO expanders: ++# ++ ++# ++# I2C GPIO expanders: ++# ++# CONFIG_GPIO_MAX732X is not set ++# CONFIG_GPIO_PCA953X is not set ++# CONFIG_GPIO_PCF857X is not set ++CONFIG_GPIO_TWL4030=y ++ ++# ++# PCI GPIO expanders: ++# ++ ++# ++# SPI GPIO expanders: ++# ++# CONFIG_GPIO_MAX7301 is not set ++# CONFIG_GPIO_MCP23S08 is not set ++# CONFIG_W1 is not set ++# CONFIG_POWER_SUPPLY is not set ++CONFIG_HWMON=y ++# CONFIG_HWMON_VID is not set ++# CONFIG_SENSORS_AD7414 is not set ++# CONFIG_SENSORS_AD7418 is not set ++# CONFIG_SENSORS_ADCXX is not set ++# CONFIG_SENSORS_ADM1021 is not set ++# CONFIG_SENSORS_ADM1025 is not set ++# CONFIG_SENSORS_ADM1026 is not set ++# CONFIG_SENSORS_ADM1029 is not set ++# CONFIG_SENSORS_ADM1031 is not set ++# CONFIG_SENSORS_ADM9240 is not set ++# CONFIG_SENSORS_ADT7462 is not set ++# CONFIG_SENSORS_ADT7470 is not set ++# CONFIG_SENSORS_ADT7473 is not set ++# CONFIG_SENSORS_ATXP1 is not set ++# CONFIG_SENSORS_DS1621 is not set ++# CONFIG_SENSORS_F71805F is not set ++# CONFIG_SENSORS_F71882FG is not set ++# CONFIG_SENSORS_F75375S is not set ++# CONFIG_SENSORS_GL518SM is not set ++# CONFIG_SENSORS_GL520SM is not set ++# CONFIG_SENSORS_IT87 is not set ++# CONFIG_SENSORS_LM63 is not set ++# CONFIG_SENSORS_LM70 is not set ++# CONFIG_SENSORS_LM75 is not set ++# CONFIG_SENSORS_LM77 is not set ++# CONFIG_SENSORS_LM78 is not set ++# CONFIG_SENSORS_LM80 is not set ++# CONFIG_SENSORS_LM83 is not set ++# CONFIG_SENSORS_LM85 is not set ++# CONFIG_SENSORS_LM87 is not set ++# CONFIG_SENSORS_LM90 is not set ++# CONFIG_SENSORS_LM92 is not set ++# CONFIG_SENSORS_LM93 is not set ++# CONFIG_SENSORS_MAX1111 is not set ++# CONFIG_SENSORS_MAX1619 is not set ++# CONFIG_SENSORS_MAX6650 is not set ++# CONFIG_SENSORS_PC87360 is not set ++# CONFIG_SENSORS_PC87427 is not set ++# CONFIG_SENSORS_DME1737 is not set ++# CONFIG_SENSORS_SMSC47M1 is not set ++# CONFIG_SENSORS_SMSC47M192 is not set ++# CONFIG_SENSORS_SMSC47B397 is not set ++# CONFIG_SENSORS_ADS7828 is not set ++# CONFIG_SENSORS_THMC50 is not set ++# CONFIG_SENSORS_VT1211 is not set ++# CONFIG_SENSORS_W83781D is not set ++# CONFIG_SENSORS_W83791D is not set ++# CONFIG_SENSORS_W83792D is not set ++# CONFIG_SENSORS_W83793 is not set ++# CONFIG_SENSORS_W83L785TS is not set ++# CONFIG_SENSORS_W83L786NG is not set ++# CONFIG_SENSORS_W83627HF is not set ++# CONFIG_SENSORS_W83627EHF is not set ++# CONFIG_SENSORS_TSC210X is not set ++CONFIG_SENSORS_OMAP34XX=y ++# CONFIG_HWMON_DEBUG_CHIP is not set ++# CONFIG_THERMAL is not set ++# CONFIG_THERMAL_HWMON is not set ++CONFIG_WATCHDOG=y ++# CONFIG_WATCHDOG_NOWAYOUT is not set ++ ++# ++# Watchdog Device Drivers ++# ++# CONFIG_SOFT_WATCHDOG is not set ++CONFIG_OMAP_WATCHDOG=m ++CONFIG_TWL4030_WATCHDOG=m ++ ++# ++# USB-based Watchdog Cards ++# ++# CONFIG_USBPCWATCHDOG is not set ++CONFIG_SSB_POSSIBLE=y ++ ++# ++# Sonics Silicon Backplane ++# ++# CONFIG_SSB is not set ++ ++# ++# Multifunction device drivers ++# ++# CONFIG_MFD_CORE is not set ++# CONFIG_MFD_SM501 is not set ++# CONFIG_MFD_ASIC3 is not set ++# CONFIG_HTC_EGPIO is not set ++# CONFIG_HTC_PASIC3 is not set ++CONFIG_TWL4030_CORE=y ++CONFIG_TWL4030_POWER=y ++# CONFIG_MFD_TMIO is not set ++# CONFIG_MFD_T7L66XB is not set ++# CONFIG_MFD_TC6387XB is not set ++# CONFIG_MFD_TC6393XB is not set ++# CONFIG_PMIC_DA903X is not set ++# CONFIG_MFD_WM8400 is not set ++# CONFIG_MFD_WM8350_I2C is not set ++ ++# ++# Multimedia devices ++# ++ ++# ++# Multimedia core support ++# ++CONFIG_VIDEO_DEV=m ++CONFIG_VIDEO_V4L2_COMMON=m ++CONFIG_VIDEO_ALLOW_V4L1=y ++CONFIG_VIDEO_V4L1_COMPAT=y ++# CONFIG_DVB_CORE is not set ++CONFIG_VIDEO_MEDIA=m ++ ++# ++# Multimedia drivers ++# ++# CONFIG_MEDIA_ATTACH is not set ++CONFIG_MEDIA_TUNER=m ++CONFIG_MEDIA_TUNER_CUSTOMIZE=y ++# CONFIG_MEDIA_TUNER_SIMPLE is not set ++# CONFIG_MEDIA_TUNER_TDA8290 is not set ++# CONFIG_MEDIA_TUNER_TDA827X is not set ++# CONFIG_MEDIA_TUNER_TDA18271 is not set ++# CONFIG_MEDIA_TUNER_TDA9887 is not set ++# CONFIG_MEDIA_TUNER_TEA5761 is not set ++# CONFIG_MEDIA_TUNER_TEA5767 is not set ++# CONFIG_MEDIA_TUNER_MT20XX is not set ++# CONFIG_MEDIA_TUNER_MT2060 is not set ++# CONFIG_MEDIA_TUNER_MT2266 is not set ++# CONFIG_MEDIA_TUNER_MT2131 is not set ++# CONFIG_MEDIA_TUNER_QT1010 is not set ++# CONFIG_MEDIA_TUNER_XC2028 is not set ++# CONFIG_MEDIA_TUNER_XC5000 is not set ++# CONFIG_MEDIA_TUNER_MXL5005S is not set ++# CONFIG_MEDIA_TUNER_MXL5007T is not set ++CONFIG_VIDEO_V4L2=m ++CONFIG_VIDEO_V4L1=m ++CONFIG_VIDEOBUF_GEN=m ++CONFIG_VIDEOBUF_DMA_SG=m ++CONFIG_VIDEO_CAPTURE_DRIVERS=y ++# CONFIG_VIDEO_ADV_DEBUG is not set ++# CONFIG_VIDEO_FIXED_MINOR_RANGES is not set ++# CONFIG_VIDEO_HELPER_CHIPS_AUTO is not set ++ ++# ++# Encoders/decoders and other helper chips ++# ++ ++# ++# Audio decoders ++# ++# CONFIG_VIDEO_TVAUDIO is not set ++# CONFIG_VIDEO_TDA7432 is not set ++# CONFIG_VIDEO_TDA9840 is not set ++# CONFIG_VIDEO_TDA9875 is not set ++# CONFIG_VIDEO_TEA6415C is not set ++# CONFIG_VIDEO_TEA6420 is not set ++# CONFIG_VIDEO_MSP3400 is not set ++# CONFIG_VIDEO_CS5345 is not set ++# CONFIG_VIDEO_CS53L32A is not set ++# CONFIG_VIDEO_M52790 is not set ++# CONFIG_VIDEO_TLV320AIC23B is not set ++# CONFIG_VIDEO_WM8775 is not set ++# CONFIG_VIDEO_WM8739 is not set ++# CONFIG_VIDEO_VP27SMPX is not set ++ ++# ++# Video decoders ++# ++# CONFIG_VIDEO_BT819 is not set ++# CONFIG_VIDEO_BT856 is not set ++# CONFIG_VIDEO_BT866 is not set ++# CONFIG_VIDEO_KS0127 is not set ++# CONFIG_VIDEO_OV7670 is not set ++# CONFIG_VIDEO_TCM825X is not set ++CONFIG_VIDEO_ET8EK8=m ++CONFIG_VIDEO_AD5820=m ++CONFIG_VIDEO_ADP1653=m ++# CONFIG_VIDEO_SAA7110 is not set ++# CONFIG_VIDEO_SAA7111 is not set ++# CONFIG_VIDEO_SAA7114 is not set ++# CONFIG_VIDEO_SAA711X is not set ++# CONFIG_VIDEO_SAA717X is not set ++# CONFIG_VIDEO_SAA7191 is not set ++# CONFIG_VIDEO_TVP5150 is not set ++# CONFIG_VIDEO_VPX3220 is not set ++CONFIG_VIDEO_SMIA_SENSOR=m ++ ++# ++# Video and audio decoders ++# ++# CONFIG_VIDEO_CX25840 is not set ++ ++# ++# MPEG video encoders ++# ++# CONFIG_VIDEO_CX2341X is not set ++ ++# ++# Video encoders ++# ++# CONFIG_VIDEO_SAA7127 is not set ++# CONFIG_VIDEO_SAA7185 is not set ++# CONFIG_VIDEO_ADV7170 is not set ++# CONFIG_VIDEO_ADV7175 is not set ++ ++# ++# Video improvement chips ++# ++# CONFIG_VIDEO_UPD64031A is not set ++# CONFIG_VIDEO_UPD64083 is not set ++# CONFIG_VIDEO_VIVI is not set ++# CONFIG_VIDEO_CPIA is not set ++# CONFIG_VIDEO_CPIA2 is not set ++# CONFIG_VIDEO_SAA5246A is not set ++# CONFIG_VIDEO_SAA5249 is not set ++CONFIG_VIDEO_OMAP3=m ++CONFIG_VIDEO_SMIAREGS=m ++# CONFIG_SOC_CAMERA is not set ++CONFIG_V4L_USB_DRIVERS=y ++# CONFIG_USB_VIDEO_CLASS is not set ++# CONFIG_USB_GSPCA is not set ++# CONFIG_VIDEO_PVRUSB2 is not set ++# CONFIG_VIDEO_EM28XX is not set ++# CONFIG_VIDEO_USBVISION is not set ++# CONFIG_USB_VICAM is not set ++# CONFIG_USB_IBMCAM is not set ++# CONFIG_USB_KONICAWC is not set ++# CONFIG_USB_QUICKCAM_MESSENGER is not set ++# CONFIG_USB_ET61X251 is not set ++# CONFIG_VIDEO_OVCAMCHIP is not set ++# CONFIG_USB_OV511 is not set ++# CONFIG_USB_SE401 is not set ++# CONFIG_USB_SN9C102 is not set ++# CONFIG_USB_STV680 is not set ++# CONFIG_USB_ZC0301 is not set ++# CONFIG_USB_PWC is not set ++# CONFIG_USB_ZR364XX is not set ++# CONFIG_USB_STKWEBCAM is not set ++# CONFIG_USB_S2255 is not set ++CONFIG_RADIO_ADAPTERS=y ++CONFIG_I2C_SI4713=m ++# CONFIG_USB_DSBR is not set ++# CONFIG_USB_SI470X is not set ++CONFIG_I2C_BCM2048=m ++# CONFIG_USB_MR800 is not set ++# CONFIG_DAB is not set ++ ++# ++# Graphics support ++# ++CONFIG_PVR=m ++# CONFIG_DRM_VER_ORIG is not set ++# CONFIG_DRM_VER_TUNGSTEN is not set ++# CONFIG_DRM_TUNGSTEN is not set ++# CONFIG_VGASTATE is not set ++# CONFIG_VIDEO_OUTPUT_CONTROL is not set ++CONFIG_FB=y ++# CONFIG_FIRMWARE_EDID is not set ++# CONFIG_FB_DDC is not set ++# CONFIG_FB_BOOT_VESA_SUPPORT is not set ++CONFIG_FB_CFB_FILLRECT=y ++CONFIG_FB_CFB_COPYAREA=y ++CONFIG_FB_CFB_IMAGEBLIT=y ++# CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set ++# CONFIG_FB_SYS_FILLRECT is not set ++# CONFIG_FB_SYS_COPYAREA is not set ++# CONFIG_FB_SYS_IMAGEBLIT is not set ++# CONFIG_FB_FOREIGN_ENDIAN is not set ++# CONFIG_FB_SYS_FOPS is not set ++# CONFIG_FB_SVGALIB is not set ++# CONFIG_FB_MACMODES is not set ++# CONFIG_FB_BACKLIGHT is not set ++# CONFIG_FB_MODE_HELPERS is not set ++# CONFIG_FB_TILEBLITTING is not set ++ ++# ++# Frame buffer hardware drivers ++# ++# CONFIG_FB_UVESA is not set ++# CONFIG_FB_S1D13XXX is not set ++# CONFIG_FB_VIRTUAL is not set ++# CONFIG_FB_METRONOME is not set ++# CONFIG_FB_MB862XX is not set ++CONFIG_FB_OMAP_BOOTLOADER_INIT=y ++CONFIG_FB_OMAP_CONSISTENT_DMA_SIZE=14 ++CONFIG_OMAP2_DSS=y ++CONFIG_OMAP2_DSS_VRAM_SIZE=0 ++# CONFIG_OMAP2_DSS_DEBUG_SUPPORT is not set ++# CONFIG_OMAP2_DSS_RFBI is not set ++CONFIG_OMAP2_DSS_VENC=y ++CONFIG_OMAP2_DSS_SDI=y ++# CONFIG_OMAP2_DSS_DSI is not set ++# CONFIG_OMAP2_DSS_FAKE_VSYNC is not set ++CONFIG_OMAP2_DSS_MIN_FCK_PER_PCK=0 ++ ++# ++# OMAP2/3 Display Device Drivers ++# ++# CONFIG_PANEL_NEVADA is not set ++CONFIG_PANEL_ACX565AKM=y ++# CONFIG_PANEL_GENERIC is not set ++# CONFIG_PANEL_SAMSUNG_LTE430WQ_F0C is not set ++# CONFIG_PANEL_SHARP_LS037V7DW01 is not set ++CONFIG_FB_OMAP2=y ++# CONFIG_FB_OMAP2_DEBUG_SUPPORT is not set ++# CONFIG_FB_OMAP2_FORCE_AUTO_UPDATE is not set ++CONFIG_FB_OMAP2_NUM_FBS=3 ++# CONFIG_BACKLIGHT_LCD_SUPPORT is not set ++CONFIG_BACKLIGHT_CLASS_DEVICE=y ++# CONFIG_BACKLIGHT_CORGI is not set ++ ++# ++# Display device support ++# ++CONFIG_DISPLAY_SUPPORT=y ++ ++# ++# Display hardware drivers ++# ++ ++# ++# Console display driver support ++# ++# CONFIG_VGA_CONSOLE is not set ++CONFIG_DUMMY_CONSOLE=y ++# CONFIG_FRAMEBUFFER_CONSOLE is not set ++# CONFIG_LOGO is not set ++CONFIG_SOUND=y ++# CONFIG_SOUND_OSS_CORE is not set ++CONFIG_SND=y ++CONFIG_SND_TIMER=y ++CONFIG_SND_PCM=y ++CONFIG_SND_JACK=y ++# CONFIG_SND_SEQUENCER is not set ++# CONFIG_SND_MIXER_OSS is not set ++# CONFIG_SND_PCM_OSS is not set ++# CONFIG_SND_DYNAMIC_MINORS is not set ++CONFIG_SND_SUPPORT_OLD_API=y ++CONFIG_SND_VERBOSE_PROCFS=y ++# CONFIG_SND_VERBOSE_PRINTK is not set ++# CONFIG_SND_DEBUG is not set ++CONFIG_SND_DRIVERS=y ++# CONFIG_SND_DUMMY is not set ++# CONFIG_SND_MTPAV is not set ++# CONFIG_SND_SERIAL_U16550 is not set ++# CONFIG_SND_MPU401 is not set ++CONFIG_SND_ARM=y ++CONFIG_SND_SPI=y ++# CONFIG_SND_USB is not set ++CONFIG_SND_SOC=y ++CONFIG_SND_OMAP_SOC=y ++CONFIG_SND_OMAP_SOC_MCBSP=y ++CONFIG_SND_OMAP_SOC_RX51=y ++# CONFIG_SND_SOC_ALL_CODECS is not set ++CONFIG_SND_SOC_TLV320AIC3X=y ++# CONFIG_SOUND_PRIME is not set ++CONFIG_HID_SUPPORT=y ++CONFIG_HID=m ++# CONFIG_HID_DEBUG is not set ++# CONFIG_HIDRAW is not set ++ ++# ++# USB Input Devices ++# ++CONFIG_USB_HID=m ++# CONFIG_HID_PID is not set ++# CONFIG_USB_HIDDEV is not set ++ ++# ++# USB HID Boot Protocol drivers ++# ++# CONFIG_USB_KBD is not set ++# CONFIG_USB_MOUSE is not set ++ ++# ++# Special HID drivers ++# ++# CONFIG_HID_COMPAT is not set ++# CONFIG_HID_A4TECH is not set ++# CONFIG_HID_APPLE is not set ++# CONFIG_HID_BELKIN is not set ++# CONFIG_HID_BRIGHT is not set ++# CONFIG_HID_CHERRY is not set ++# CONFIG_HID_CHICONY is not set ++# CONFIG_HID_CYPRESS is not set ++# CONFIG_HID_DELL is not set ++# CONFIG_HID_EZKEY is not set ++# CONFIG_HID_GYRATION is not set ++# CONFIG_HID_LOGITECH is not set ++# CONFIG_HID_MICROSOFT is not set ++# CONFIG_HID_MONTEREY is not set ++# CONFIG_HID_PANTHERLORD is not set ++# CONFIG_HID_PETALYNX is not set ++# CONFIG_HID_SAMSUNG is not set ++# CONFIG_HID_SONY is not set ++# CONFIG_HID_SUNPLUS is not set ++# CONFIG_THRUSTMASTER_FF is not set ++# CONFIG_ZEROPLUS_FF is not set ++CONFIG_USB_SUPPORT=y ++CONFIG_USB_ARCH_HAS_HCD=y ++CONFIG_USB_ARCH_HAS_OHCI=y ++CONFIG_USB_ARCH_HAS_EHCI=y ++CONFIG_USB=y ++# CONFIG_USB_DEBUG is not set ++# CONFIG_USB_ANNOUNCE_NEW_DEVICES is not set ++ ++# ++# Miscellaneous USB options ++# ++CONFIG_USB_DEVICEFS=y ++# CONFIG_USB_DEVICE_CLASS is not set ++CONFIG_USB_DYNAMIC_MINORS=y ++CONFIG_USB_SUSPEND=y ++CONFIG_USB_OTG=y ++CONFIG_USB_OTG_WHITELIST=y ++CONFIG_USB_OTG_BLACKLIST_HUB=y ++CONFIG_USB_MON=y ++# CONFIG_USB_WUSB is not set ++# CONFIG_USB_WUSB_CBAF is not set ++ ++# ++# USB Host Controller Drivers ++# ++# CONFIG_USB_C67X00_HCD is not set ++# CONFIG_USB_EHCI_HCD is not set ++# CONFIG_USB_ISP116X_HCD is not set ++# CONFIG_USB_OHCI_HCD is not set ++# CONFIG_USB_SL811_HCD is not set ++# CONFIG_USB_R8A66597_HCD is not set ++# CONFIG_USB_HWA_HCD is not set ++CONFIG_USB_MUSB_HDRC=y ++CONFIG_USB_MUSB_SOC=y ++ ++# ++# OMAP 343x high speed USB support ++# ++# CONFIG_USB_MUSB_HOST is not set ++# CONFIG_USB_MUSB_PERIPHERAL is not set ++CONFIG_USB_MUSB_OTG=y ++CONFIG_USB_GADGET_MUSB_HDRC=y ++CONFIG_USB_MUSB_HDRC_HCD=y ++# CONFIG_MUSB_PIO_ONLY is not set ++CONFIG_USB_INVENTRA_DMA=y ++# CONFIG_USB_TI_CPPI_DMA is not set ++CONFIG_USB_MUSB_DEBUG=y ++CONFIG_MUSB_PROC_FS=y ++ ++# ++# USB Device Class drivers ++# ++# CONFIG_USB_ACM is not set ++# CONFIG_USB_PRINTER is not set ++# CONFIG_USB_WDM is not set ++# CONFIG_USB_TMC is not set ++ ++# ++# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may also be needed; ++# ++ ++# ++# see USB_STORAGE Help for more information ++# ++CONFIG_USB_STORAGE=m ++# CONFIG_USB_STORAGE_DEBUG is not set ++# CONFIG_USB_STORAGE_DATAFAB is not set ++# CONFIG_USB_STORAGE_FREECOM is not set ++# CONFIG_USB_STORAGE_ISD200 is not set ++# CONFIG_USB_STORAGE_DPCM is not set ++# CONFIG_USB_STORAGE_USBAT is not set ++# CONFIG_USB_STORAGE_SDDR09 is not set ++# 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=y ++ ++# ++# USB Imaging devices ++# ++# CONFIG_USB_MDC800 is not set ++# CONFIG_USB_MICROTEK is not set ++ ++# ++# USB port drivers ++# ++# CONFIG_USB_SERIAL is not set ++ ++# ++# USB Miscellaneous drivers ++# ++# CONFIG_USB_EMI62 is not set ++# CONFIG_USB_EMI26 is not set ++# CONFIG_USB_ADUTUX is not set ++# CONFIG_USB_SEVSEG is not set ++# CONFIG_USB_RIO500 is not set ++# CONFIG_USB_LEGOTOWER is not set ++# CONFIG_USB_LCD is not set ++# CONFIG_USB_BERRY_CHARGE is not set ++# CONFIG_USB_LED is not set ++# CONFIG_USB_CYPRESS_CY7C63 is not set ++# CONFIG_USB_CYTHERM is not set ++# CONFIG_USB_PHIDGET is not set ++# CONFIG_USB_IDMOUSE is not set ++# CONFIG_USB_FTDI_ELAN is not set ++# CONFIG_USB_APPLEDISPLAY is not set ++# CONFIG_USB_LD is not set ++# CONFIG_USB_TRANCEVIBRATOR is not set ++# CONFIG_USB_IOWARRIOR is not set ++CONFIG_USB_TEST=m ++# CONFIG_USB_ISIGHTFW is not set ++# CONFIG_USB_VST is not set ++CONFIG_USB_GADGET=m ++# CONFIG_USB_GADGET_DEBUG is not set ++# CONFIG_USB_GADGET_DEBUG_FILES is not set ++# CONFIG_USB_GADGET_DEBUG_FS is not set ++CONFIG_USB_GADGET_VBUS_DRAW=2 ++CONFIG_USB_GADGET_SELECTED=y ++# CONFIG_USB_GADGET_AT91 is not set ++# CONFIG_USB_GADGET_ATMEL_USBA is not set ++# CONFIG_USB_GADGET_FSL_USB2 is not set ++# CONFIG_USB_GADGET_LH7A40X is not set ++# CONFIG_USB_GADGET_OMAP is not set ++# CONFIG_USB_GADGET_PXA25X is not set ++# CONFIG_USB_GADGET_PXA27X is not set ++# CONFIG_USB_GADGET_S3C2410 is not set ++# CONFIG_USB_GADGET_M66592 is not set ++# CONFIG_USB_GADGET_AMD5536UDC is not set ++# CONFIG_USB_GADGET_FSL_QE is not set ++# CONFIG_USB_GADGET_NET2280 is not set ++# CONFIG_USB_GADGET_GOKU is not set ++# CONFIG_USB_GADGET_DUMMY_HCD is not set ++CONFIG_USB_GADGET_DUALSPEED=y ++CONFIG_USB_ZERO=m ++# CONFIG_USB_ZERO_HNPTEST is not set ++# CONFIG_USB_ETH is not set ++# CONFIG_USB_GADGETFS is not set ++CONFIG_USB_FILE_STORAGE=m ++CONFIG_USB_FILE_STORAGE_TEST=y ++# CONFIG_USB_G_SERIAL is not set ++# CONFIG_USB_MIDI_GADGET is not set ++# CONFIG_USB_G_PRINTER is not set ++# CONFIG_USB_CDC_COMPOSITE is not set ++CONFIG_USB_G_NOKIA=m ++CONFIG_USB_G_SOFTUPD=m ++ ++# ++# OTG and related infrastructure ++# ++CONFIG_USB_OTG_UTILS=y ++# CONFIG_USB_GPIO_VBUS is not set ++# CONFIG_ISP1301_OMAP is not set ++CONFIG_TWL4030_USB=y ++CONFIG_MMC=m ++# CONFIG_MMC_DEBUG is not set ++CONFIG_MMC_UNSAFE_RESUME=y ++ ++# ++# MMC/SD/SDIO Card Drivers ++# ++CONFIG_MMC_BLOCK=m ++# CONFIG_MMC_BLOCK_BOUNCE is not set ++# CONFIG_SDIO_UART is not set ++# CONFIG_MMC_TEST is not set ++ ++# ++# MMC/SD/SDIO Host Controller Drivers ++# ++# CONFIG_MMC_SDHCI is not set ++CONFIG_MMC_OMAP_HS=m ++# CONFIG_MMC_SPI is not set ++# CONFIG_MEMSTICK is not set ++# CONFIG_ACCESSIBILITY is not set ++CONFIG_NEW_LEDS=y ++CONFIG_LEDS_CLASS=m ++ ++# ++# LED drivers ++# ++# CONFIG_LEDS_OMAP is not set ++# CONFIG_LEDS_OMAP_PWM is not set ++# CONFIG_LEDS_PCA9532 is not set ++# CONFIG_LEDS_GPIO is not set ++# CONFIG_LEDS_PCA955X is not set ++CONFIG_LEDS_TWL4030_VIBRA=m ++CONFIG_LEDS_LP5523=m ++ ++# ++# LED Triggers ++# ++CONFIG_LEDS_TRIGGERS=y ++CONFIG_LEDS_TRIGGER_TIMER=y ++CONFIG_LEDS_TRIGGER_HEARTBEAT=y ++# CONFIG_LEDS_TRIGGER_BACKLIGHT is not set ++# CONFIG_LEDS_TRIGGER_DEFAULT_ON is not set ++CONFIG_RTC_LIB=y ++CONFIG_RTC_CLASS=m ++ ++# ++# RTC interfaces ++# ++CONFIG_RTC_INTF_SYSFS=y ++CONFIG_RTC_INTF_PROC=y ++CONFIG_RTC_INTF_DEV=y ++# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set ++# CONFIG_RTC_DRV_TEST is not set ++ ++# ++# I2C RTC drivers ++# ++# CONFIG_RTC_DRV_DS1307 is not set ++# CONFIG_RTC_DRV_DS1374 is not set ++# CONFIG_RTC_DRV_DS1672 is not set ++# CONFIG_RTC_DRV_MAX6900 is not set ++# CONFIG_RTC_DRV_RS5C372 is not set ++# CONFIG_RTC_DRV_ISL1208 is not set ++# CONFIG_RTC_DRV_X1205 is not set ++# CONFIG_RTC_DRV_PCF8563 is not set ++# CONFIG_RTC_DRV_PCF8583 is not set ++# CONFIG_RTC_DRV_M41T80 is not set ++CONFIG_RTC_DRV_TWL4030=m ++# CONFIG_RTC_DRV_S35390A is not set ++# CONFIG_RTC_DRV_FM3130 is not set ++# CONFIG_RTC_DRV_RX8581 is not set ++ ++# ++# SPI RTC drivers ++# ++# CONFIG_RTC_DRV_M41T94 is not set ++# CONFIG_RTC_DRV_DS1305 is not set ++# CONFIG_RTC_DRV_DS1390 is not set ++# CONFIG_RTC_DRV_MAX6902 is not set ++# CONFIG_RTC_DRV_R9701 is not set ++# CONFIG_RTC_DRV_RS5C348 is not set ++# CONFIG_RTC_DRV_DS3234 is not set ++ ++# ++# Platform RTC drivers ++# ++# CONFIG_RTC_DRV_CMOS is not set ++# CONFIG_RTC_DRV_DS1286 is not set ++# CONFIG_RTC_DRV_DS1511 is not set ++# CONFIG_RTC_DRV_DS1553 is not set ++# CONFIG_RTC_DRV_DS1742 is not set ++# CONFIG_RTC_DRV_STK17TA8 is not set ++# CONFIG_RTC_DRV_M48T86 is not set ++# CONFIG_RTC_DRV_M48T35 is not set ++# CONFIG_RTC_DRV_M48T59 is not set ++# CONFIG_RTC_DRV_BQ4802 is not set ++# CONFIG_RTC_DRV_V3020 is not set ++ ++# ++# on-CPU RTC drivers ++# ++# CONFIG_DMADEVICES is not set ++CONFIG_REGULATOR=y ++# CONFIG_REGULATOR_DEBUG is not set ++# CONFIG_REGULATOR_FIXED_VOLTAGE is not set ++# CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set ++# CONFIG_REGULATOR_BQ24022 is not set ++CONFIG_REGULATOR_TWL4030=y ++# CONFIG_UIO is not set ++ ++# ++# CBUS support ++# ++# CONFIG_CBUS is not set ++CONFIG_MPU_BRIDGE=m ++CONFIG_BRIDGE_DVFS=y ++CONFIG_BRIDGE_MEMPOOL_SIZE=0x412800 ++# CONFIG_BRIDGE_DEBUG is not set ++ ++# ++# File systems ++# ++CONFIG_EXT2_FS=m ++# CONFIG_EXT2_FS_XATTR is not set ++# CONFIG_EXT2_FS_XIP is not set ++CONFIG_EXT3_FS=m ++# CONFIG_EXT3_FS_XATTR is not set ++# CONFIG_EXT4_FS is not set ++CONFIG_JBD=m ++# CONFIG_JBD_DEBUG is not set ++# CONFIG_REISERFS_FS is not set ++# CONFIG_JFS_FS is not set ++# CONFIG_FS_POSIX_ACL is not set ++CONFIG_FILE_LOCKING=y ++# CONFIG_XFS_FS is not set ++# CONFIG_OCFS2_FS is not set ++CONFIG_DNOTIFY=y ++CONFIG_INOTIFY=y ++CONFIG_INOTIFY_USER=y ++CONFIG_QUOTA=y ++# CONFIG_QUOTA_NETLINK_INTERFACE is not set ++CONFIG_PRINT_QUOTA_WARNING=y ++# CONFIG_QFMT_V1 is not set ++CONFIG_QFMT_V2=y ++CONFIG_QUOTACTL=y ++# CONFIG_AUTOFS_FS is not set ++# CONFIG_AUTOFS4_FS is not set ++CONFIG_FUSE_FS=m ++ ++# ++# CD-ROM/DVD Filesystems ++# ++# CONFIG_ISO9660_FS is not set ++# CONFIG_UDF_FS is not set ++ ++# ++# DOS/FAT/NT Filesystems ++# ++CONFIG_FAT_FS=m ++CONFIG_MSDOS_FS=m ++CONFIG_VFAT_FS=m ++CONFIG_FAT_DEFAULT_CODEPAGE=437 ++CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" ++# CONFIG_NTFS_FS is not set ++ ++# ++# Pseudo filesystems ++# ++CONFIG_PROC_FS=y ++CONFIG_PROC_SYSCTL=y ++CONFIG_PROC_PAGE_MONITOR=y ++CONFIG_SYSFS=y ++CONFIG_TMPFS=y ++# CONFIG_TMPFS_POSIX_ACL is not set ++# CONFIG_HUGETLB_PAGE is not set ++# CONFIG_CONFIGFS_FS is not set ++ ++# ++# Miscellaneous filesystems ++# ++# CONFIG_ADFS_FS is not set ++# CONFIG_AFFS_FS is not set ++# CONFIG_HFS_FS is not set ++# CONFIG_HFSPLUS_FS is not set ++# 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_UBIFS_FS=y ++# CONFIG_UBIFS_FS_XATTR is not set ++# CONFIG_UBIFS_FS_ADVANCED_COMPR is not set ++CONFIG_UBIFS_FS_LZO=y ++CONFIG_UBIFS_FS_ZLIB=y ++# CONFIG_UBIFS_FS_DEBUG is not set ++CONFIG_CRAMFS=y ++# CONFIG_VXFS_FS is not set ++# CONFIG_MINIX_FS is not set ++# CONFIG_OMFS_FS is not set ++# CONFIG_HPFS_FS is not set ++# CONFIG_QNX4FS_FS is not set ++# CONFIG_ROMFS_FS is not set ++# CONFIG_SYSV_FS is not set ++# CONFIG_UFS_FS is not set ++CONFIG_NETWORK_FILESYSTEMS=y ++CONFIG_NFS_FS=m ++CONFIG_NFS_V3=y ++# CONFIG_NFS_V3_ACL is not set ++CONFIG_NFS_V4=y ++# CONFIG_NFSD is not set ++CONFIG_LOCKD=m ++CONFIG_LOCKD_V4=y ++CONFIG_NFS_COMMON=y ++CONFIG_SUNRPC=m ++CONFIG_SUNRPC_GSS=m ++# CONFIG_SUNRPC_REGISTER_V4 is not set ++CONFIG_RPCSEC_GSS_KRB5=m ++# CONFIG_RPCSEC_GSS_SPKM3 is not set ++# CONFIG_SMB_FS is not set ++# CONFIG_CIFS is not set ++# CONFIG_NCP_FS is not set ++# CONFIG_CODA_FS is not set ++# CONFIG_AFS_FS is not set ++ ++# ++# Partition Types ++# ++CONFIG_PARTITION_ADVANCED=y ++# CONFIG_ACORN_PARTITION is not set ++# CONFIG_OSF_PARTITION is not set ++# CONFIG_AMIGA_PARTITION is not set ++# CONFIG_ATARI_PARTITION is not set ++# CONFIG_MAC_PARTITION is not set ++CONFIG_MSDOS_PARTITION=y ++# CONFIG_BSD_DISKLABEL is not set ++# CONFIG_MINIX_SUBPARTITION is not set ++# CONFIG_SOLARIS_X86_PARTITION is not set ++# CONFIG_UNIXWARE_DISKLABEL is not set ++# CONFIG_LDM_PARTITION is not set ++# CONFIG_SGI_PARTITION is not set ++# CONFIG_ULTRIX_PARTITION is not set ++# CONFIG_SUN_PARTITION is not set ++# CONFIG_KARMA_PARTITION is not set ++# CONFIG_EFI_PARTITION is not set ++# CONFIG_SYSV68_PARTITION is not set ++CONFIG_NLS=y ++CONFIG_NLS_DEFAULT="iso8859-1" ++CONFIG_NLS_CODEPAGE_437=y ++# CONFIG_NLS_CODEPAGE_737 is not set ++# CONFIG_NLS_CODEPAGE_775 is not set ++# CONFIG_NLS_CODEPAGE_850 is not set ++# CONFIG_NLS_CODEPAGE_852 is not set ++# CONFIG_NLS_CODEPAGE_855 is not set ++# CONFIG_NLS_CODEPAGE_857 is not set ++# CONFIG_NLS_CODEPAGE_860 is not set ++# CONFIG_NLS_CODEPAGE_861 is not set ++# CONFIG_NLS_CODEPAGE_862 is not set ++# CONFIG_NLS_CODEPAGE_863 is not set ++# CONFIG_NLS_CODEPAGE_864 is not set ++# CONFIG_NLS_CODEPAGE_865 is not set ++# CONFIG_NLS_CODEPAGE_866 is not set ++# CONFIG_NLS_CODEPAGE_869 is not set ++# CONFIG_NLS_CODEPAGE_936 is not set ++# CONFIG_NLS_CODEPAGE_950 is not set ++# CONFIG_NLS_CODEPAGE_932 is not set ++# 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 is not set ++# CONFIG_NLS_CODEPAGE_1251 is not set ++# CONFIG_NLS_ASCII is not set ++CONFIG_NLS_ISO8859_1=y ++# CONFIG_NLS_ISO8859_2 is not set ++# CONFIG_NLS_ISO8859_3 is not set ++# CONFIG_NLS_ISO8859_4 is not set ++# CONFIG_NLS_ISO8859_5 is not set ++# CONFIG_NLS_ISO8859_6 is not set ++# CONFIG_NLS_ISO8859_7 is not set ++# CONFIG_NLS_ISO8859_9 is not set ++# CONFIG_NLS_ISO8859_13 is not set ++# CONFIG_NLS_ISO8859_14 is not set ++# CONFIG_NLS_ISO8859_15 is not set ++# CONFIG_NLS_KOI8_R is not set ++# CONFIG_NLS_KOI8_U is not set ++# CONFIG_NLS_UTF8 is not set ++# CONFIG_DLM is not set ++ ++# ++# Kernel hacking ++# ++CONFIG_PRINTK_TIME=y ++CONFIG_ENABLE_WARN_DEPRECATED=y ++CONFIG_ENABLE_MUST_CHECK=y ++CONFIG_FRAME_WARN=1024 ++CONFIG_MAGIC_SYSRQ=y ++# CONFIG_UNUSED_SYMBOLS is not set ++CONFIG_DEBUG_FS=y ++# CONFIG_HEADERS_CHECK is not set ++CONFIG_DEBUG_KERNEL=y ++# CONFIG_DEBUG_SHIRQ is not set ++# CONFIG_DETECT_SOFTLOCKUP is not set ++# CONFIG_SCHED_DEBUG is not set ++# CONFIG_SCHEDSTATS is not set ++CONFIG_TIMER_STATS=y ++# CONFIG_DEBUG_OBJECTS is not set ++# CONFIG_SLUB_DEBUG_ON is not set ++# CONFIG_SLUB_STATS is not set ++# CONFIG_DEBUG_PREEMPT is not set ++# CONFIG_DEBUG_RT_MUTEXES is not set ++# CONFIG_RT_MUTEX_TESTER is not set ++# CONFIG_DEBUG_SPINLOCK is not set ++# CONFIG_DEBUG_MUTEXES is not set ++# CONFIG_DEBUG_LOCK_ALLOC is not set ++# CONFIG_PROVE_LOCKING is not set ++# CONFIG_LOCK_STAT is not set ++# CONFIG_DEBUG_SPINLOCK_SLEEP is not set ++# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set ++# CONFIG_DEBUG_KOBJECT is not set ++CONFIG_DEBUG_BUGVERBOSE=y ++CONFIG_DEBUG_INFO=y ++# CONFIG_DEBUG_VM is not set ++# CONFIG_DEBUG_WRITECOUNT is not set ++# CONFIG_DEBUG_MEMORY_INIT is not set ++# CONFIG_DEBUG_LIST is not set ++# CONFIG_DEBUG_SG is not set ++CONFIG_FRAME_POINTER=y ++# CONFIG_BOOT_PRINTK_DELAY is not set ++# CONFIG_RCU_TORTURE_TEST is not set ++# CONFIG_RCU_CPU_STALL_DETECTOR is not set ++# CONFIG_KPROBES_SANITY_TEST is not set ++# CONFIG_BACKTRACE_SELF_TEST is not set ++# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set ++# CONFIG_LKDTM is not set ++# CONFIG_FAULT_INJECTION is not set ++CONFIG_PANIC_INFO_BUFF=m ++# CONFIG_LATENCYTOP is not set ++# CONFIG_SYSCTL_SYSCALL_CHECK is not set ++CONFIG_HAVE_FUNCTION_TRACER=y ++ ++# ++# Tracers ++# ++# CONFIG_FUNCTION_TRACER is not set ++# CONFIG_IRQSOFF_TRACER is not set ++# CONFIG_PREEMPT_TRACER is not set ++# CONFIG_SCHED_TRACER is not set ++# CONFIG_CONTEXT_SWITCH_TRACER is not set ++# CONFIG_BOOT_TRACER is not set ++# CONFIG_STACK_TRACER is not set ++# CONFIG_DYNAMIC_PRINTK_DEBUG is not set ++# CONFIG_SAMPLES is not set ++CONFIG_HAVE_ARCH_KGDB=y ++# CONFIG_KGDB is not set ++# CONFIG_DEBUG_USER is not set ++# CONFIG_DEBUG_ERRORS is not set ++# CONFIG_DEBUG_STACK_USAGE is not set ++# CONFIG_DEBUG_LL is not set ++ ++# ++# Security options ++# ++# CONFIG_KEYS is not set ++CONFIG_SECURITY=y ++# CONFIG_SECURITYFS is not set ++# CONFIG_SECURITY_NETWORK is not set ++# CONFIG_SECURITY_FILE_CAPABILITIES is not set ++# CONFIG_SECURITY_ROOTPLUG is not set ++CONFIG_SECURITY_LOWMEM=y ++CONFIG_SECURITY_DEFAULT_MMAP_MIN_ADDR=4096 ++CONFIG_CRYPTO=y ++ ++# ++# Crypto core or helper ++# ++# CONFIG_CRYPTO_FIPS is not set ++CONFIG_CRYPTO_ALGAPI=y ++CONFIG_CRYPTO_ALGAPI2=y ++CONFIG_CRYPTO_AEAD2=y ++CONFIG_CRYPTO_BLKCIPHER=y ++CONFIG_CRYPTO_BLKCIPHER2=y ++CONFIG_CRYPTO_HASH2=y ++CONFIG_CRYPTO_RNG2=y ++CONFIG_CRYPTO_MANAGER=y ++CONFIG_CRYPTO_MANAGER2=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=y ++# 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 ++ ++# ++# 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_RMD128 is not set ++# CONFIG_CRYPTO_RMD160 is not set ++# CONFIG_CRYPTO_RMD256 is not set ++# CONFIG_CRYPTO_RMD320 is not set ++# CONFIG_CRYPTO_SHA1 is not set ++# CONFIG_CRYPTO_SHA256 is not set ++# CONFIG_CRYPTO_SHA512 is not set ++# CONFIG_CRYPTO_TGR192 is not set ++# CONFIG_CRYPTO_WP512 is not set ++ ++# ++# Ciphers ++# ++CONFIG_CRYPTO_AES=y ++# CONFIG_CRYPTO_ANUBIS is not set ++CONFIG_CRYPTO_ARC4=y ++# 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_DES=y ++# CONFIG_CRYPTO_FCRYPT is not set ++# CONFIG_CRYPTO_KHAZAD 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=y ++CONFIG_CRYPTO_LZO=y ++ ++# ++# Random Number Generation ++# ++# CONFIG_CRYPTO_ANSI_CPRNG is not set ++CONFIG_CRYPTO_HW=y ++ ++# ++# Library routines ++# ++CONFIG_BITREVERSE=y ++CONFIG_CRC_CCITT=y ++CONFIG_CRC16=y ++# CONFIG_CRC_T10DIF is not set ++# CONFIG_CRC_ITU_T is not set ++CONFIG_CRC32=y ++CONFIG_CRC7=m ++CONFIG_LIBCRC32C=y ++CONFIG_ZLIB_INFLATE=y ++CONFIG_ZLIB_DEFLATE=y ++CONFIG_LZO_COMPRESS=y ++CONFIG_LZO_DECOMPRESS=y ++CONFIG_PLIST=y ++CONFIG_HAS_IOMEM=y ++CONFIG_HAS_IOPORT=y ++CONFIG_HAS_DMA=y diff --git a/kernel-maemo-2.6.28/debian/patches/series b/kernel-maemo-2.6.28/debian/patches/series index ee81fc9..bd2ef40 100644 --- a/kernel-maemo-2.6.28/debian/patches/series +++ b/kernel-maemo-2.6.28/debian/patches/series @@ -1,8 +1,8 @@ nokia-20094803.3+0m5.diff +maemo-build.diff unionfs-2.5.3.diff dm-loop.diff usbip.diff nilfs2-2.0.18.diff -maemo-build.diff minstrel-aziwoqpa.diff iphb-matan.diff diff --git a/kernel-maemo-2.6.28/debian/rules b/kernel-maemo-2.6.28/debian/rules index 44181dd..2145c17 100644 --- a/kernel-maemo-2.6.28/debian/rules +++ b/kernel-maemo-2.6.28/debian/rules @@ -10,7 +10,7 @@ REVISION := maemo PACKAGE := kernel FLASHER_PACKAGE := kernel-flasher-maemo -SOURCE_PACKAGE := $(PACKAGE)-source +#SOURCE_PACKAGE := $(PACKAGE)-source KERNEL_PACKAGE := $(PACKAGE)-maemo MODULES_PACKAGE := $(PACKAGE)-modules-maemo HEADERS_PACKAGE := $(PACKAGE)-headers-maemo @@ -20,12 +20,15 @@ DEBUG_MODULES_PACKAGE := $(PACKAGE)-modules-debug LIBC_PACKAGE := linux-kernel-headers-maemo BUILDTMP := $(CURDIR)/debian/build -KSRC := $(BUILDTMP)/$(PACKAGE) +#KSRC := $(BUILDTMP)/$(PACKAGE) +KSRC := $(CURDIR) +export KBUILD_OUTPUT = $(BUILDTMP) -DEFCONFIG := rx51_defconfig +DEFCONFIG := rx51maemo_defconfig KVER = $(shell cat $(KSRC)/include/config/kernel.release 2> /dev/null) ARCH = $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU) -INCLUDE_HEADERS = acpi asm-generic asm-$(ARCH) config crypto drm Kbuild keys linux math-emu media mtd net pcmcia rdma rxrpc scsi sound video xen +INCLUDE_HEADERS = acpi asm-generic crypto drm Kbuild keys math-emu media mtd net pcmcia rdma rxrpc scsi sound video xen +INCLUDE_HEADERS_ARCH = asm-$(ARCH) config linux RM_SCRIPTS = bloat-o-meter show_delta DEBUG_MODULES = oprofile.ko MAKE += $(MAKEFLAGS) @@ -42,22 +45,13 @@ ifneq (,$(findstring parallel,$(DEB_BUILD_OPTIONS))) NJOBS := -j$(PARALLEL_JOBS) endif -source-copy-stamp: +configure-stamp: dh_testdir + mkdir -p $(BUILDTMP) $(MAKE) clean QUILT_PATCHES=debian/patches quilt push -a || test $$? = 2 - cp debian/rx51_defconfig arch/arm/configs/ + cp debian/$(DEFCONFIG) arch/arm/configs/ - mkdir -p $(BUILDTMP)/$(SOURCE_PACKAGE) - tar cf - `echo * | sed -e 's/ debian//g' -e 's/\.deb//g' ` \ - | (cd $(BUILDTMP)/$(SOURCE_PACKAGE) ; umask 000; tar xspf -) - touch $@ - -source-stamp: source-copy-stamp - cd $(BUILDTMP) && cp -a $(SOURCE_PACKAGE) $(KSRC) - touch $@ - -configure-stamp: source-stamp cd $(KSRC) && $(MAKE) $(EXTRAVERSION) $(DEFCONFIG) touch $@ @@ -81,17 +75,11 @@ modules-extra: configure-stamp headers: kernel-stamp modules-stamp -kernel-source-stamp: source-copy-stamp - dh_testdir - - cd $(BUILDTMP) && \ - tar --bzip2 -cf $(SOURCE_PACKAGE).tar.bz2 $(SOURCE_PACKAGE) - touch $@ - clean: dh_testdir dh_testroot + mkdir -p $(BUILDTMP) $(MAKE) clean -rm -f scripts/basic/{docproc,fixdep,hash} scripts/kconfig/mconf rm -f modules/modversions.h modules/ksyms.ver debian/files conf.vars scripts/cramfs/cramfsck \ @@ -101,7 +89,8 @@ clean: rm -rf debian/build rm -f *-stamp QUILT_PATCHES=debian/patches quilt pop -a -R || test $$? = 2 - -rm arch/arm/configs/rx51_defconfig + -rm arch/arm/configs/$(DEFCONFIG) + -rm -rf .pc dh_clean @@ -115,13 +104,13 @@ install-kernel: #debian/fiasco/usr/bin/fiasco-gen -o $(CURDIR)/debian/$(KERNEL_PACKAGE)/boot/zImage-$(RELEASE).fiasco -g \ # -k $(KSRC)/arch/arm/boot/zImage -v $(RELEASE) fiasco-gen -o $(CURDIR)/debian/$(KERNEL_PACKAGE)/boot/zImage-$(RELEASE).fiasco -g \ - -k $(KSRC)/arch/arm/boot/zImage -v $(RELEASE) + -k $(BUILDTMP)/arch/arm/boot/zImage -v $(RELEASE) #rm -rf debian/fiasco debian/fiasco.deb chmod 644 $(CURDIR)/debian/$(KERNEL_PACKAGE)/boot/zImage-$(RELEASE).fiasco install-debug: install-modules install -d -m 755 $(CURDIR)/debian/$(DEBUG_PACKAGE)/usr/lib/debug/lib/modules/$(KVER) - install $(KSRC)/vmlinux \ + install $(BUILDTMP)/vmlinux \ $(CURDIR)/debian/$(DEBUG_PACKAGE)/usr/lib/debug/vmlinux-$(KVER) chmod a-x $(CURDIR)/debian/$(DEBUG_PACKAGE)/usr/lib/debug/vmlinux-* mkdir -p $(CURDIR)/debian/$(DEBUG_PACKAGE)/lib/modules/$(KVER) @@ -144,7 +133,7 @@ install-modules: dh_testroot mkdir -p $(CURDIR)/debian/$(MODULES_PACKAGE)/lib/modules/$(KVER) - for f in $$(find $(KSRC) -name "*.ko"); do \ + for f in $$(find $(BUILDTMP) -name "*.ko"); do \ install -c -m 644 $$f $(CURDIR)/debian/$(MODULES_PACKAGE)/lib/modules/$(KVER)/$$(basename $$f); \ strip --remove-section=.comment --remove-section=.note --strip-unneeded $(CURDIR)/debian/$(MODULES_PACKAGE)/lib/modules/$(KVER)/$$(basename $$f); \ done @@ -156,16 +145,19 @@ install-headers: dh_installdirs install -d -m755 $(CURDIR)/debian/$(HEADERS_PACKAGE)/usr/src/$(HEADERS_PACKAGE)/ - install -p -o root -g root -m 644 $(KSRC)/.config $(CURDIR)/debian/$(HEADERS_PACKAGE)/usr/src/$(HEADERS_PACKAGE)/ + install -p -o root -g root -m 644 $(BUILDTMP)/.config $(CURDIR)/debian/$(HEADERS_PACKAGE)/usr/src/$(HEADERS_PACKAGE)/ install -p -o root -g root -m 644 $(KSRC)/Makefile $(CURDIR)/debian/$(HEADERS_PACKAGE)/usr/src/$(HEADERS_PACKAGE)/ - install -p -o root -g root -m 644 $(KSRC)/Module.symvers $(CURDIR)/debian/$(HEADERS_PACKAGE)/usr/src/$(HEADERS_PACKAGE)/ - cd $(KSRC) && install -p -o root -g root -m 644 -D include/config/auto.conf \ + install -p -o root -g root -m 644 $(BUILDTMP)/Module.symvers $(CURDIR)/debian/$(HEADERS_PACKAGE)/usr/src/$(HEADERS_PACKAGE)/ + cd $(BUILDTMP) && install -p -o root -g root -m 644 -D include/config/auto.conf \ $(CURDIR)/debian/$(HEADERS_PACKAGE)/usr/src/$(HEADERS_PACKAGE)/include/config/auto.conf cd $(KSRC) && \ find arch/$(ARCH) $(foreach dir,$(INCLUDE_HEADERS),include/$(dir)) -name '*.h' \ -exec install -D -m644 {} $(CURDIR)/debian/$(HEADERS_PACKAGE)/usr/src/$(HEADERS_PACKAGE)/{} \; + cd $(BUILDTMP) && \ + find $(foreach dir,$(INCLUDE_HEADERS_ARCH),include/$(dir)) -name '*.h' \ + -exec install -D -m644 {} $(CURDIR)/debian/$(HEADERS_PACKAGE)/usr/src/$(HEADERS_PACKAGE)/{} \; cd $(KSRC) && \ - find ./ \( -name Makefile -or -name Kbuild -or -name Kconfig\* \) \ + find ./ -path "./debian" -prune -o -path "./.pc" -prune -o \( -name Makefile -or -name Kbuild -or -name Kconfig\* \) \ -exec install -D -m644 {} $(CURDIR)/debian/$(HEADERS_PACKAGE)/usr/src/$(HEADERS_PACKAGE)/{} \; ln -sf asm-$(ARCH) $(CURDIR)/debian/$(HEADERS_PACKAGE)/usr/src/$(HEADERS_PACKAGE)/include/asm @@ -176,7 +168,7 @@ install-headers: # cp -a $(KSRC)/include/asm-$(ARCH)/arch \ # $(CURDIR)/debian/$(HEADERS_PACKAGE)/usr/src/$(HEADERS_PACKAGE)/include/asm-$(ARCH) - cp $(KSRC)/arch/$(ARCH)/kernel/asm-offsets.s \ + cp $(BUILDTMP)/arch/$(ARCH)/kernel/asm-offsets.s \ $(CURDIR)/debian/$(HEADERS_PACKAGE)/usr/src/$(HEADERS_PACKAGE)/arch/$(ARCH)/kernel #install /lib/modules symlink install -d -m 755 $(CURDIR)/debian/$(HEADERS_PACKAGE)/lib/modules/$(KVER)/ @@ -188,11 +180,11 @@ install-headers: cd $(CURDIR)/debian/$(HEADERS_PACKAGE)/usr/src/$(KBUILD_PACKAGE)/scripts && \ ( rm -f $(RM_SCRIPTS); chmod a-x mkcompile_h ) -install-libc-headers: source-stamp +install-libc-headers: dh_testdir dh_testroot - cd $(KSRC) && \ + cd $(BUILDTMP) && \ $(MAKE) headers_check ARCH=$(ARCH) && \ $(MAKE) headers_install ARCH=$(ARCH) INSTALL_HDR_PATH=$(CURDIR)/debian/$(LIBC_PACKAGE)/usr @@ -203,21 +195,13 @@ install-modules-extra: mkdir -p $(CURDIR)/debian/kernel-modules-extra/lib/modules/$(KVER)/extra for f in $(MODULES_EXTRA); do \ - install -c -m 644 $(KSRC)/$$f \ + install -c -m 644 $(BUILDTMP)/$$f \ $(CURDIR)/debian/kernel-modules-extra/lib/modules/$(KVER)/extra/$$(basename $$f); \ done -install-indep: - dh_testdir - dh_testroot - - install -p -d -o root -g root -m 755 debian/$(SOURCE_PACKAGE)/usr/src - install -m 644 $(BUILDTMP)/$(SOURCE_PACKAGE).tar.bz2 debian/$(SOURCE_PACKAGE)/usr/src - install-extra: install-modules-extra -#install-arch: build-arch install-kernel install-modules install-debug install-modules-debug install-headers install-libc-headers install-arch: build-arch install-kernel install-modules install-headers install-libc-headers ifeq ($(ARCH),arm) @@ -226,9 +210,7 @@ else build-arch: endif -build-indep: kernel-source-stamp - -build: build-arch #build-indep +build: build-arch binary-indep: #install-indep dh_testdir diff --git a/kernel-maemo-2.6.28/debian/rx51maemo_defconfig b/kernel-maemo-2.6.28/debian/rx51maemo_defconfig new file mode 100644 index 0000000..ebdd075 --- /dev/null +++ b/kernel-maemo-2.6.28/debian/rx51maemo_defconfig @@ -0,0 +1,2309 @@ +# +# Automatically generated make config: don't edit +# Linux kernel version: 2.6.28maemo-omap1 +# Sun Feb 28 15:42:09 2010 +# +CONFIG_ARM=y +CONFIG_SYS_SUPPORTS_APM_EMULATION=y +CONFIG_GENERIC_GPIO=y +CONFIG_GENERIC_TIME=y +CONFIG_GENERIC_CLOCKEVENTS=y +CONFIG_MMU=y +# CONFIG_NO_IOPORT is not set +CONFIG_GENERIC_HARDIRQS=y +CONFIG_STACKTRACE_SUPPORT=y +CONFIG_HAVE_LATENCYTOP_SUPPORT=y +CONFIG_LOCKDEP_SUPPORT=y +CONFIG_TRACE_IRQFLAGS_SUPPORT=y +CONFIG_HARDIRQS_SW_RESEND=y +CONFIG_GENERIC_IRQ_PROBE=y +CONFIG_RWSEM_GENERIC_SPINLOCK=y +# CONFIG_ARCH_HAS_ILOG2_U32 is not set +# CONFIG_ARCH_HAS_ILOG2_U64 is not set +CONFIG_GENERIC_HWEIGHT=y +CONFIG_GENERIC_CALIBRATE_DELAY=y +CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y +CONFIG_OPROFILE_OMAP_GPTIMER=y +CONFIG_OPROFILE_ARMV7=y +CONFIG_VECTORS_BASE=0xffff0000 +CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" + +# +# General setup +# +CONFIG_EXPERIMENTAL=y +CONFIG_BROKEN_ON_SMP=y +CONFIG_LOCK_KERNEL=y +CONFIG_INIT_ENV_ARG_LIMIT=32 +CONFIG_LOCALVERSION="" +CONFIG_LOCALVERSION_AUTO=y +CONFIG_SWAP=y +CONFIG_SYSVIPC=y +CONFIG_SYSVIPC_SYSCTL=y +CONFIG_POSIX_MQUEUE=y +CONFIG_BSD_PROCESS_ACCT=y +# CONFIG_BSD_PROCESS_ACCT_V3 is not set +# CONFIG_TASKSTATS is not set +# CONFIG_AUDIT is not set +CONFIG_IKCONFIG=m +CONFIG_IKCONFIG_PROC=y +CONFIG_LOG_BUF_SHIFT=14 +CONFIG_CGROUPS=y +# CONFIG_CGROUP_DEBUG is not set +# CONFIG_CGROUP_NS is not set +CONFIG_CGROUP_FREEZER=y +# CONFIG_CGROUP_DEVICE is not set +CONFIG_GROUP_SCHED=y +CONFIG_FAIR_GROUP_SCHED=y +CONFIG_RT_GROUP_SCHED=y +# CONFIG_USER_SCHED is not set +CONFIG_CGROUP_SCHED=y +# CONFIG_CGROUP_CPUACCT is not set +CONFIG_RESOURCE_COUNTERS=y +CONFIG_MM_OWNER=y +CONFIG_CGROUP_MEM_RES_CTLR=y +CONFIG_SYSFS_DEPRECATED=y +CONFIG_SYSFS_DEPRECATED_V2=y +# CONFIG_RELAY is not set +# CONFIG_NAMESPACES is not set +CONFIG_BLK_DEV_INITRD=y +CONFIG_INITRAMFS_SOURCE="" +CONFIG_CC_OPTIMIZE_FOR_SIZE=y +CONFIG_SYSCTL=y +CONFIG_EMBEDDED=y +CONFIG_UID16=y +CONFIG_SYSCTL_SYSCALL=y +CONFIG_KALLSYMS=y +CONFIG_KALLSYMS_ALL=y +CONFIG_KALLSYMS_EXTRA_PASS=y +CONFIG_HOTPLUG=y +CONFIG_PRINTK=y +CONFIG_BUG=y +CONFIG_ELF_CORE=y +CONFIG_COMPAT_BRK=y +CONFIG_BASE_FULL=y +CONFIG_FUTEX=y +CONFIG_ANON_INODES=y +CONFIG_EPOLL=y +CONFIG_SIGNALFD=y +CONFIG_TIMERFD=y +CONFIG_EVENTFD=y +CONFIG_SHMEM=y +CONFIG_AIO=y +CONFIG_VM_EVENT_COUNTERS=y +CONFIG_SLUB_DEBUG=y +# CONFIG_SLAB is not set +CONFIG_SLUB=y +# CONFIG_SLOB is not set +CONFIG_PROFILING=y +# CONFIG_MARKERS is not set +CONFIG_OPROFILE=m +CONFIG_HAVE_OPROFILE=y +CONFIG_KPROBES=y +CONFIG_KRETPROBES=y +CONFIG_HAVE_KPROBES=y +CONFIG_HAVE_KRETPROBES=y +CONFIG_HAVE_CLK=y +CONFIG_HAVE_GENERIC_DMA_COHERENT=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=y +CONFIG_MODULE_UNLOAD=y +CONFIG_MODULE_FORCE_UNLOAD=y +CONFIG_MODVERSIONS=y +CONFIG_MODULE_SRCVERSION_ALL=y +CONFIG_KMOD=y +CONFIG_BLOCK=y +# CONFIG_LBD is not set +# CONFIG_BLK_DEV_IO_TRACE is not set +# CONFIG_LSF is not set +# CONFIG_BLK_DEV_BSG is not set +# CONFIG_BLK_DEV_INTEGRITY is not set + +# +# IO Schedulers +# +CONFIG_IOSCHED_NOOP=y +# CONFIG_IOSCHED_AS is not set +# CONFIG_IOSCHED_DEADLINE is not set +CONFIG_IOSCHED_CFQ=y +# CONFIG_DEFAULT_AS is not set +# CONFIG_DEFAULT_DEADLINE is not set +CONFIG_DEFAULT_CFQ=y +# CONFIG_DEFAULT_NOOP is not set +CONFIG_DEFAULT_IOSCHED="cfq" +CONFIG_CLASSIC_RCU=y +CONFIG_FREEZER=y + +# +# System Type +# +# CONFIG_ARCH_AAEC2000 is not set +# CONFIG_ARCH_INTEGRATOR is not set +# CONFIG_ARCH_REALVIEW is not set +# CONFIG_ARCH_VERSATILE is not set +# CONFIG_ARCH_AT91 is not set +# CONFIG_ARCH_CLPS7500 is not set +# CONFIG_ARCH_CLPS711X is not set +# CONFIG_ARCH_EBSA110 is not set +# CONFIG_ARCH_EP93XX is not set +# CONFIG_ARCH_FOOTBRIDGE is not set +# CONFIG_ARCH_NETX is not set +# CONFIG_ARCH_H720X is not set +# CONFIG_ARCH_IMX is not set +# CONFIG_ARCH_IOP13XX is not set +# CONFIG_ARCH_IOP32X is not set +# CONFIG_ARCH_IOP33X is not set +# CONFIG_ARCH_IXP23XX is not set +# CONFIG_ARCH_IXP2000 is not set +# CONFIG_ARCH_IXP4XX is not set +# CONFIG_ARCH_L7200 is not set +# CONFIG_ARCH_KIRKWOOD is not set +# CONFIG_ARCH_KS8695 is not set +# CONFIG_ARCH_NS9XXX is not set +# CONFIG_ARCH_LOKI is not set +# CONFIG_ARCH_MV78XX0 is not set +# CONFIG_ARCH_MXC is not set +# CONFIG_ARCH_ORION5X is not set +# CONFIG_ARCH_PNX4008 is not set +# CONFIG_ARCH_PXA is not set +# CONFIG_ARCH_RPC is not set +# CONFIG_ARCH_SA1100 is not set +# CONFIG_ARCH_S3C2410 is not set +# CONFIG_ARCH_SHARK is not set +# CONFIG_ARCH_LH7A40X is not set +# CONFIG_ARCH_DAVINCI is not set +CONFIG_ARCH_OMAP=y +# CONFIG_ARCH_MSM is not set + +# +# TI OMAP Implementations +# +CONFIG_ARCH_OMAP_OTG=y +# CONFIG_ARCH_OMAP1 is not set +# CONFIG_ARCH_OMAP2 is not set +CONFIG_ARCH_OMAP3=y + +# +# OMAP Feature Selections +# +# CONFIG_OMAP_DEBUG_POWERDOMAIN is not set +# CONFIG_OMAP_DEBUG_CLOCKDOMAIN is not set +CONFIG_OMAP_SMARTREFLEX=y +# CONFIG_OMAP_SMARTREFLEX_TESTING is not set +CONFIG_OMAP_RESET_CLOCKS=y +CONFIG_OMAP_BOOT_TAG=y +CONFIG_OMAP_BOOT_REASON=y +CONFIG_OMAP_COMPONENT_VERSION=y +CONFIG_OMAP_GPIO_SWITCH=y +CONFIG_OMAP_MUX=y +CONFIG_OMAP_MUX_DEBUG=y +CONFIG_OMAP_MUX_WARNINGS=y +CONFIG_OMAP_MCBSP=y +# CONFIG_OMAP_MMU_FWK is not set +# CONFIG_OMAP_MBOX_FWK is not set +CONFIG_OMAP_IOMMU=m +# CONFIG_OMAP_IOMMU_DEBUG is not set +# CONFIG_OMAP_MPU_TIMER is not set +CONFIG_OMAP_32K_TIMER=y +# CONFIG_OMAP3_DEBOBS is not set +CONFIG_OMAP_32K_TIMER_HZ=128 +CONFIG_OMAP_TICK_GPTIMER=1 +CONFIG_OMAP_DM_TIMER=y +# CONFIG_OMAP_LL_DEBUG_UART1 is not set +# CONFIG_OMAP_LL_DEBUG_UART2 is not set +CONFIG_OMAP_LL_DEBUG_UART3=y +CONFIG_OMAP_SERIAL_WAKE=y +# CONFIG_OMAP_PM_NONE is not set +# CONFIG_OMAP_PM_NOOP is not set +CONFIG_OMAP_PM_SRF=y +CONFIG_ARCH_OMAP34XX=y +CONFIG_ARCH_OMAP3430=y + +# +# OMAP Board Type +# +CONFIG_MACH_NOKIA_RX51=y +CONFIG_VIDEO_MACH_RX51=m +# CONFIG_VIDEO_MACH_RX51_OLD_I2C is not set +CONFIG_MACH_NOKIA_RX71=y +# CONFIG_MACH_OMAP_LDP is not set +# CONFIG_MACH_OMAP_3430SDP is not set +# CONFIG_MACH_OMAP3EVM is not set +# CONFIG_MACH_OMAP3_BEAGLE is not set +# CONFIG_MACH_OVERO is not set +# CONFIG_MACH_OMAP3_PANDORA is not set +# CONFIG_RX51_CAMERA_BUTTON is not set + +# +# Boot options +# + +# +# Power management +# + +# +# Processor Type +# +CONFIG_CPU_32=y +CONFIG_CPU_32v6K=y +CONFIG_CPU_V7=y +CONFIG_CPU_32v7=y +CONFIG_CPU_ABRT_EV7=y +CONFIG_CPU_PABRT_IFAR=y +CONFIG_CPU_CACHE_V7=y +CONFIG_CPU_CACHE_VIPT=y +CONFIG_CPU_COPY_V6=y +CONFIG_CPU_TLB_V7=y +CONFIG_CPU_HAS_ASID=y +CONFIG_CPU_CP15=y +CONFIG_CPU_CP15_MMU=y + +# +# Processor Features +# +CONFIG_ARM_THUMB=y +CONFIG_ARM_THUMBEE=y +# CONFIG_CPU_ICACHE_DISABLE is not set +# CONFIG_CPU_DCACHE_DISABLE is not set +# CONFIG_CPU_BPREDICT_DISABLE is not set +CONFIG_HAS_TLS_REG=y +# CONFIG_OUTER_CACHE is not set + +# +# Bus support +# +# CONFIG_PCI_SYSCALL is not set +# CONFIG_ARCH_SUPPORTS_MSI is not set +# CONFIG_PCCARD is not set + +# +# Kernel Features +# +CONFIG_TICK_ONESHOT=y +CONFIG_NO_HZ=y +CONFIG_HIGH_RES_TIMERS=y +CONFIG_GENERIC_CLOCKEVENTS_BUILD=y +CONFIG_VMSPLIT_3G=y +# CONFIG_VMSPLIT_2G is not set +# CONFIG_VMSPLIT_1G is not set +CONFIG_PAGE_OFFSET=0xC0000000 +CONFIG_PREEMPT=y +CONFIG_HZ=128 +CONFIG_AEABI=y +# CONFIG_OABI_COMPAT is not set +CONFIG_ARCH_FLATMEM_HAS_HOLES=y +# CONFIG_ARCH_SPARSEMEM_DEFAULT is not set +# CONFIG_ARCH_SELECT_MEMORY_MODEL is not set +CONFIG_SELECT_MEMORY_MODEL=y +CONFIG_FLATMEM_MANUAL=y +# CONFIG_DISCONTIGMEM_MANUAL is not set +# CONFIG_SPARSEMEM_MANUAL is not set +CONFIG_FLATMEM=y +CONFIG_FLAT_NODE_MEM_MAP=y +CONFIG_PAGEFLAGS_EXTENDED=y +CONFIG_SPLIT_PTLOCK_CPUS=4 +# CONFIG_RESOURCES_64BIT is not set +# CONFIG_PHYS_ADDR_T_64BIT is not set +CONFIG_ZONE_DMA_FLAG=0 +CONFIG_VIRT_TO_BUS=y +CONFIG_UNEVICTABLE_LRU=y +# CONFIG_LEDS is not set +CONFIG_ALIGNMENT_TRAP=y + +# +# Boot options +# +CONFIG_ZBOOT_ROM_TEXT=0x0 +CONFIG_ZBOOT_ROM_BSS=0x0 +CONFIG_CMDLINE="init=/sbin/preinit ubi.mtd=rootfs root=ubi0:rootfs rootfstype=ubifs rootflags=bulk_read,no_chk_data_crc rw console=ttyMTD,log console=tty0 snd-soc-rx51.hp_lim=42 snd-soc-tlv320aic3x.hp_dac_lim=6" +# CONFIG_XIP_KERNEL is not set +CONFIG_KEXEC=y +CONFIG_ATAGS_PROC=y + +# +# CPU Power Management +# +CONFIG_CPU_FREQ=y +CONFIG_CPU_FREQ_TABLE=y +# CONFIG_CPU_FREQ_DEBUG is not set +CONFIG_CPU_FREQ_STAT=y +# CONFIG_CPU_FREQ_STAT_DETAILS is not set +# CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set +# CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set +CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE=y +# CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set +# CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set +# CONFIG_CPU_FREQ_GOV_PERFORMANCE is not set +# CONFIG_CPU_FREQ_GOV_POWERSAVE is not set +CONFIG_CPU_FREQ_GOV_USERSPACE=y +CONFIG_CPU_FREQ_GOV_ONDEMAND=y +# CONFIG_CPU_FREQ_GOV_CONSERVATIVE is not set +CONFIG_CPU_IDLE=y +CONFIG_CPU_IDLE_GOV_LADDER=y +CONFIG_CPU_IDLE_GOV_MENU=y + +# +# Floating point emulation +# + +# +# At least one emulation must be selected +# +CONFIG_VFP=y +CONFIG_VFPv3=y +CONFIG_NEON=y + +# +# Userspace binary formats +# +CONFIG_BINFMT_ELF=y +# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set +CONFIG_HAVE_AOUT=y +# CONFIG_BINFMT_AOUT is not set +CONFIG_BINFMT_MISC=y + +# +# Power management options +# +CONFIG_PM=y +CONFIG_PM_DEBUG=y +# CONFIG_PM_VERBOSE is not set +CONFIG_CAN_PM_TRACE=y +CONFIG_PM_SLEEP=y +CONFIG_SUSPEND=y +CONFIG_SUSPEND_FREEZER=y +# CONFIG_APM_EMULATION is not set +CONFIG_ARCH_SUSPEND_POSSIBLE=y +CONFIG_NET=y + +# +# Networking options +# +CONFIG_PACKET=y +# CONFIG_PACKET_MMAP is not set +CONFIG_UNIX=y +CONFIG_XFRM=y +# CONFIG_XFRM_USER is not set +# CONFIG_XFRM_SUB_POLICY is not set +# CONFIG_XFRM_MIGRATE is not set +# CONFIG_XFRM_STATISTICS is not set +CONFIG_XFRM_IPCOMP=m +CONFIG_NET_KEY=y +# CONFIG_NET_KEY_MIGRATE is not set +CONFIG_INET=y +# CONFIG_IP_MULTICAST is not set +CONFIG_IP_ADVANCED_ROUTER=y +CONFIG_ASK_IP_FIB_HASH=y +# CONFIG_IP_FIB_TRIE is not set +CONFIG_IP_FIB_HASH=y +# CONFIG_IP_MULTIPLE_TABLES is not set +# CONFIG_IP_ROUTE_MULTIPATH is not set +# CONFIG_IP_ROUTE_VERBOSE is not set +CONFIG_IP_PNP=y +CONFIG_IP_PNP_DHCP=y +CONFIG_IP_PNP_BOOTP=y +CONFIG_IP_PNP_RARP=y +CONFIG_NET_IPIP=m +CONFIG_NET_IPGRE=m +# CONFIG_ARPD is not set +# CONFIG_SYN_COOKIES is not set +CONFIG_INET_AH=m +CONFIG_INET_ESP=m +CONFIG_INET_IPCOMP=m +CONFIG_INET_XFRM_TUNNEL=m +CONFIG_INET_TUNNEL=m +CONFIG_INET_XFRM_MODE_TRANSPORT=m +CONFIG_INET_XFRM_MODE_TUNNEL=m +CONFIG_INET_XFRM_MODE_BEET=m +CONFIG_INET_LRO=m +CONFIG_INET_DIAG=m +CONFIG_INET_TCP_DIAG=m +# CONFIG_TCP_CONG_ADVANCED is not set +CONFIG_TCP_CONG_CUBIC=y +CONFIG_DEFAULT_TCP_CONG="cubic" +# CONFIG_TCP_MD5SIG is not set +CONFIG_IPV6=m +CONFIG_IPV6_PRIVACY=y +CONFIG_IPV6_ROUTER_PREF=y +# CONFIG_IPV6_ROUTE_INFO is not set +# CONFIG_IPV6_OPTIMISTIC_DAD is not set +# CONFIG_INET6_AH is not set +# CONFIG_INET6_ESP is not set +CONFIG_INET6_IPCOMP=m +CONFIG_IPV6_MIP6=m +CONFIG_INET6_XFRM_TUNNEL=m +CONFIG_INET6_TUNNEL=m +CONFIG_INET6_XFRM_MODE_TRANSPORT=m +CONFIG_INET6_XFRM_MODE_TUNNEL=m +CONFIG_INET6_XFRM_MODE_BEET=m +# CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set +CONFIG_IPV6_SIT=m +CONFIG_IPV6_NDISC_NODETYPE=y +# CONFIG_IPV6_TUNNEL is not set +# CONFIG_IPV6_MULTIPLE_TABLES is not set +# CONFIG_IPV6_MROUTE is not set +# CONFIG_NETLABEL is not set +# CONFIG_NETWORK_SECMARK is not set +CONFIG_NETFILTER=y +# CONFIG_NETFILTER_DEBUG is not set +CONFIG_NETFILTER_ADVANCED=y + +# +# Core Netfilter Configuration +# +# CONFIG_NETFILTER_NETLINK_QUEUE is not set +# CONFIG_NETFILTER_NETLINK_LOG is not set +CONFIG_NF_CONNTRACK=m +# CONFIG_NF_CT_ACCT is not set +# CONFIG_NF_CONNTRACK_MARK is not set +# CONFIG_NF_CONNTRACK_EVENTS is not set +# CONFIG_NF_CT_PROTO_DCCP is not set +CONFIG_NF_CT_PROTO_GRE=m +# CONFIG_NF_CT_PROTO_SCTP is not set +# CONFIG_NF_CT_PROTO_UDPLITE is not set +# CONFIG_NF_CONNTRACK_AMANDA is not set +CONFIG_NF_CONNTRACK_FTP=m +CONFIG_NF_CONNTRACK_H323=m +CONFIG_NF_CONNTRACK_IRC=m +CONFIG_NF_CONNTRACK_NETBIOS_NS=m +CONFIG_NF_CONNTRACK_PPTP=m +# CONFIG_NF_CONNTRACK_SANE is not set +CONFIG_NF_CONNTRACK_SIP=m +# CONFIG_NF_CONNTRACK_TFTP is not set +# CONFIG_NF_CT_NETLINK is not set +# CONFIG_NETFILTER_TPROXY is not set +CONFIG_NETFILTER_XTABLES=m +CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m +# CONFIG_NETFILTER_XT_TARGET_CONNMARK is not set +# CONFIG_NETFILTER_XT_TARGET_DSCP is not set +# CONFIG_NETFILTER_XT_TARGET_MARK is not set +# CONFIG_NETFILTER_XT_TARGET_NFLOG is not set +# CONFIG_NETFILTER_XT_TARGET_NFQUEUE is not set +# CONFIG_NETFILTER_XT_TARGET_RATEEST is not set +# CONFIG_NETFILTER_XT_TARGET_TCPMSS is not set +# CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP is not set +# CONFIG_NETFILTER_XT_MATCH_COMMENT is not set +# CONFIG_NETFILTER_XT_MATCH_CONNBYTES is not set +CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m +# CONFIG_NETFILTER_XT_MATCH_CONNMARK is not set +# CONFIG_NETFILTER_XT_MATCH_CONNTRACK is not set +# CONFIG_NETFILTER_XT_MATCH_DCCP is not set +# CONFIG_NETFILTER_XT_MATCH_DSCP is not set +# CONFIG_NETFILTER_XT_MATCH_ESP is not set +# CONFIG_NETFILTER_XT_MATCH_HASHLIMIT is not set +# CONFIG_NETFILTER_XT_MATCH_HELPER is not set +CONFIG_NETFILTER_XT_MATCH_IPRANGE=m +# CONFIG_NETFILTER_XT_MATCH_LENGTH is not set +CONFIG_NETFILTER_XT_MATCH_LIMIT=m +# CONFIG_NETFILTER_XT_MATCH_MAC is not set +# CONFIG_NETFILTER_XT_MATCH_MARK is not set +CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m +# CONFIG_NETFILTER_XT_MATCH_OWNER is not set +# CONFIG_NETFILTER_XT_MATCH_POLICY is not set +# CONFIG_NETFILTER_XT_MATCH_PKTTYPE is not set +# CONFIG_NETFILTER_XT_MATCH_QUOTA is not set +# CONFIG_NETFILTER_XT_MATCH_RATEEST is not set +# CONFIG_NETFILTER_XT_MATCH_REALM is not set +# CONFIG_NETFILTER_XT_MATCH_RECENT is not set +# CONFIG_NETFILTER_XT_MATCH_SCTP is not set +CONFIG_NETFILTER_XT_MATCH_STATE=m +# CONFIG_NETFILTER_XT_MATCH_STATISTIC is not set +# CONFIG_NETFILTER_XT_MATCH_STRING is not set +# CONFIG_NETFILTER_XT_MATCH_TCPMSS is not set +# CONFIG_NETFILTER_XT_MATCH_TIME is not set +CONFIG_NETFILTER_XT_MATCH_U32=m +# CONFIG_IP_VS is not set + +# +# IP: Netfilter Configuration +# +CONFIG_NF_DEFRAG_IPV4=m +CONFIG_NF_CONNTRACK_IPV4=m +CONFIG_NF_CONNTRACK_PROC_COMPAT=y +# CONFIG_IP_NF_QUEUE is not set +CONFIG_IP_NF_IPTABLES=m +# CONFIG_IP_NF_MATCH_ADDRTYPE is not set +# CONFIG_IP_NF_MATCH_AH is not set +# CONFIG_IP_NF_MATCH_ECN is not set +# CONFIG_IP_NF_MATCH_TTL is not set +CONFIG_IP_NF_FILTER=m +CONFIG_IP_NF_TARGET_REJECT=m +CONFIG_IP_NF_TARGET_LOG=m +# CONFIG_IP_NF_TARGET_ULOG is not set +CONFIG_NF_NAT=m +CONFIG_NF_NAT_NEEDED=y +CONFIG_IP_NF_TARGET_MASQUERADE=m +CONFIG_IP_NF_TARGET_NETMAP=m +CONFIG_IP_NF_TARGET_REDIRECT=m +# CONFIG_IP_NF_TARGET_IDLETIMER is not set +# CONFIG_NF_NAT_SNMP_BASIC is not set +CONFIG_NF_NAT_PROTO_GRE=m +CONFIG_NF_NAT_FTP=m +CONFIG_NF_NAT_IRC=m +# CONFIG_NF_NAT_TFTP is not set +# CONFIG_NF_NAT_AMANDA is not set +CONFIG_NF_NAT_PPTP=m +CONFIG_NF_NAT_H323=m +CONFIG_NF_NAT_SIP=m +CONFIG_IP_NF_MANGLE=m +# CONFIG_IP_NF_TARGET_CLUSTERIP is not set +# CONFIG_IP_NF_TARGET_ECN is not set +# CONFIG_IP_NF_TARGET_TTL is not set +# CONFIG_IP_NF_RAW is not set +# CONFIG_IP_NF_SECURITY is not set +# CONFIG_IP_NF_ARPTABLES is not set +CONFIG_IP_NF_HB=m +# CONFIG_IP_NF_HB_DEBUG is not set + +# +# IPv6: Netfilter Configuration +# +CONFIG_NF_CONNTRACK_IPV6=m +# CONFIG_IP6_NF_QUEUE is not set +CONFIG_IP6_NF_IPTABLES=m +# CONFIG_IP6_NF_MATCH_AH is not set +# CONFIG_IP6_NF_MATCH_EUI64 is not set +# CONFIG_IP6_NF_MATCH_FRAG is not set +# CONFIG_IP6_NF_MATCH_OPTS is not set +# CONFIG_IP6_NF_MATCH_HL is not set +# CONFIG_IP6_NF_MATCH_IPV6HEADER is not set +# CONFIG_IP6_NF_MATCH_MH is not set +# CONFIG_IP6_NF_MATCH_RT is not set +CONFIG_IP6_NF_TARGET_LOG=m +CONFIG_IP6_NF_FILTER=m +# CONFIG_IP6_NF_TARGET_REJECT is not set +# CONFIG_IP6_NF_MANGLE is not set +# CONFIG_IP6_NF_RAW is not set +# CONFIG_IP6_NF_SECURITY is not set +# CONFIG_IP_DCCP is not set +# CONFIG_IP_SCTP is not set +# CONFIG_TIPC is not set +# CONFIG_ATM is not set +# CONFIG_BRIDGE is not set +# CONFIG_NET_DSA is not set +# CONFIG_VLAN_8021Q is not set +# CONFIG_DECNET is not set +# CONFIG_LLC2 is not set +# CONFIG_IPX is not set +# CONFIG_ATALK is not set +# CONFIG_X25 is not set +# CONFIG_LAPB is not set +# CONFIG_ECONET is not set +# CONFIG_WAN_ROUTER is not set +CONFIG_PHONET=m +CONFIG_NET_SCHED=y + +# +# Queueing/Scheduling +# +CONFIG_NET_SCH_CBQ=m +CONFIG_NET_SCH_HTB=m +CONFIG_NET_SCH_HFSC=m +CONFIG_NET_SCH_PRIO=m +# CONFIG_NET_SCH_MULTIQ is not set +# CONFIG_NET_SCH_RED is not set +CONFIG_NET_SCH_SFQ=m +# CONFIG_NET_SCH_TEQL is not set +CONFIG_NET_SCH_TBF=m +# CONFIG_NET_SCH_GRED is not set +CONFIG_NET_SCH_DSMARK=m +# CONFIG_NET_SCH_NETEM is not set +# CONFIG_NET_SCH_INGRESS is not set + +# +# Classification +# +CONFIG_NET_CLS=y +CONFIG_NET_CLS_BASIC=m +CONFIG_NET_CLS_TCINDEX=m +# CONFIG_NET_CLS_ROUTE4 is not set +CONFIG_NET_CLS_FW=m +CONFIG_NET_CLS_U32=m +# CONFIG_CLS_U32_PERF is not set +# CONFIG_CLS_U32_MARK is not set +CONFIG_NET_CLS_RSVP=m +# CONFIG_NET_CLS_RSVP6 is not set +CONFIG_NET_CLS_FLOW=m +# CONFIG_NET_EMATCH is not set +CONFIG_NET_CLS_ACT=y +CONFIG_NET_ACT_POLICE=m +CONFIG_NET_ACT_GACT=m +# CONFIG_GACT_PROB is not set +# CONFIG_NET_ACT_MIRRED is not set +CONFIG_NET_ACT_IPT=m +# CONFIG_NET_ACT_NAT is not set +# CONFIG_NET_ACT_PEDIT is not set +# CONFIG_NET_ACT_SIMP is not set +# CONFIG_NET_ACT_SKBEDIT is not set +# CONFIG_NET_CLS_IND is not set +CONFIG_NET_SCH_FIFO=y + +# +# Network testing +# +# CONFIG_NET_PKTGEN is not set +# CONFIG_NET_TCPPROBE is not set +# CONFIG_HAMRADIO is not set +# CONFIG_CAN is not set +# CONFIG_IRDA is not set +CONFIG_BT=m +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_HCIUSB is not set +# CONFIG_BT_HCIBTUSB is not set +# CONFIG_BT_HCIBTSDIO is not set +# CONFIG_BT_HCIUART is not set +# CONFIG_BT_HCIBCM203X is not set +# CONFIG_BT_HCIBPA10X is not set +# CONFIG_BT_HCIBFUSB is not set +# CONFIG_BT_HCIBRF6150 is not set +CONFIG_BT_HCIH4P=m +# CONFIG_BT_HCIVHCI is not set +# CONFIG_AF_RXRPC is not set +CONFIG_WIRELESS=y +CONFIG_CFG80211=y +CONFIG_NL80211=y +CONFIG_WIRELESS_OLD_REGULATORY=y +CONFIG_WIRELESS_EXT=y +CONFIG_WIRELESS_EXT_SYSFS=y +CONFIG_MAC80211=m + +# +# Rate control algorithm selection +# +# CONFIG_MAC80211_RC_PID is not set +CONFIG_MAC80211_RC_MINSTREL=y +# CONFIG_MAC80211_RC_DEFAULT_PID is not set +CONFIG_MAC80211_RC_DEFAULT_MINSTREL=y +CONFIG_MAC80211_RC_DEFAULT="minstrel" +CONFIG_MAC80211_MESH=y +# CONFIG_MAC80211_LEDS is not set +# CONFIG_MAC80211_DEBUGFS is not set +# CONFIG_MAC80211_DEBUG_MENU is not set +# CONFIG_IEEE80211 is not set +# CONFIG_RFKILL is not set +# CONFIG_NET_9P is not set + +# +# Device Drivers +# + +# +# Generic Driver Options +# +CONFIG_UEVENT_HELPER_PATH="" +CONFIG_STANDALONE=y +CONFIG_PREVENT_FIRMWARE_BUILD=y +CONFIG_FW_LOADER=y +CONFIG_FIRMWARE_IN_KERNEL=y +CONFIG_EXTRA_FIRMWARE="" +# CONFIG_DEBUG_DRIVER is not set +# CONFIG_DEBUG_DEVRES is not set +# CONFIG_SYS_HYPERVISOR is not set +CONFIG_CONNECTOR=y +CONFIG_PROC_EVENTS=y +CONFIG_MTD=y +# CONFIG_MTD_DEBUG is not set +# CONFIG_MTD_CONCAT is not set +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_AR7_PARTS is not set + +# +# User Modules And Translation Layers +# +CONFIG_MTD_CHAR=y +# 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 +# CONFIG_RFD_FTL is not set +# CONFIG_SSFDC is not set +CONFIG_MTD_OOPS=y + +# +# RAM/ROM/Flash chip drivers +# +# CONFIG_MTD_CFI is not set +# CONFIG_MTD_JEDECPROBE is not set +CONFIG_MTD_MAP_BANK_WIDTH_1=y +CONFIG_MTD_MAP_BANK_WIDTH_2=y +CONFIG_MTD_MAP_BANK_WIDTH_4=y +# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set +# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set +# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set +CONFIG_MTD_CFI_I1=y +CONFIG_MTD_CFI_I2=y +# CONFIG_MTD_CFI_I4 is not set +# CONFIG_MTD_CFI_I8 is not set +# CONFIG_MTD_RAM is not set +# CONFIG_MTD_ROM is not set +# CONFIG_MTD_ABSENT is not set + +# +# Mapping drivers for chip access +# +# CONFIG_MTD_COMPLEX_MAPPINGS is not set +# CONFIG_MTD_PLATRAM is not set + +# +# Self-contained MTD device drivers +# +# CONFIG_MTD_DATAFLASH is not set +# CONFIG_MTD_M25P80 is not set +# CONFIG_MTD_SLRAM is not set +# CONFIG_MTD_PHRAM is not set +# CONFIG_MTD_MTDRAM is not set +# CONFIG_MTD_BLOCK2MTD is not set + +# +# Disk-On-Chip Device Drivers +# +# CONFIG_MTD_DOC2000 is not set +# CONFIG_MTD_DOC2001 is not set +# CONFIG_MTD_DOC2001PLUS is not set +# CONFIG_MTD_NAND is not set +CONFIG_MTD_ONENAND=y +# CONFIG_MTD_ONENAND_VERIFY_WRITE is not set +# CONFIG_MTD_ONENAND_GENERIC is not set +CONFIG_MTD_ONENAND_OMAP2=y +# CONFIG_MTD_ONENAND_OTP is not set +# CONFIG_MTD_ONENAND_2X_PROGRAM is not set +# CONFIG_MTD_ONENAND_SIM is not set + +# +# UBI - Unsorted block images +# +CONFIG_MTD_UBI=y +CONFIG_MTD_UBI_WL_THRESHOLD=4096 +CONFIG_MTD_UBI_BEB_RESERVE=1 +# CONFIG_MTD_UBI_GLUEBI is not set + +# +# UBI debugging options +# +# CONFIG_MTD_UBI_DEBUG is not set +# CONFIG_PARPORT is not set +CONFIG_BLK_DEV=y +# CONFIG_BLK_DEV_COW_COMMON is not set +CONFIG_BLK_DEV_LOOP=y +# CONFIG_BLK_DEV_CRYPTOLOOP is not set +CONFIG_BLK_DEV_NBD=m +# CONFIG_BLK_DEV_UB is not set +CONFIG_BLK_DEV_RAM=y +CONFIG_BLK_DEV_RAM_COUNT=16 +CONFIG_BLK_DEV_RAM_SIZE=16384 +# CONFIG_BLK_DEV_XIP is not set +# CONFIG_CDROM_PKTCDVD is not set +# CONFIG_ATA_OVER_ETH is not set +CONFIG_MISC_DEVICES=y +# CONFIG_EEPROM_93CX6 is not set +CONFIG_NOKIA_AV_DETECT=m +# CONFIG_ICS932S401 is not set +CONFIG_OMAP_STI=y +CONFIG_OMAP_STI_CONSOLE=y +# CONFIG_ENCLOSURE_SERVICES is not set +# CONFIG_C2PORT is not set +CONFIG_OMAP_SSI=m +CONFIG_SSI_MCSAAB_IMP=m +CONFIG_SSI_CMT_SPEECH=m +# CONFIG_SSI_CMT_SPEECH_DEBUG is not set +CONFIG_SSI_CHAR=m +# CONFIG_SSI_CHAR_DEBUG is not set +CONFIG_HAVE_IDE=y +# CONFIG_IDE is not set + +# +# SCSI device support +# +# CONFIG_RAID_ATTRS is not set +CONFIG_SCSI=m +CONFIG_SCSI_DMA=y +# CONFIG_SCSI_TGT is not set +# CONFIG_SCSI_NETLINK is not set +CONFIG_SCSI_PROC_FS=y + +# +# SCSI support type (disk, tape, CD-ROM) +# +CONFIG_BLK_DEV_SD=m +# CONFIG_CHR_DEV_ST is not set +# CONFIG_CHR_DEV_OSST is not set +# CONFIG_BLK_DEV_SR is not set +# CONFIG_CHR_DEV_SG is not set +# CONFIG_CHR_DEV_SCH is not set + +# +# Some SCSI devices (e.g. CD jukebox) support multiple LUNs +# +CONFIG_SCSI_MULTI_LUN=y +# CONFIG_SCSI_CONSTANTS is not set +# CONFIG_SCSI_LOGGING is not set +CONFIG_SCSI_SCAN_ASYNC=y +CONFIG_SCSI_WAIT_SCAN=m + +# +# SCSI Transports +# +# CONFIG_SCSI_SPI_ATTRS is not set +# CONFIG_SCSI_FC_ATTRS is not set +# CONFIG_SCSI_ISCSI_ATTRS is not set +# CONFIG_SCSI_SAS_LIBSAS is not set +# CONFIG_SCSI_SRP_ATTRS is not set +CONFIG_SCSI_LOWLEVEL=y +# CONFIG_ISCSI_TCP is not set +# CONFIG_SCSI_DEBUG is not set +# CONFIG_SCSI_DH is not set +# CONFIG_ATA is not set +CONFIG_MD=y +# CONFIG_BLK_DEV_MD is not set +CONFIG_BLK_DEV_DM=m +# CONFIG_DM_DEBUG is not set +CONFIG_DM_CRYPT=m +CONFIG_DM_LOOP=m +# CONFIG_DM_SNAPSHOT is not set +# CONFIG_DM_MIRROR is not set +# CONFIG_DM_ZERO is not set +# CONFIG_DM_MULTIPATH is not set +# CONFIG_DM_DELAY is not set +# CONFIG_DM_UEVENT is not set +CONFIG_NETDEVICES=y +# CONFIG_IFB is not set +# CONFIG_DUMMY is not set +# CONFIG_BONDING is not set +# CONFIG_MACVLAN is not set +# CONFIG_EQUALIZER is not set +CONFIG_TUN=m +# CONFIG_VETH is not set +# CONFIG_PHYLIB is not set +CONFIG_NET_ETHERNET=y +CONFIG_MII=m +# CONFIG_AX88796 is not set +CONFIG_SMC91X=m +# CONFIG_DM9000 is not set +# CONFIG_ENC28J60 is not set +# CONFIG_SMC911X is not set +# CONFIG_IBM_NEW_EMAC_ZMII is not set +# CONFIG_IBM_NEW_EMAC_RGMII is not set +# CONFIG_IBM_NEW_EMAC_TAH is not set +# CONFIG_IBM_NEW_EMAC_EMAC4 is not set +# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set +# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set +# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set +# CONFIG_B44 is not set +# CONFIG_NETDEV_1000 is not set +# CONFIG_NETDEV_10000 is not set + +# +# Wireless LAN +# +# CONFIG_WLAN_PRE80211 is not set +CONFIG_WLAN_80211=y +# CONFIG_LIBERTAS is not set +# CONFIG_LIBERTAS_THINFIRM is not set +# CONFIG_USB_ZD1201 is not set +# CONFIG_USB_NET_RNDIS_WLAN is not set +# CONFIG_RTL8187 is not set +# CONFIG_MAC80211_HWSIM is not set +# CONFIG_P54_COMMON is not set +# CONFIG_IWLWIFI_LEDS is not set +# CONFIG_HOSTAP is not set +# CONFIG_B43 is not set +# CONFIG_B43LEGACY is not set +# CONFIG_ZD1211RW is not set +# CONFIG_RT2X00 is not set +CONFIG_WL12XX=y +CONFIG_WL1251=m +# CONFIG_WL1271 is not set + +# +# USB Network Adapters +# +# CONFIG_USB_CATC is not set +# CONFIG_USB_KAWETH is not set +# CONFIG_USB_PEGASUS is not set +# CONFIG_USB_RTL8150 is not set +# CONFIG_USB_USBNET is not set +# CONFIG_WAN is not set +CONFIG_PPP=m +# CONFIG_PPP_MULTILINK is not set +CONFIG_PPP_FILTER=y +# CONFIG_PPP_ASYNC is not set +# CONFIG_PPP_SYNC_TTY is not set +CONFIG_PPP_DEFLATE=m +CONFIG_PPP_BSDCOMP=m +CONFIG_PPP_MPPE=m +CONFIG_PPPOE=m +CONFIG_PPPOL2TP=m +# CONFIG_SLIP is not set +CONFIG_SLHC=m +# CONFIG_NETCONSOLE is not set +# CONFIG_NETPOLL is not set +# CONFIG_NET_POLL_CONTROLLER is not set +# CONFIG_ISDN is not set + +# +# Input device support +# +CONFIG_INPUT=y +# CONFIG_INPUT_FF_MEMLESS is not set +# CONFIG_INPUT_POLLDEV is not set + +# +# Userland interfaces +# +CONFIG_INPUT_MOUSEDEV=m +CONFIG_INPUT_MOUSEDEV_PSAUX=y +CONFIG_INPUT_MOUSEDEV_SCREEN_X=800 +CONFIG_INPUT_MOUSEDEV_SCREEN_Y=480 +CONFIG_INPUT_JOYDEV=m +CONFIG_INPUT_EVDEV=y +# CONFIG_INPUT_EVBUG is not set + +# +# Input Device Drivers +# +CONFIG_INPUT_KEYBOARD=y +# CONFIG_KEYBOARD_ATKBD is not set +# CONFIG_KEYBOARD_SUNKBD is not set +# CONFIG_KEYBOARD_LKKBD is not set +# CONFIG_KEYBOARD_XTKBD is not set +# CONFIG_KEYBOARD_NEWTON is not set +# CONFIG_KEYBOARD_STOWAWAY is not set +CONFIG_KEYBOARD_TWL4030=y +# CONFIG_KEYBOARD_LM8323 is not set +# CONFIG_KEYBOARD_GPIO is not set +# CONFIG_INPUT_MOUSE is not set +# CONFIG_INPUT_JOYSTICK is not set +# CONFIG_INPUT_TABLET is not set +CONFIG_INPUT_TOUCHSCREEN=y +# CONFIG_TOUCHSCREEN_ADS7846 is not set +# CONFIG_TOUCHSCREEN_FUJITSU is not set +# CONFIG_TOUCHSCREEN_GUNZE is not set +# CONFIG_TOUCHSCREEN_ELO is not set +# CONFIG_TOUCHSCREEN_MTOUCH is not set +# CONFIG_TOUCHSCREEN_INEXIO is not set +# CONFIG_TOUCHSCREEN_MK712 is not set +# CONFIG_TOUCHSCREEN_PENMOUNT is not set +# CONFIG_TOUCHSCREEN_TOUCHRIGHT is not set +# CONFIG_TOUCHSCREEN_TOUCHWIN is not set +CONFIG_TOUCHSCREEN_TSC2005=m +# CONFIG_TOUCHSCREEN_TSC210X is not set +# CONFIG_TOUCHSCREEN_USB_COMPOSITE is not set +# CONFIG_TOUCHSCREEN_TOUCHIT213 is not set +CONFIG_INPUT_LIRC=y +CONFIG_LIRC_DEV=m +CONFIG_LIRC_RX51=m +CONFIG_INPUT_MISC=y +# CONFIG_INPUT_ATI_REMOTE is not set +# CONFIG_INPUT_ATI_REMOTE2 is not set +# CONFIG_INPUT_KEYSPAN_REMOTE is not set +# CONFIG_INPUT_POWERMATE is not set +# CONFIG_INPUT_YEALINK is not set +# CONFIG_INPUT_CM109 is not set +CONFIG_INPUT_UINPUT=m + +# +# Hardware I/O ports +# +# CONFIG_SERIO is not set +# CONFIG_GAMEPORT is not set + +# +# Character devices +# +CONFIG_VT=y +CONFIG_CONSOLE_TRANSLATIONS=y +CONFIG_VT_CONSOLE=y +CONFIG_HW_CONSOLE=y +# CONFIG_VT_HW_CONSOLE_BINDING is not set +CONFIG_DEVKMEM=y +# CONFIG_SERIAL_NONSTANDARD is not set + +# +# Serial drivers +# +CONFIG_SERIAL_8250=y +CONFIG_SERIAL_8250_CONSOLE=y +CONFIG_SERIAL_8250_NR_UARTS=4 +CONFIG_SERIAL_8250_RUNTIME_UARTS=4 +# CONFIG_SERIAL_8250_EXTENDED is not set + +# +# Non-8250 serial port support +# +CONFIG_SERIAL_CORE=y +CONFIG_SERIAL_CORE_CONSOLE=y +CONFIG_UNIX98_PTYS=y +# CONFIG_LEGACY_PTYS is not set +# CONFIG_IPMI_HANDLER is not set +CONFIG_HW_RANDOM=y +CONFIG_HW_RANDOM_OMAP3_ROM=y +# CONFIG_NVRAM is not set +# CONFIG_R3964 is not set +# CONFIG_RAW_DRIVER is not set +# CONFIG_TCG_TPM is not set +CONFIG_I2C=y +CONFIG_I2C_BOARDINFO=y +CONFIG_I2C_CHARDEV=y +CONFIG_I2C_HELPER_AUTO=y + +# +# I2C Hardware Bus support +# + +# +# I2C system bus drivers (mostly embedded / system-on-chip) +# +# CONFIG_I2C_GPIO is not set +# CONFIG_I2C_OCORES is not set +CONFIG_I2C_OMAP=y +# CONFIG_I2C_SIMTEC is not set + +# +# External I2C/SMBus adapter drivers +# +# CONFIG_I2C_PARPORT_LIGHT is not set +# CONFIG_I2C_TAOS_EVM is not set +# CONFIG_I2C_TINY_USB is not set + +# +# Other I2C/SMBus bus drivers +# +# CONFIG_I2C_PCA_PLATFORM is not set +# CONFIG_I2C_STUB is not set + +# +# Miscellaneous I2C Chip support +# +# CONFIG_DS1682 is not set +# CONFIG_AT24 is not set +# CONFIG_SENSORS_EEPROM is not set +CONFIG_TPA6130A2=y +# CONFIG_SENSORS_PCF8574 is not set +# CONFIG_PCF8575 is not set +# CONFIG_SENSORS_PCA9539 is not set +# CONFIG_SENSORS_PCF8591 is not set +# CONFIG_TPS65010 is not set +CONFIG_TWL4030_MADC=y +CONFIG_TWL4030_PWRBUTTON=y +CONFIG_TWL4030_POWEROFF=y +# CONFIG_SENSORS_MAX6875 is not set +# CONFIG_SENSORS_TSL2550 is not set +CONFIG_SENSORS_TSL2563=m +# CONFIG_LP5521 is not set +CONFIG_LIS302DL=m +# 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 +CONFIG_SPI=y +# CONFIG_SPI_DEBUG is not set +CONFIG_SPI_MASTER=y + +# +# SPI Master Controller Drivers +# +# CONFIG_SPI_BITBANG is not set +CONFIG_SPI_OMAP24XX=y + +# +# SPI Protocol Masters +# +# CONFIG_SPI_AT25 is not set +# CONFIG_SPI_TSC210X is not set +# CONFIG_SPI_TSC2301 is not set +# CONFIG_SPI_SPIDEV is not set +# CONFIG_SPI_TLE62X0 is not set +CONFIG_ARCH_REQUIRE_GPIOLIB=y +CONFIG_GPIOLIB=y +# CONFIG_DEBUG_GPIO is not set +CONFIG_GPIO_SYSFS=y + +# +# Memory mapped GPIO expanders: +# + +# +# I2C GPIO expanders: +# +# CONFIG_GPIO_MAX732X is not set +# CONFIG_GPIO_PCA953X is not set +# CONFIG_GPIO_PCF857X is not set +CONFIG_GPIO_TWL4030=y + +# +# PCI GPIO expanders: +# + +# +# SPI GPIO expanders: +# +# CONFIG_GPIO_MAX7301 is not set +# CONFIG_GPIO_MCP23S08 is not set +# CONFIG_W1 is not set +# CONFIG_POWER_SUPPLY is not set +CONFIG_HWMON=y +# CONFIG_HWMON_VID is not set +# CONFIG_SENSORS_AD7414 is not set +# CONFIG_SENSORS_AD7418 is not set +# CONFIG_SENSORS_ADCXX is not set +# CONFIG_SENSORS_ADM1021 is not set +# CONFIG_SENSORS_ADM1025 is not set +# CONFIG_SENSORS_ADM1026 is not set +# CONFIG_SENSORS_ADM1029 is not set +# CONFIG_SENSORS_ADM1031 is not set +# CONFIG_SENSORS_ADM9240 is not set +# CONFIG_SENSORS_ADT7462 is not set +# CONFIG_SENSORS_ADT7470 is not set +# CONFIG_SENSORS_ADT7473 is not set +# CONFIG_SENSORS_ATXP1 is not set +# CONFIG_SENSORS_DS1621 is not set +# CONFIG_SENSORS_F71805F is not set +# CONFIG_SENSORS_F71882FG is not set +# CONFIG_SENSORS_F75375S is not set +# CONFIG_SENSORS_GL518SM is not set +# CONFIG_SENSORS_GL520SM is not set +# CONFIG_SENSORS_IT87 is not set +# CONFIG_SENSORS_LM63 is not set +# CONFIG_SENSORS_LM70 is not set +# CONFIG_SENSORS_LM75 is not set +# CONFIG_SENSORS_LM77 is not set +# CONFIG_SENSORS_LM78 is not set +# CONFIG_SENSORS_LM80 is not set +# CONFIG_SENSORS_LM83 is not set +# CONFIG_SENSORS_LM85 is not set +# CONFIG_SENSORS_LM87 is not set +# CONFIG_SENSORS_LM90 is not set +# CONFIG_SENSORS_LM92 is not set +# CONFIG_SENSORS_LM93 is not set +# CONFIG_SENSORS_MAX1111 is not set +# CONFIG_SENSORS_MAX1619 is not set +# CONFIG_SENSORS_MAX6650 is not set +# CONFIG_SENSORS_PC87360 is not set +# CONFIG_SENSORS_PC87427 is not set +# CONFIG_SENSORS_DME1737 is not set +# CONFIG_SENSORS_SMSC47M1 is not set +# CONFIG_SENSORS_SMSC47M192 is not set +# CONFIG_SENSORS_SMSC47B397 is not set +# CONFIG_SENSORS_ADS7828 is not set +# CONFIG_SENSORS_THMC50 is not set +# CONFIG_SENSORS_VT1211 is not set +# CONFIG_SENSORS_W83781D is not set +# CONFIG_SENSORS_W83791D is not set +# CONFIG_SENSORS_W83792D is not set +# CONFIG_SENSORS_W83793 is not set +# CONFIG_SENSORS_W83L785TS is not set +# CONFIG_SENSORS_W83L786NG is not set +# CONFIG_SENSORS_W83627HF is not set +# CONFIG_SENSORS_W83627EHF is not set +# CONFIG_SENSORS_TSC210X is not set +CONFIG_SENSORS_OMAP34XX=y +# CONFIG_HWMON_DEBUG_CHIP is not set +# CONFIG_THERMAL is not set +# CONFIG_THERMAL_HWMON is not set +CONFIG_WATCHDOG=y +# CONFIG_WATCHDOG_NOWAYOUT is not set + +# +# Watchdog Device Drivers +# +# CONFIG_SOFT_WATCHDOG is not set +CONFIG_OMAP_WATCHDOG=m +CONFIG_TWL4030_WATCHDOG=m + +# +# USB-based Watchdog Cards +# +# CONFIG_USBPCWATCHDOG is not set +CONFIG_SSB_POSSIBLE=y + +# +# Sonics Silicon Backplane +# +# CONFIG_SSB is not set + +# +# Multifunction device drivers +# +# CONFIG_MFD_CORE is not set +# CONFIG_MFD_SM501 is not set +# CONFIG_MFD_ASIC3 is not set +# CONFIG_HTC_EGPIO is not set +# CONFIG_HTC_PASIC3 is not set +CONFIG_TWL4030_CORE=y +CONFIG_TWL4030_POWER=y +# CONFIG_MFD_TMIO is not set +# CONFIG_MFD_T7L66XB is not set +# CONFIG_MFD_TC6387XB is not set +# CONFIG_MFD_TC6393XB is not set +# CONFIG_PMIC_DA903X is not set +# CONFIG_MFD_WM8400 is not set +# CONFIG_MFD_WM8350_I2C is not set + +# +# Multimedia devices +# + +# +# Multimedia core support +# +CONFIG_VIDEO_DEV=m +CONFIG_VIDEO_V4L2_COMMON=m +CONFIG_VIDEO_ALLOW_V4L1=y +CONFIG_VIDEO_V4L1_COMPAT=y +# CONFIG_DVB_CORE is not set +CONFIG_VIDEO_MEDIA=m + +# +# Multimedia drivers +# +# CONFIG_MEDIA_ATTACH is not set +CONFIG_MEDIA_TUNER=m +CONFIG_MEDIA_TUNER_CUSTOMIZE=y +# CONFIG_MEDIA_TUNER_SIMPLE is not set +# CONFIG_MEDIA_TUNER_TDA8290 is not set +# CONFIG_MEDIA_TUNER_TDA827X is not set +# CONFIG_MEDIA_TUNER_TDA18271 is not set +# CONFIG_MEDIA_TUNER_TDA9887 is not set +# CONFIG_MEDIA_TUNER_TEA5761 is not set +# CONFIG_MEDIA_TUNER_TEA5767 is not set +# CONFIG_MEDIA_TUNER_MT20XX is not set +# CONFIG_MEDIA_TUNER_MT2060 is not set +# CONFIG_MEDIA_TUNER_MT2266 is not set +# CONFIG_MEDIA_TUNER_MT2131 is not set +# CONFIG_MEDIA_TUNER_QT1010 is not set +# CONFIG_MEDIA_TUNER_XC2028 is not set +# CONFIG_MEDIA_TUNER_XC5000 is not set +# CONFIG_MEDIA_TUNER_MXL5005S is not set +# CONFIG_MEDIA_TUNER_MXL5007T is not set +CONFIG_VIDEO_V4L2=m +CONFIG_VIDEO_V4L1=m +CONFIG_VIDEOBUF_GEN=m +CONFIG_VIDEOBUF_DMA_SG=m +CONFIG_VIDEO_CAPTURE_DRIVERS=y +# CONFIG_VIDEO_ADV_DEBUG is not set +# CONFIG_VIDEO_FIXED_MINOR_RANGES is not set +# CONFIG_VIDEO_HELPER_CHIPS_AUTO is not set + +# +# Encoders/decoders and other helper chips +# + +# +# Audio decoders +# +# CONFIG_VIDEO_TVAUDIO is not set +# CONFIG_VIDEO_TDA7432 is not set +# CONFIG_VIDEO_TDA9840 is not set +# CONFIG_VIDEO_TDA9875 is not set +# CONFIG_VIDEO_TEA6415C is not set +# CONFIG_VIDEO_TEA6420 is not set +# CONFIG_VIDEO_MSP3400 is not set +# CONFIG_VIDEO_CS5345 is not set +# CONFIG_VIDEO_CS53L32A is not set +# CONFIG_VIDEO_M52790 is not set +# CONFIG_VIDEO_TLV320AIC23B is not set +# CONFIG_VIDEO_WM8775 is not set +# CONFIG_VIDEO_WM8739 is not set +# CONFIG_VIDEO_VP27SMPX is not set + +# +# Video decoders +# +# CONFIG_VIDEO_BT819 is not set +# CONFIG_VIDEO_BT856 is not set +# CONFIG_VIDEO_BT866 is not set +# CONFIG_VIDEO_KS0127 is not set +# CONFIG_VIDEO_OV7670 is not set +# CONFIG_VIDEO_TCM825X is not set +CONFIG_VIDEO_ET8EK8=m +CONFIG_VIDEO_AD5820=m +CONFIG_VIDEO_ADP1653=m +# CONFIG_VIDEO_SAA7110 is not set +# CONFIG_VIDEO_SAA7111 is not set +# CONFIG_VIDEO_SAA7114 is not set +# CONFIG_VIDEO_SAA711X is not set +# CONFIG_VIDEO_SAA717X is not set +# CONFIG_VIDEO_SAA7191 is not set +# CONFIG_VIDEO_TVP5150 is not set +# CONFIG_VIDEO_VPX3220 is not set +CONFIG_VIDEO_SMIA_SENSOR=m + +# +# Video and audio decoders +# +# CONFIG_VIDEO_CX25840 is not set + +# +# MPEG video encoders +# +# CONFIG_VIDEO_CX2341X is not set + +# +# Video encoders +# +# CONFIG_VIDEO_SAA7127 is not set +# CONFIG_VIDEO_SAA7185 is not set +# CONFIG_VIDEO_ADV7170 is not set +# CONFIG_VIDEO_ADV7175 is not set + +# +# Video improvement chips +# +# CONFIG_VIDEO_UPD64031A is not set +# CONFIG_VIDEO_UPD64083 is not set +# CONFIG_VIDEO_VIVI is not set +# CONFIG_VIDEO_CPIA is not set +# CONFIG_VIDEO_CPIA2 is not set +# CONFIG_VIDEO_SAA5246A is not set +# CONFIG_VIDEO_SAA5249 is not set +CONFIG_VIDEO_OMAP3=m +CONFIG_VIDEO_SMIAREGS=m +# CONFIG_SOC_CAMERA is not set +CONFIG_V4L_USB_DRIVERS=y +CONFIG_USB_VIDEO_CLASS=m +CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y +CONFIG_USB_GSPCA=m +# CONFIG_USB_M5602 is not set +# CONFIG_USB_GSPCA_CONEX is not set +# CONFIG_USB_GSPCA_ETOMS is not set +# CONFIG_USB_GSPCA_FINEPIX is not set +# CONFIG_USB_GSPCA_MARS is not set +# CONFIG_USB_GSPCA_OV519 is not set +# CONFIG_USB_GSPCA_PAC207 is not set +# CONFIG_USB_GSPCA_PAC7311 is not set +# CONFIG_USB_GSPCA_SONIXB is not set +# CONFIG_USB_GSPCA_SONIXJ is not set +# CONFIG_USB_GSPCA_SPCA500 is not set +# CONFIG_USB_GSPCA_SPCA501 is not set +# CONFIG_USB_GSPCA_SPCA505 is not set +# CONFIG_USB_GSPCA_SPCA506 is not set +# CONFIG_USB_GSPCA_SPCA508 is not set +# CONFIG_USB_GSPCA_SPCA561 is not set +# CONFIG_USB_GSPCA_STK014 is not set +# CONFIG_USB_GSPCA_SUNPLUS is not set +# CONFIG_USB_GSPCA_T613 is not set +# CONFIG_USB_GSPCA_TV8532 is not set +# CONFIG_USB_GSPCA_VC032X is not set +# CONFIG_USB_GSPCA_ZC3XX is not set +# CONFIG_VIDEO_PVRUSB2 is not set +# CONFIG_VIDEO_EM28XX is not set +# CONFIG_VIDEO_USBVISION is not set +# CONFIG_USB_VICAM is not set +# CONFIG_USB_IBMCAM is not set +# CONFIG_USB_KONICAWC is not set +# CONFIG_USB_QUICKCAM_MESSENGER is not set +# CONFIG_USB_ET61X251 is not set +# CONFIG_VIDEO_OVCAMCHIP is not set +# CONFIG_USB_OV511 is not set +# CONFIG_USB_SE401 is not set +# CONFIG_USB_SN9C102 is not set +# CONFIG_USB_STV680 is not set +# CONFIG_USB_ZC0301 is not set +# CONFIG_USB_PWC is not set +# CONFIG_USB_ZR364XX is not set +# CONFIG_USB_STKWEBCAM is not set +# CONFIG_USB_S2255 is not set +CONFIG_RADIO_ADAPTERS=y +CONFIG_I2C_SI4713=m +# CONFIG_USB_DSBR is not set +# CONFIG_USB_SI470X is not set +CONFIG_I2C_BCM2048=m +# CONFIG_USB_MR800 is not set +# CONFIG_DAB is not set + +# +# Graphics support +# +CONFIG_PVR=m +CONFIG_PVR_RELEASE=y +# CONFIG_PVR_DEBUG is not set +# CONFIG_PVR_TIMING is not set +# CONFIG_PVR_EXAMPLES is not set +# CONFIG_VGASTATE is not set +# CONFIG_VIDEO_OUTPUT_CONTROL is not set +CONFIG_FB=y +# CONFIG_FIRMWARE_EDID is not set +# CONFIG_FB_DDC is not set +# CONFIG_FB_BOOT_VESA_SUPPORT is not set +CONFIG_FB_CFB_FILLRECT=y +CONFIG_FB_CFB_COPYAREA=y +CONFIG_FB_CFB_IMAGEBLIT=y +# CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set +# CONFIG_FB_SYS_FILLRECT is not set +# CONFIG_FB_SYS_COPYAREA is not set +# CONFIG_FB_SYS_IMAGEBLIT is not set +# CONFIG_FB_FOREIGN_ENDIAN is not set +# CONFIG_FB_SYS_FOPS is not set +# CONFIG_FB_SVGALIB is not set +# CONFIG_FB_MACMODES is not set +# CONFIG_FB_BACKLIGHT is not set +# CONFIG_FB_MODE_HELPERS is not set +# CONFIG_FB_TILEBLITTING is not set + +# +# Frame buffer hardware drivers +# +# CONFIG_FB_UVESA is not set +# CONFIG_FB_S1D13XXX is not set +# CONFIG_FB_VIRTUAL is not set +# CONFIG_FB_METRONOME is not set +# CONFIG_FB_MB862XX is not set +CONFIG_FB_OMAP_BOOTLOADER_INIT=y +CONFIG_FB_OMAP_CONSISTENT_DMA_SIZE=14 +CONFIG_OMAP2_DSS=y +CONFIG_OMAP2_DSS_VRAM_SIZE=0 +# CONFIG_OMAP2_DSS_DEBUG_SUPPORT is not set +# CONFIG_OMAP2_DSS_RFBI is not set +CONFIG_OMAP2_DSS_VENC=y +CONFIG_OMAP2_DSS_SDI=y +# CONFIG_OMAP2_DSS_DSI is not set +# CONFIG_OMAP2_DSS_FAKE_VSYNC is not set +CONFIG_OMAP2_DSS_MIN_FCK_PER_PCK=0 + +# +# OMAP2/3 Display Device Drivers +# +# CONFIG_PANEL_NEVADA is not set +CONFIG_PANEL_ACX565AKM=y +# CONFIG_PANEL_GENERIC is not set +# CONFIG_PANEL_SAMSUNG_LTE430WQ_F0C is not set +# CONFIG_PANEL_SHARP_LS037V7DW01 is not set +CONFIG_FB_OMAP2=y +# CONFIG_FB_OMAP2_DEBUG_SUPPORT is not set +# CONFIG_FB_OMAP2_FORCE_AUTO_UPDATE is not set +CONFIG_FB_OMAP2_NUM_FBS=3 +# CONFIG_BACKLIGHT_LCD_SUPPORT is not set +CONFIG_BACKLIGHT_CLASS_DEVICE=y +# CONFIG_BACKLIGHT_CORGI is not set + +# +# Display device support +# +CONFIG_DISPLAY_SUPPORT=y + +# +# Display hardware drivers +# + +# +# Console display driver support +# +# CONFIG_VGA_CONSOLE is not set +CONFIG_DUMMY_CONSOLE=y +# CONFIG_FRAMEBUFFER_CONSOLE is not set +# CONFIG_LOGO is not set +CONFIG_SOUND=y +# CONFIG_SOUND_OSS_CORE is not set +CONFIG_SND=y +CONFIG_SND_TIMER=y +CONFIG_SND_PCM=y +CONFIG_SND_JACK=y +# CONFIG_SND_SEQUENCER is not set +# CONFIG_SND_MIXER_OSS is not set +# CONFIG_SND_PCM_OSS is not set +# CONFIG_SND_DYNAMIC_MINORS is not set +CONFIG_SND_SUPPORT_OLD_API=y +CONFIG_SND_VERBOSE_PROCFS=y +# CONFIG_SND_VERBOSE_PRINTK is not set +# CONFIG_SND_DEBUG is not set +CONFIG_SND_DRIVERS=y +# CONFIG_SND_DUMMY is not set +# CONFIG_SND_MTPAV is not set +# CONFIG_SND_SERIAL_U16550 is not set +# CONFIG_SND_MPU401 is not set +CONFIG_SND_ARM=y +CONFIG_SND_SPI=y +# CONFIG_SND_USB is not set +CONFIG_SND_SOC=y +CONFIG_SND_OMAP_SOC=y +CONFIG_SND_OMAP_SOC_MCBSP=y +CONFIG_SND_OMAP_SOC_RX51=y +# CONFIG_SND_SOC_ALL_CODECS is not set +CONFIG_SND_SOC_TLV320AIC3X=y +# CONFIG_SOUND_PRIME is not set +CONFIG_HID_SUPPORT=y +CONFIG_HID=m +# CONFIG_HID_DEBUG is not set +# CONFIG_HIDRAW is not set + +# +# USB Input Devices +# +CONFIG_USB_HID=m +# CONFIG_HID_PID is not set +# CONFIG_USB_HIDDEV is not set + +# +# USB HID Boot Protocol drivers +# +# CONFIG_USB_KBD is not set +# CONFIG_USB_MOUSE is not set + +# +# Special HID drivers +# +# CONFIG_HID_COMPAT is not set +# CONFIG_HID_A4TECH is not set +# CONFIG_HID_APPLE is not set +# CONFIG_HID_BELKIN is not set +# CONFIG_HID_BRIGHT is not set +# CONFIG_HID_CHERRY is not set +# CONFIG_HID_CHICONY is not set +# CONFIG_HID_CYPRESS is not set +# CONFIG_HID_DELL is not set +# CONFIG_HID_EZKEY is not set +# CONFIG_HID_GYRATION is not set +# CONFIG_HID_LOGITECH is not set +# CONFIG_HID_MICROSOFT is not set +# CONFIG_HID_MONTEREY is not set +# CONFIG_HID_PANTHERLORD is not set +# CONFIG_HID_PETALYNX is not set +# CONFIG_HID_SAMSUNG is not set +# CONFIG_HID_SONY is not set +# CONFIG_HID_SUNPLUS is not set +# CONFIG_THRUSTMASTER_FF is not set +# CONFIG_ZEROPLUS_FF is not set +CONFIG_USB_SUPPORT=y +CONFIG_USB_ARCH_HAS_HCD=y +CONFIG_USB_ARCH_HAS_OHCI=y +CONFIG_USB_ARCH_HAS_EHCI=y +CONFIG_USB=y +# CONFIG_USB_DEBUG is not set +# CONFIG_USB_ANNOUNCE_NEW_DEVICES is not set + +# +# Miscellaneous USB options +# +CONFIG_USB_DEVICEFS=y +# CONFIG_USB_DEVICE_CLASS is not set +CONFIG_USB_DYNAMIC_MINORS=y +CONFIG_USB_SUSPEND=y +CONFIG_USB_OTG=y +CONFIG_USB_OTG_WHITELIST=y +# CONFIG_USB_OTG_BLACKLIST_HUB is not set +CONFIG_USB_MON=y +# CONFIG_USB_WUSB is not set +# CONFIG_USB_WUSB_CBAF is not set + +# +# USB Host Controller Drivers +# +# CONFIG_USB_C67X00_HCD is not set +CONFIG_USB_EHCI_HCD=m +CONFIG_OMAP_EHCI_PHY_MODE=y +# CONFIG_OMAP_EHCI_TLL_MODE is not set +# CONFIG_USB_EHCI_ROOT_HUB_TT is not set +# CONFIG_USB_EHCI_TT_NEWSCHED is not set +# CONFIG_USB_ISP116X_HCD is not set +CONFIG_USB_OHCI_HCD=m +# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set +# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set +CONFIG_USB_OHCI_LITTLE_ENDIAN=y +# CONFIG_USB_SL811_HCD is not set +# CONFIG_USB_R8A66597_HCD is not set +# CONFIG_USB_HWA_HCD is not set +CONFIG_USB_MUSB_HDRC=y +CONFIG_USB_MUSB_SOC=y + +# +# OMAP 343x high speed USB support +# +# CONFIG_USB_MUSB_HOST is not set +# CONFIG_USB_MUSB_PERIPHERAL is not set +CONFIG_USB_MUSB_OTG=y +CONFIG_USB_GADGET_MUSB_HDRC=y +CONFIG_USB_MUSB_HDRC_HCD=y +# CONFIG_MUSB_PIO_ONLY is not set +CONFIG_USB_INVENTRA_DMA=y +# CONFIG_USB_TI_CPPI_DMA is not set +CONFIG_USB_MUSB_DEBUG=y +CONFIG_MUSB_PROC_FS=y + +# +# USB Device Class drivers +# +CONFIG_USB_ACM=m +CONFIG_USB_PRINTER=m +CONFIG_USB_WDM=m +CONFIG_USB_TMC=m + +# +# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may also be needed; +# + +# +# see USB_STORAGE Help for more information +# +CONFIG_USB_STORAGE=m +# CONFIG_USB_STORAGE_DEBUG is not set +# CONFIG_USB_STORAGE_DATAFAB is not set +# CONFIG_USB_STORAGE_FREECOM is not set +# CONFIG_USB_STORAGE_ISD200 is not set +# CONFIG_USB_STORAGE_DPCM is not set +# CONFIG_USB_STORAGE_USBAT is not set +# CONFIG_USB_STORAGE_SDDR09 is not set +# 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=y + +# +# USB Imaging devices +# +# CONFIG_USB_MDC800 is not set +# CONFIG_USB_MICROTEK is not set + +# +# USB port drivers +# +CONFIG_USB_SERIAL=m +# CONFIG_USB_EZUSB is not set +CONFIG_USB_SERIAL_GENERIC=y +# CONFIG_USB_SERIAL_AIRCABLE is not set +# CONFIG_USB_SERIAL_ARK3116 is not set +# CONFIG_USB_SERIAL_BELKIN is not set +# CONFIG_USB_SERIAL_CH341 is not set +# CONFIG_USB_SERIAL_WHITEHEAT is not set +# CONFIG_USB_SERIAL_DIGI_ACCELEPORT is not set +# CONFIG_USB_SERIAL_CP2101 is not set +# CONFIG_USB_SERIAL_CYPRESS_M8 is not set +# CONFIG_USB_SERIAL_EMPEG is not set +CONFIG_USB_SERIAL_FTDI_SIO=m +# CONFIG_USB_SERIAL_FUNSOFT is not set +# CONFIG_USB_SERIAL_VISOR is not set +# CONFIG_USB_SERIAL_IPAQ is not set +# CONFIG_USB_SERIAL_IR is not set +# CONFIG_USB_SERIAL_EDGEPORT is not set +# CONFIG_USB_SERIAL_EDGEPORT_TI is not set +# CONFIG_USB_SERIAL_GARMIN is not set +# CONFIG_USB_SERIAL_IPW is not set +# CONFIG_USB_SERIAL_IUU is not set +# CONFIG_USB_SERIAL_KEYSPAN_PDA is not set +# CONFIG_USB_SERIAL_KEYSPAN is not set +# CONFIG_USB_SERIAL_KLSI is not set +# CONFIG_USB_SERIAL_KOBIL_SCT is not set +# CONFIG_USB_SERIAL_MCT_U232 is not set +# CONFIG_USB_SERIAL_MOS7720 is not set +# CONFIG_USB_SERIAL_MOS7840 is not set +# CONFIG_USB_SERIAL_MOTOROLA is not set +# CONFIG_USB_SERIAL_NAVMAN is not set +# CONFIG_USB_SERIAL_PL2303 is not set +# CONFIG_USB_SERIAL_OTI6858 is not set +# CONFIG_USB_SERIAL_SPCP8X5 is not set +# CONFIG_USB_SERIAL_HP4X is not set +# CONFIG_USB_SERIAL_SAFE is not set +# CONFIG_USB_SERIAL_SIERRAWIRELESS is not set +# CONFIG_USB_SERIAL_TI is not set +# CONFIG_USB_SERIAL_CYBERJACK is not set +# CONFIG_USB_SERIAL_XIRCOM is not set +# CONFIG_USB_SERIAL_OPTION is not set +# CONFIG_USB_SERIAL_OMNINET is not set +# CONFIG_USB_SERIAL_DEBUG is not set + +# +# USB Miscellaneous drivers +# +# CONFIG_USB_EMI62 is not set +# CONFIG_USB_EMI26 is not set +# CONFIG_USB_ADUTUX is not set +# CONFIG_USB_SEVSEG is not set +# CONFIG_USB_RIO500 is not set +# CONFIG_USB_LEGOTOWER is not set +# CONFIG_USB_LCD is not set +# CONFIG_USB_BERRY_CHARGE is not set +# CONFIG_USB_LED is not set +# CONFIG_USB_CYPRESS_CY7C63 is not set +# CONFIG_USB_CYTHERM is not set +# CONFIG_USB_PHIDGET is not set +# CONFIG_USB_IDMOUSE is not set +# CONFIG_USB_FTDI_ELAN is not set +# CONFIG_USB_APPLEDISPLAY is not set +# CONFIG_USB_SISUSBVGA is not set +# CONFIG_USB_LD is not set +# CONFIG_USB_TRANCEVIBRATOR is not set +# CONFIG_USB_IOWARRIOR is not set +CONFIG_USB_TEST=m +# CONFIG_USB_ISIGHTFW is not set +# CONFIG_USB_VST is not set +CONFIG_USB_GADGET=m +# CONFIG_USB_GADGET_DEBUG is not set +# CONFIG_USB_GADGET_DEBUG_FILES is not set +# CONFIG_USB_GADGET_DEBUG_FS is not set +CONFIG_USB_GADGET_VBUS_DRAW=2 +CONFIG_USB_GADGET_SELECTED=y +# CONFIG_USB_GADGET_AT91 is not set +# CONFIG_USB_GADGET_ATMEL_USBA is not set +# CONFIG_USB_GADGET_FSL_USB2 is not set +# CONFIG_USB_GADGET_LH7A40X is not set +# CONFIG_USB_GADGET_OMAP is not set +# CONFIG_USB_GADGET_PXA25X is not set +# CONFIG_USB_GADGET_PXA27X is not set +# CONFIG_USB_GADGET_S3C2410 is not set +# CONFIG_USB_GADGET_M66592 is not set +# CONFIG_USB_GADGET_AMD5536UDC is not set +# CONFIG_USB_GADGET_FSL_QE is not set +# CONFIG_USB_GADGET_NET2280 is not set +# CONFIG_USB_GADGET_GOKU is not set +# CONFIG_USB_GADGET_DUMMY_HCD is not set +CONFIG_USB_GADGET_DUALSPEED=y +CONFIG_USB_ZERO=m +# CONFIG_USB_ZERO_HNPTEST is not set +# CONFIG_USB_ETH is not set +# CONFIG_USB_GADGETFS is not set +CONFIG_USB_FILE_STORAGE=m +CONFIG_USB_FILE_STORAGE_TEST=y +# CONFIG_USB_G_SERIAL is not set +# CONFIG_USB_MIDI_GADGET is not set +# CONFIG_USB_G_PRINTER is not set +# CONFIG_USB_CDC_COMPOSITE is not set +CONFIG_USB_G_NOKIA=m +CONFIG_USB_G_SOFTUPD=m + +# +# OTG and related infrastructure +# +CONFIG_USB_OTG_UTILS=y +# CONFIG_USB_GPIO_VBUS is not set +# CONFIG_ISP1301_OMAP is not set +CONFIG_TWL4030_USB=y +CONFIG_USB_IP_COMMON=m +CONFIG_USB_IP_VHCI_HCD=m +# CONFIG_USB_IP_HOST is not set +CONFIG_MMC=m +# CONFIG_MMC_DEBUG is not set +CONFIG_MMC_UNSAFE_RESUME=y + +# +# MMC/SD/SDIO Card Drivers +# +CONFIG_MMC_BLOCK=m +# CONFIG_MMC_BLOCK_BOUNCE is not set +# CONFIG_SDIO_UART is not set +# CONFIG_MMC_TEST is not set + +# +# MMC/SD/SDIO Host Controller Drivers +# +# CONFIG_MMC_SDHCI is not set +CONFIG_MMC_OMAP_HS=m +# CONFIG_MMC_SPI is not set +# CONFIG_MEMSTICK is not set +# CONFIG_ACCESSIBILITY is not set +CONFIG_NEW_LEDS=y +CONFIG_LEDS_CLASS=m + +# +# LED drivers +# +# CONFIG_LEDS_OMAP is not set +# CONFIG_LEDS_OMAP_PWM is not set +# CONFIG_LEDS_PCA9532 is not set +# CONFIG_LEDS_GPIO is not set +# CONFIG_LEDS_PCA955X is not set +CONFIG_LEDS_TWL4030_VIBRA=m +CONFIG_LEDS_LP5523=m + +# +# LED Triggers +# +CONFIG_LEDS_TRIGGERS=y +CONFIG_LEDS_TRIGGER_TIMER=y +CONFIG_LEDS_TRIGGER_HEARTBEAT=y +# CONFIG_LEDS_TRIGGER_BACKLIGHT is not set +# CONFIG_LEDS_TRIGGER_DEFAULT_ON is not set +CONFIG_RTC_LIB=y +CONFIG_RTC_CLASS=m + +# +# RTC interfaces +# +CONFIG_RTC_INTF_SYSFS=y +CONFIG_RTC_INTF_PROC=y +CONFIG_RTC_INTF_DEV=y +# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set +# CONFIG_RTC_DRV_TEST is not set + +# +# I2C RTC drivers +# +# CONFIG_RTC_DRV_DS1307 is not set +# CONFIG_RTC_DRV_DS1374 is not set +# CONFIG_RTC_DRV_DS1672 is not set +# CONFIG_RTC_DRV_MAX6900 is not set +# CONFIG_RTC_DRV_RS5C372 is not set +# CONFIG_RTC_DRV_ISL1208 is not set +# CONFIG_RTC_DRV_X1205 is not set +# CONFIG_RTC_DRV_PCF8563 is not set +# CONFIG_RTC_DRV_PCF8583 is not set +# CONFIG_RTC_DRV_M41T80 is not set +CONFIG_RTC_DRV_TWL4030=m +# CONFIG_RTC_DRV_S35390A is not set +# CONFIG_RTC_DRV_FM3130 is not set +# CONFIG_RTC_DRV_RX8581 is not set + +# +# SPI RTC drivers +# +# CONFIG_RTC_DRV_M41T94 is not set +# CONFIG_RTC_DRV_DS1305 is not set +# CONFIG_RTC_DRV_DS1390 is not set +# CONFIG_RTC_DRV_MAX6902 is not set +# CONFIG_RTC_DRV_R9701 is not set +# CONFIG_RTC_DRV_RS5C348 is not set +# CONFIG_RTC_DRV_DS3234 is not set + +# +# Platform RTC drivers +# +# CONFIG_RTC_DRV_CMOS is not set +# CONFIG_RTC_DRV_DS1286 is not set +# CONFIG_RTC_DRV_DS1511 is not set +# CONFIG_RTC_DRV_DS1553 is not set +# CONFIG_RTC_DRV_DS1742 is not set +# CONFIG_RTC_DRV_STK17TA8 is not set +# CONFIG_RTC_DRV_M48T86 is not set +# CONFIG_RTC_DRV_M48T35 is not set +# CONFIG_RTC_DRV_M48T59 is not set +# CONFIG_RTC_DRV_BQ4802 is not set +# CONFIG_RTC_DRV_V3020 is not set + +# +# on-CPU RTC drivers +# +# CONFIG_DMADEVICES is not set +CONFIG_REGULATOR=y +# CONFIG_REGULATOR_DEBUG is not set +# CONFIG_REGULATOR_FIXED_VOLTAGE is not set +# CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set +# CONFIG_REGULATOR_BQ24022 is not set +CONFIG_REGULATOR_TWL4030=y +# CONFIG_UIO is not set + +# +# CBUS support +# +# CONFIG_CBUS is not set +CONFIG_MPU_BRIDGE=m +CONFIG_BRIDGE_DVFS=y +CONFIG_BRIDGE_MEMPOOL_SIZE=0x412800 +# CONFIG_BRIDGE_DEBUG is not set + +# +# File systems +# +CONFIG_EXT2_FS=m +# CONFIG_EXT2_FS_XATTR is not set +# CONFIG_EXT2_FS_XIP is not set +CONFIG_EXT3_FS=y +# CONFIG_EXT3_FS_XATTR is not set +CONFIG_EXT4_FS=m +# CONFIG_EXT4DEV_COMPAT is not set +CONFIG_EXT4_FS_XATTR=y +# CONFIG_EXT4_FS_POSIX_ACL is not set +# CONFIG_EXT4_FS_SECURITY is not set +CONFIG_JBD=y +# CONFIG_JBD_DEBUG is not set +CONFIG_JBD2=m +# CONFIG_JBD2_DEBUG is not set +CONFIG_FS_MBCACHE=m +CONFIG_REISERFS_FS=m +# CONFIG_REISERFS_CHECK is not set +# CONFIG_REISERFS_PROC_INFO is not set +# CONFIG_REISERFS_FS_XATTR is not set +# CONFIG_JFS_FS is not set +# CONFIG_FS_POSIX_ACL is not set +CONFIG_FILE_LOCKING=y +CONFIG_XFS_FS=m +# CONFIG_XFS_QUOTA is not set +# CONFIG_XFS_POSIX_ACL is not set +# CONFIG_XFS_RT is not set +# CONFIG_XFS_DEBUG is not set +CONFIG_NILFS2_FS=m +# CONFIG_OCFS2_FS is not set +CONFIG_DNOTIFY=y +CONFIG_INOTIFY=y +CONFIG_INOTIFY_USER=y +CONFIG_QUOTA=y +# CONFIG_QUOTA_NETLINK_INTERFACE is not set +CONFIG_PRINT_QUOTA_WARNING=y +# CONFIG_QFMT_V1 is not set +CONFIG_QFMT_V2=y +CONFIG_QUOTACTL=y +# CONFIG_AUTOFS_FS is not set +CONFIG_AUTOFS4_FS=m +CONFIG_FUSE_FS=m + +# +# CD-ROM/DVD Filesystems +# +CONFIG_ISO9660_FS=m +CONFIG_JOLIET=y +# CONFIG_ZISOFS is not set +CONFIG_UDF_FS=m +CONFIG_UDF_NLS=y + +# +# DOS/FAT/NT Filesystems +# +CONFIG_FAT_FS=m +CONFIG_MSDOS_FS=m +CONFIG_VFAT_FS=m +CONFIG_FAT_DEFAULT_CODEPAGE=437 +CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" +CONFIG_NTFS_FS=m +# CONFIG_NTFS_DEBUG is not set +# CONFIG_NTFS_RW is not set + +# +# Pseudo filesystems +# +CONFIG_PROC_FS=y +CONFIG_PROC_SYSCTL=y +CONFIG_PROC_PAGE_MONITOR=y +CONFIG_SYSFS=y +CONFIG_TMPFS=y +# CONFIG_TMPFS_POSIX_ACL is not set +# CONFIG_HUGETLB_PAGE is not set +# CONFIG_CONFIGFS_FS is not set + +# +# Layered filesystems +# +CONFIG_UNION_FS=m +# CONFIG_UNION_FS_XATTR is not set +# CONFIG_UNION_FS_DEBUG is not set + +# +# Miscellaneous filesystems +# +# CONFIG_ADFS_FS is not set +# CONFIG_AFFS_FS is not set +# CONFIG_HFS_FS is not set +CONFIG_HFSPLUS_FS=m +# 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_UBIFS_FS=y +# CONFIG_UBIFS_FS_XATTR is not set +# CONFIG_UBIFS_FS_ADVANCED_COMPR is not set +CONFIG_UBIFS_FS_LZO=y +CONFIG_UBIFS_FS_ZLIB=y +# CONFIG_UBIFS_FS_DEBUG is not set +CONFIG_CRAMFS=y +# CONFIG_VXFS_FS is not set +# CONFIG_MINIX_FS is not set +# CONFIG_OMFS_FS is not set +# CONFIG_HPFS_FS is not set +# CONFIG_QNX4FS_FS is not set +# CONFIG_ROMFS_FS is not set +# CONFIG_SYSV_FS is not set +# CONFIG_UFS_FS is not set +CONFIG_NETWORK_FILESYSTEMS=y +CONFIG_NFS_FS=m +CONFIG_NFS_V3=y +# CONFIG_NFS_V3_ACL is not set +CONFIG_NFS_V4=y +# CONFIG_NFSD is not set +CONFIG_LOCKD=m +CONFIG_LOCKD_V4=y +CONFIG_NFS_COMMON=y +CONFIG_SUNRPC=m +CONFIG_SUNRPC_GSS=m +# CONFIG_SUNRPC_REGISTER_V4 is not set +CONFIG_RPCSEC_GSS_KRB5=m +# CONFIG_RPCSEC_GSS_SPKM3 is not set +# CONFIG_SMB_FS is not set +CONFIG_CIFS=m +# CONFIG_CIFS_STATS is not set +# CONFIG_CIFS_WEAK_PW_HASH is not set +# CONFIG_CIFS_XATTR is not set +# CONFIG_CIFS_DEBUG2 is not set +# CONFIG_CIFS_EXPERIMENTAL is not set +# CONFIG_NCP_FS is not set +# CONFIG_CODA_FS is not set +# CONFIG_AFS_FS is not set + +# +# Partition Types +# +CONFIG_PARTITION_ADVANCED=y +# CONFIG_ACORN_PARTITION is not set +# CONFIG_OSF_PARTITION is not set +# CONFIG_AMIGA_PARTITION is not set +# CONFIG_ATARI_PARTITION is not set +# CONFIG_MAC_PARTITION is not set +CONFIG_MSDOS_PARTITION=y +# CONFIG_BSD_DISKLABEL is not set +# CONFIG_MINIX_SUBPARTITION is not set +# CONFIG_SOLARIS_X86_PARTITION is not set +# CONFIG_UNIXWARE_DISKLABEL is not set +# CONFIG_LDM_PARTITION is not set +# CONFIG_SGI_PARTITION is not set +# CONFIG_ULTRIX_PARTITION is not set +# CONFIG_SUN_PARTITION is not set +# CONFIG_KARMA_PARTITION is not set +CONFIG_EFI_PARTITION=y +# CONFIG_SYSV68_PARTITION is not set +CONFIG_NLS=y +CONFIG_NLS_DEFAULT="iso8859-1" +CONFIG_NLS_CODEPAGE_437=y +# CONFIG_NLS_CODEPAGE_737 is not set +# CONFIG_NLS_CODEPAGE_775 is not set +CONFIG_NLS_CODEPAGE_850=m +# CONFIG_NLS_CODEPAGE_852 is not set +# CONFIG_NLS_CODEPAGE_855 is not set +# CONFIG_NLS_CODEPAGE_857 is not set +# CONFIG_NLS_CODEPAGE_860 is not set +# CONFIG_NLS_CODEPAGE_861 is not set +# CONFIG_NLS_CODEPAGE_862 is not set +# CONFIG_NLS_CODEPAGE_863 is not set +# CONFIG_NLS_CODEPAGE_864 is not set +# CONFIG_NLS_CODEPAGE_865 is not set +# CONFIG_NLS_CODEPAGE_866 is not set +# CONFIG_NLS_CODEPAGE_869 is not set +# CONFIG_NLS_CODEPAGE_936 is not set +# CONFIG_NLS_CODEPAGE_950 is not set +# CONFIG_NLS_CODEPAGE_932 is not set +# 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 is not set +# CONFIG_NLS_CODEPAGE_1251 is not set +# CONFIG_NLS_ASCII is not set +CONFIG_NLS_ISO8859_1=y +# CONFIG_NLS_ISO8859_2 is not set +# CONFIG_NLS_ISO8859_3 is not set +# CONFIG_NLS_ISO8859_4 is not set +# CONFIG_NLS_ISO8859_5 is not set +# CONFIG_NLS_ISO8859_6 is not set +# CONFIG_NLS_ISO8859_7 is not set +# CONFIG_NLS_ISO8859_9 is not set +# CONFIG_NLS_ISO8859_13 is not set +# CONFIG_NLS_ISO8859_14 is not set +CONFIG_NLS_ISO8859_15=m +# CONFIG_NLS_KOI8_R is not set +# CONFIG_NLS_KOI8_U is not set +CONFIG_NLS_UTF8=m +# CONFIG_DLM is not set + +# +# Kernel hacking +# +CONFIG_PRINTK_TIME=y +CONFIG_ENABLE_WARN_DEPRECATED=y +CONFIG_ENABLE_MUST_CHECK=y +CONFIG_FRAME_WARN=1024 +CONFIG_MAGIC_SYSRQ=y +# CONFIG_UNUSED_SYMBOLS is not set +CONFIG_DEBUG_FS=y +# CONFIG_HEADERS_CHECK is not set +CONFIG_DEBUG_KERNEL=y +# CONFIG_DEBUG_SHIRQ is not set +# CONFIG_DETECT_SOFTLOCKUP is not set +# CONFIG_SCHED_DEBUG is not set +# CONFIG_SCHEDSTATS is not set +CONFIG_TIMER_STATS=y +# CONFIG_DEBUG_OBJECTS is not set +# CONFIG_SLUB_DEBUG_ON is not set +# CONFIG_SLUB_STATS is not set +# CONFIG_DEBUG_PREEMPT is not set +# CONFIG_DEBUG_RT_MUTEXES is not set +# CONFIG_RT_MUTEX_TESTER is not set +# CONFIG_DEBUG_SPINLOCK is not set +# CONFIG_DEBUG_MUTEXES is not set +# CONFIG_DEBUG_LOCK_ALLOC is not set +# CONFIG_PROVE_LOCKING is not set +# CONFIG_LOCK_STAT is not set +# CONFIG_DEBUG_SPINLOCK_SLEEP is not set +# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set +# CONFIG_DEBUG_KOBJECT is not set +CONFIG_DEBUG_BUGVERBOSE=y +CONFIG_DEBUG_INFO=y +# CONFIG_DEBUG_VM is not set +# CONFIG_DEBUG_WRITECOUNT is not set +# CONFIG_DEBUG_MEMORY_INIT is not set +# CONFIG_DEBUG_LIST is not set +# CONFIG_DEBUG_SG is not set +CONFIG_FRAME_POINTER=y +# CONFIG_BOOT_PRINTK_DELAY is not set +# CONFIG_RCU_TORTURE_TEST is not set +# CONFIG_RCU_CPU_STALL_DETECTOR is not set +# CONFIG_KPROBES_SANITY_TEST is not set +# CONFIG_BACKTRACE_SELF_TEST is not set +# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set +# CONFIG_LKDTM is not set +# CONFIG_FAULT_INJECTION is not set +CONFIG_PANIC_INFO_BUFF=m +# CONFIG_LATENCYTOP is not set +# CONFIG_SYSCTL_SYSCALL_CHECK is not set +CONFIG_HAVE_FUNCTION_TRACER=y + +# +# Tracers +# +# CONFIG_FUNCTION_TRACER is not set +# CONFIG_IRQSOFF_TRACER is not set +# CONFIG_PREEMPT_TRACER is not set +# CONFIG_SCHED_TRACER is not set +# CONFIG_CONTEXT_SWITCH_TRACER is not set +# CONFIG_BOOT_TRACER is not set +# CONFIG_STACK_TRACER is not set +# CONFIG_DYNAMIC_PRINTK_DEBUG is not set +# CONFIG_SAMPLES is not set +CONFIG_HAVE_ARCH_KGDB=y +# CONFIG_KGDB is not set +# CONFIG_DEBUG_USER is not set +# CONFIG_DEBUG_ERRORS is not set +# CONFIG_DEBUG_STACK_USAGE is not set +# CONFIG_DEBUG_LL is not set + +# +# Security options +# +# CONFIG_KEYS is not set +CONFIG_SECURITY=y +# CONFIG_SECURITYFS is not set +# CONFIG_SECURITY_NETWORK is not set +# CONFIG_SECURITY_FILE_CAPABILITIES is not set +# CONFIG_SECURITY_ROOTPLUG is not set +CONFIG_SECURITY_LOWMEM=y +CONFIG_SECURITY_DEFAULT_MMAP_MIN_ADDR=4096 +CONFIG_CRYPTO=y + +# +# Crypto core or helper +# +# CONFIG_CRYPTO_FIPS is not set +CONFIG_CRYPTO_ALGAPI=y +CONFIG_CRYPTO_ALGAPI2=y +CONFIG_CRYPTO_AEAD=m +CONFIG_CRYPTO_AEAD2=y +CONFIG_CRYPTO_BLKCIPHER=y +CONFIG_CRYPTO_BLKCIPHER2=y +CONFIG_CRYPTO_HASH=m +CONFIG_CRYPTO_HASH2=y +CONFIG_CRYPTO_RNG2=y +CONFIG_CRYPTO_MANAGER=y +CONFIG_CRYPTO_MANAGER2=y +# CONFIG_CRYPTO_GF128MUL is not set +# CONFIG_CRYPTO_NULL is not set +CONFIG_CRYPTO_CRYPTD=m +CONFIG_CRYPTO_AUTHENC=m +# 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=y +# CONFIG_CRYPTO_LRW is not set +CONFIG_CRYPTO_PCBC=m +# CONFIG_CRYPTO_XTS is not set + +# +# Hash modes +# +CONFIG_CRYPTO_HMAC=m +# CONFIG_CRYPTO_XCBC 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_RMD128 is not set +# CONFIG_CRYPTO_RMD160 is not set +# CONFIG_CRYPTO_RMD256 is not set +# CONFIG_CRYPTO_RMD320 is not set +CONFIG_CRYPTO_SHA1=m +CONFIG_CRYPTO_SHA256=m +CONFIG_CRYPTO_SHA512=m +# CONFIG_CRYPTO_TGR192 is not set +# CONFIG_CRYPTO_WP512 is not set + +# +# Ciphers +# +CONFIG_CRYPTO_AES=y +# CONFIG_CRYPTO_ANUBIS is not set +CONFIG_CRYPTO_ARC4=y +CONFIG_CRYPTO_BLOWFISH=m +# CONFIG_CRYPTO_CAMELLIA is not set +# CONFIG_CRYPTO_CAST5 is not set +# CONFIG_CRYPTO_CAST6 is not set +CONFIG_CRYPTO_DES=y +# CONFIG_CRYPTO_FCRYPT is not set +# CONFIG_CRYPTO_KHAZAD 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=y +CONFIG_CRYPTO_LZO=y + +# +# Random Number Generation +# +# CONFIG_CRYPTO_ANSI_CPRNG is not set +CONFIG_CRYPTO_HW=y + +# +# Library routines +# +CONFIG_BITREVERSE=y +CONFIG_CRC_CCITT=y +CONFIG_CRC16=y +# CONFIG_CRC_T10DIF is not set +CONFIG_CRC_ITU_T=m +CONFIG_CRC32=y +CONFIG_CRC7=m +CONFIG_LIBCRC32C=y +CONFIG_ZLIB_INFLATE=y +CONFIG_ZLIB_DEFLATE=y +CONFIG_LZO_COMPRESS=y +CONFIG_LZO_DECOMPRESS=y +CONFIG_PLIST=y +CONFIG_HAS_IOMEM=y +CONFIG_HAS_IOPORT=y +CONFIG_HAS_DMA=y