---- 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
</chapter>
<title>Multiple queues and QoS support</title>
<para>TBD</para>
--- /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
+-------------------------
+- 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
+The OMAP Linux Kernel Team
+Dirk Behme <dirk.behme@de.bosch.com>
--- /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
+Arnold <abo_gwapo@yahoo.com>
+Dirk Behme <dirk.behme@gmail.com>
--- /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
+
+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
+=====================
+=================================================
+Contact: Carlos Chinea <carlos.chinea@nokia.com>
+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.
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.
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
+
+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
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
# 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
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
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
+ 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
__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
+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
+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
#
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
+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
+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
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
+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
+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
+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
# 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
#
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
+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
+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
+#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 */
/* 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
#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);
* 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
#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
#include <asm-generic/page.h>
#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))
#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
/*
* 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)
+#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;
};
* 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 *);
#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;
}
#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 */
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)
+};
+
#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)
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
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]
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;
}
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;
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 <linux/tick.h>
#include <linux/utsname.h>
* 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
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",
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
#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)
}
/*
---- 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 <asm-generic/vmlinux.lds.h>
#include <asm/thread_info.h>
__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),
};
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"
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
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)
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.
*/
-{
-}
#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 @@
*/
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.
*/
-{
-}
#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 <linux/mtd/nand.h>
#include <linux/mtd/partitions.h>
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 <mach/usb.h>
#include <mach/keypad.h>
}
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 <linux/spi/ads7846.h>
#include <linux/workqueue.h>
}
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 <mach/mux.h>
#include <mach/tc.h>
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 <mach/irda.h>
#include <mach/keypad.h>
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 <asm/mach/flash.h>
}
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 <asm/mach/map.h>
#include <asm/mach/flash.h>
}
}
---- 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)
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.
*/
-{
-}
#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 <asm/mach/map.h>
}
/*----------------------------------------*/
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 <linux/delay.h>
#include <linux/platform_device.h>
}
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
*-------------------------------------------------------------------------*/
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);
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 <mach/board.h>
#include <mach/mux.h>
#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]
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 <linux/kernel.h>
#include <linux/init.h>
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 */
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 */
}
#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).
*/
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
+MODULE_DESCRIPTION("omap mailbox: omap1 architecture specific functions");
+MODULE_AUTHOR("Hiroshi DOYU" <Hiroshi.DOYU@nokia.com>);
+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)
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
+};
+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
+}
+
+#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;
}
#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;
}
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
+ 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 @@
#
+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
+ }
+ }
+}
---- 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 <linux/mtd/mtd.h>
#include <linux/mtd/partitions.h>
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
+ }
+}
--- /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
+ .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
+
+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
+}
+
+#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
}
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)
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
+
+#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 <linux/mtd/partitions.h>
#include <linux/delay.h>
}
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 <linux/platform_device.h>
#include <linux/delay.h>
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
+
+#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
+}
+
--- /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
+
+#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
+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
+ }
+}
--- /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
+
+#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
+ 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
+ .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
+
+#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
+ .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
+ }
+}
--- /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
+ .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 <linux/mtd/partitions.h>
#include <linux/mtd/nand.h>
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
+}
+
--- /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
+ .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)
+ .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 <linux/io.h>
#include <linux/kernel.h>
"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
+
+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
+
+#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
+
+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
+
+#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
+
+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
+
+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
+
+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
+}
+
--- /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
+#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
+ .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
+
+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
+ .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 <mach/clockdomain.h>
#include <mach/sram.h>
+ 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
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 <linux/cpufreq.h>
#include <linux/bitops.h>
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"
/* 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 <linux/io.h>
#include <linux/limits.h>
-
-#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
&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;
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 @@
/*
#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)
/* 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)
/* 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"
#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 <mach/common.h>
+}
+#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
+}
+#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
+}
+
+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 <linux/init.h>
#include <linux/platform_device.h>
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
+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 */
+ }
+}
+#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 <mach/control.h>
#include <mach/cpu.h>
+}
+
+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 <linux/kernel.h>
#include <linux/init.h>
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
+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
+ /* 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
+MODULE_DESCRIPTION("omap mailbox: omap2/3 architecture specific functions");
+MODULE_AUTHOR("Hiroshi DOYU <Hiroshi.DOYU@nokia.com>, 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 <mach/cpu.h>
#include <mach/mcbsp.h>
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
+
+#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
+
+#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
+
+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
+}
+
+#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)
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
+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_
+
+#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
+
+#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
+}
+
--- /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
+#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
+
+#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
+
+#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
+#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
+
+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
+#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
+ 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
+}
+
+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 <mach/powerdomain.h>
#include <mach/clockdomain.h>
+ 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,
#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 @@
};
#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)
/* 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 <tony.lindgren@nokia.com>
+ 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 */
/* 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
/* 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
+ 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
+
+#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
+
+
--- /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
+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
+
+#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
+
+#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
+ 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
+ /* 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 <paul.mundt@nokia.com>
+ 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)
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
+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
+
+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
+#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"
.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"
.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
.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
+ 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;
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
+
+#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
+
+#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
+}
+
--- /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
+#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 <linux/errno.h>
#include <linux/delay.h>
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 <linux/linkage.h>
#include <linux/init.h>
/*
* 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 <linux/linkage.h>
#include <linux/init.h>
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"
+ 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;
}
+ 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,
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
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;
}
+ 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;
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
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
+ .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.
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
+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
+}
+
+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 <linux/mutex.h>
#include <linux/platform_device.h>
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
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
+MODULE_AUTHOR("Juha Yrjölä <juha.yrjola@nokia.com>");
+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
+ * 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;
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 */
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 <linux/init.h>
#include <linux/platform_device.h>
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;
/* 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 <linux/clk.h>
#include <linux/delay.h>
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
+ 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 <linux/init.h>
#include <linux/platform_device.h>
+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
+MODULE_AUTHOR("Juha Yrjölä <juha.yrjola@nokia.com>, Paul Mundt <paul.mundt@nokia.com");
+MODULE_DESCRIPTION("GPIO switch driver");
+MODULE_LICENSE("GPL");
---- kernel-2.6.28.orig/arch/arm/plat-omap/gpio.c
-+++ kernel-2.6.28/arch/arm/plat-omap/gpio.c
+--- kernel-maemo-2.6.28.orig/arch/arm/plat-omap/gpio.c
++++ kernel-maemo-2.6.28/arch/arm/plat-omap/gpio.c
@@ -20,10 +20,13 @@
#include <linux/io.h>
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
};
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
+
+#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
+
+#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
+
+#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
+
+#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
+
+#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
+
+#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
+
+#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
+
+#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
+
+#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
+
+#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
+
+#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
+
+#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
+
+#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
+
+#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
+
+#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
+
+#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
+#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
+
+#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
+
+#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
+
+#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
+
+#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
+#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
+
+#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
+#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
+
+#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
+
+#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
+
+#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
+
+#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
+
+#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
+
+#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
+
+#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
+ 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
+
+#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
+
+#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
+
+#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
+
+#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
+
+#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
+
+#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
+
+#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
+
+#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
+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
+
+#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
+
+#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
+#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
+
+#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
+
+#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
+
+#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
+
+#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
+
+#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
+
+#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
+
+#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
+
+#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
+
+#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
+
+#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
+
+#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
+
+#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
+#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
+
+#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
+
+#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
+
+#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
+
+#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
+
+#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
+
+#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
+
+#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
+#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
+
+#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
+
+#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
+
+#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
+
+#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
+
+#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
+#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
+
+#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
+
+#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
+
+#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
+
+#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
+#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
+
+#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
+
+#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
+
+#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
+
+#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
+
+#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
+#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
+
+#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
+
+#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
+ 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
+
+#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
+#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
+
+#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
+
+#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
}
/* 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
#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
-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 */
+
#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);
+#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
*/
#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
+
+#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
+#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
+#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
+
+#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 */
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.
*/
+#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
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);
+#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)
#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 {
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
+
+#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
+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
#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)
+#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 <toshihiro.kobayashi@nokia.com>
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
+
+#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
*
+#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))
}
#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
+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
#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))
#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
+
+#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
+
+#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
+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
#include <mach/hardware.h>
--- /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
+};
+
+#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;
#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;
};
#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);
+}
+
#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
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 <mach/board.h>
+#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
+ 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,
};
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 <sound/pcm.h>
#include <mach/mcbsp.h>
#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
+#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
#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
+
+
+#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) && \
-
#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 @@
/*
+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
*/
--- /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
+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
+#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; \
})
+#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);
+
#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
+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
+ 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 <asm/mach-types.h>
#include <mach/hardware.h>
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
+
#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
+#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
+
+#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
#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
+#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
+
+#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
+
+#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
+MODULE_AUTHOR("Hiroshi DOYU <Hiroshi.DOYU@nokia.com>");
+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
+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
+
+#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
+MODULE_DESCRIPTION("omap iommu: simple virtual address space management");
+MODULE_AUTHOR("Hiroshi DOYU <Hiroshi.DOYU@nokia.com>");
+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
+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 <mach/dma.h>
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
+
+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
+}
+
--- /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
+ /* 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
+ 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 <mach/sram.h>
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 @@
/*-------------------------------------------------------------------------*/
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
+#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 <linux/kernel.h>
+#include <linux/module.h>
+}
+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
+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
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;
};
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
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.
*/
}
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);
__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 @@
}
}
.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;
}
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/
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).
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
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 <net/bluetooth/bluetooth.h>
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 <net/bluetooth/bluetooth.h>
#include <net/bluetooth/hci_core.h>
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 <net/bluetooth/bluetooth.h>
#include <net/bluetooth/hci_core.h>
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
+MODULE_LICENSE("GPL");
+MODULE_AUTHOR("Ville Tervo <ville.tervo@nokia.com>");
--- /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
+} __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 <net/bluetooth/bluetooth.h>
#include <net/bluetooth/hci_core.h>
#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 <net/bluetooth/bluetooth.h>
#include <net/bluetooth/hci_core.h>
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"
#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"
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.
+
+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
+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
+ 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
+ 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
+ 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
+ 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
+
+#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
+ 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"
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);
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 <net/bluetooth/bluetooth.h>
#include <net/bluetooth/hci_core.h>
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
+
+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.
+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
+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
+
+#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
+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
+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
+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
+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
+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
+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
+
+#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
+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
+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
+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
+
+#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
+};
+
+#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
+ 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,
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
+ 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
+
+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) ||\
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)
*/
}
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();
}
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;
}
/* 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 <linux/hrtimer.h>
#include <linux/tick.h>
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 <linux/ktime.h>
#include <linux/hrtimer.h>
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).
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
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.
+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
+
+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
+ 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
+} /* 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
+
+#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
+
+#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
+
+#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
+ 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
+#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
+
+#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
+#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
+} /* 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
+
+#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
+ 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
+#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
+ 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
+ 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
+ }
+}
--- /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
+ }
+}
--- /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
+ }
+}
--- /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
+#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
+
+#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
+#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
+
+#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
+
+#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
+
+#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
+
+#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
+
+#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
+
+#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
+
+#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
+
+#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
+ 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
+
+#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
+ 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
+
+#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
+
+}
--- /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
+
+#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
+ 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
+
+#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
+
+
--- /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
+#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
+ 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
+}
+
--- /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
+}
+
--- /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
+}
+
--- /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
+}
+
--- /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
+}
+#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
+ 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
+
+#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
+}
+
--- /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
+#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
+ 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
+}
+
--- /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
+ 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
+ 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
+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
+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
+ 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
+}
+
--- /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
+}
+
--- /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
+}
+
--- /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
+}
+
--- /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
+
+
--- /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
+}
+
--- /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
+}
+
--- /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
+ 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
+ __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
+ 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
+
+#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
+}
+
--- /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
+}
+
--- /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
+}
+
--- /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
+ 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
+}
+
--- /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
+}
+
--- /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
+}
+
--- /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
+#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
+}
+
--- /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
+ 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
+
+#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
+
+#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
+#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
+#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
+
+#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
+#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
+#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
+ 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
+
+}
--- /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
+ 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
+#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
+}
+
--- /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
+ 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
+ }
+}
--- /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
+}
+
--- /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
+#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
+ 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
+}
+
--- /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
+ 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.
+ 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)
+
+#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)
+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)
+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)
+ 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)
+ 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)
+
+#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)
+ 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)
+ 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)
+
+#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)
+ 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)
+
+#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)
+ 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
+
+#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)
+
+#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)
+
+#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)
+
+#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)
+ 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)
+ 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)
+ 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)
+}
+
+#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;
}
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;
}
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.
+-------------------------------------------------------------------------
+
--- /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"
+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
+
+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.
+Imagination Technologies Ltd. <gpl-support@imgtec.com>
+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 @@
+/**********************************************************************
+ *
+ 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 @@
+/**********************************************************************
+ *
+
+#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 @@
+/**********************************************************************
+ *
+ 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 @@
+/**********************************************************************
+ *
+
+#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 @@
+/**********************************************************************
+ *
+ 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 @@
+/**********************************************************************
+ *
+
+#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 @@
+/**********************************************************************
+ *
+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 @@
+/**********************************************************************
+ *
+
+#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 @@
+/**********************************************************************
+ *
+ 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 @@
+/**********************************************************************
+ *
+
+#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 @@
+/**********************************************************************
+ *
+
+#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 @@
+/**********************************************************************
+ *
+ 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 @@
+/**********************************************************************
+ *
+ 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 @@
+/**********************************************************************
+ *
+
+#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 @@
+/**********************************************************************
+ *
+
+}
--- /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 @@
+/**********************************************************************
+ *
+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 @@
+/**********************************************************************
+ *
+ 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 @@
+/**********************************************************************
+ *
+
+#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 @@
+/**********************************************************************
+ *
+}
+
--- /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 @@
+/**********************************************************************
+ *
+
+#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 @@
+/**********************************************************************
+ *
+
+#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 @@
+/**********************************************************************
+ *
+
+#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 @@
+/**********************************************************************
+ *
+
+#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 @@
+/**********************************************************************
+ *
+
+#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 @@
+/**********************************************************************
+ *
+
+#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 @@
+/**********************************************************************
+ *
+ 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 @@
+/**********************************************************************
+ *
+
+#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 @@
+/**********************************************************************
+ *
+
+#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 @@
+/**********************************************************************
+ *
+}
+#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 @@
+/**********************************************************************
+ *
+
+#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 @@
+/**********************************************************************
+ *
+}
+#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 @@
+/**********************************************************************
+ *
+
+#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 @@
+/**********************************************************************
+ *
+}
+
--- /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 @@
+/**********************************************************************
+ *
+
+#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 @@
+/**********************************************************************
+ *
+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 @@
+/**********************************************************************
+ *
+}
+
--- /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 @@
+/**********************************************************************
+ *
+
+#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 @@
+/**********************************************************************
+ *
+
+#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 @@
+/**********************************************************************
+ *
+
+#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 @@
+/**********************************************************************
+ *
+ 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 @@
+/**********************************************************************
+ *
+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 @@
+/**********************************************************************
+ *
+ 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 @@
+/**********************************************************************
+ *
+
+#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 @@
+/**********************************************************************
+ *
+ 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 @@
+/**********************************************************************
+ *
+
+#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 @@
+/**********************************************************************
+ *
+
+#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 @@
+/**********************************************************************
+ *
+
+#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 @@
+/**********************************************************************
+ *
+ 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 @@
+/**********************************************************************
+ *
+
+#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 @@
+/**********************************************************************
+ *
+ }
+}
--- /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 @@
+/**********************************************************************
+ *
+
+#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 @@
+/**********************************************************************
+ *
+ 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 @@
+/**********************************************************************
+ *
+
+#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 @@
+/**********************************************************************
+ *
+
+#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 @@
+/**********************************************************************
+ *
+ 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 @@
+/**********************************************************************
+ *
+
+#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 @@
+/**********************************************************************
+ *
+
+#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 @@
+/**********************************************************************
+ *
+
+#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
+
+#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 @@
+/**********************************************************************
+ *
+
+#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 @@
+/**********************************************************************
+ *
+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 @@
+/**********************************************************************
+ *
+ 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 @@
+/**********************************************************************
+ *
+
+#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 @@
+/**********************************************************************
+ *
+ 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 @@
+/**********************************************************************
+ *
+
+#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 @@
+/**********************************************************************
+ *
+}
+#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 @@
+/**********************************************************************
+ *
+
+#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 @@
+/**********************************************************************
+ *
+
+#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 @@
+/**********************************************************************
+ *
+}
+#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 @@
+/**********************************************************************
+ *
+
+#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 @@
+/**********************************************************************
+ *
+
+#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 @@
+/**********************************************************************
+ *
+
+#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 @@
+/**********************************************************************
+ *
+
+#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 @@
+/**********************************************************************
+ *
+
+#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 @@
+/**********************************************************************
+ *
+
+#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 @@
+/**********************************************************************
+ *
+
+#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 @@
+/**********************************************************************
+ *
+
+#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 @@
+/**********************************************************************
+ *
+
+#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 @@
+/**********************************************************************
+ *
+
+#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 @@
+/**********************************************************************
+ *
+
+#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 @@
+/**********************************************************************
+ *
+
+#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 @@
+/**********************************************************************
+ *
+
+#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 @@
+/**********************************************************************
+ *
+
+#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 @@
+/**********************************************************************
+ *
+
+#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 @@
+/**********************************************************************
+ *
+
+#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 @@
+/**********************************************************************
+ *
+ 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 @@
+/**********************************************************************
+ *
+ 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 @@
+/**********************************************************************
+ *
+
+#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 @@
+/**********************************************************************
+ *
+ 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 @@
+/**********************************************************************
+ *
+
+#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 @@
+/**********************************************************************
+ *
+}
+
--- /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 @@
+/**********************************************************************
+ *
+ 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 @@
+/**********************************************************************
+ *
+ 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 @@
+/**********************************************************************
+ *
+
+#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 @@
+/**********************************************************************
+ *
+
+#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 @@
+/**********************************************************************
+ *
+ 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 @@
+/**********************************************************************
+ *
+
+#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 @@
+/**********************************************************************
+ *
+
+#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 @@
+/**********************************************************************
+ *
+
+#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 @@
+/**********************************************************************
+ *
+ 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.
+ 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 @@
+/**********************************************************************
+ *
+ 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 @@
+/**********************************************************************
+ *
+
+#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 @@
+/**********************************************************************
+ *
+
+}
--- /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 @@
+/**********************************************************************
+ *
+
+#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 @@
+/**********************************************************************
+ *
+ }
+}
--- /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 @@
+/**********************************************************************
+ *
+
+#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 @@
+/**********************************************************************
+ *
+ 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 @@
+/**********************************************************************
+ *
+
+#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 @@
+/**********************************************************************
+ *
+
+#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 @@
+/**********************************************************************
+ *
+}
+
+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.
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
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
+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
+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"
---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
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
*
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.
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
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
+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
+
+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 @@
+
/*
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
+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
+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
+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
+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
+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"
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.
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
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;
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
+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
+
+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 <linux/delay.h>
#include <linux/platform_device.h>
} 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
+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
+ 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
+
+#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
+
+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.
+#
+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
+
+#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
+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
+
+#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
+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
+};
+
+#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.
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
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;
}
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
+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
+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
+}
+MODULE_AUTHOR("Jarkko Oikarinen <jarkko.oikarinen@nokia.com>");
+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.
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
# 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
+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
+ *
+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
+ *
+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
+
+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.
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
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
+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
+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
+
+#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
+ 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
+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.
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
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
+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
+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. */
+
+/* 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
+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
+
+#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
+
+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
+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
+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
+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
+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
+
+#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
+ 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
+
+#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
+ }
+}
--- /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
+
+#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
+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
+#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
+}
+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
+
+#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
+#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
+
+#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
+ 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
+
+#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
+
+#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
+{
+}
--- /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
+
+#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
+ 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
+
+#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
+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
+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
+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
+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
+ 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
+ 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
+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
+
+#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
+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
+
+#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
+MODULE_AUTHOR("Sakari Ailus <sakari.ailus@nokia.com>");
+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);
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;
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
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
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 <linux/clk.h>
#include <linux/err.h>
};
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
+ 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.
+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/
+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
+
+ 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
+
+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
+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
+
+#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
+
+#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
+ 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
+
+#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
+
+ 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
+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
+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
+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
+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
+ ---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
+
+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
+
+#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
+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
+
+#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
+ 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
+
+#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
+
+ 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
+
+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
+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
+
+#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
+}
+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
+ 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
+ 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
+ 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
+}
+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
+ 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
+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)
+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
+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
+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.
+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)
+
+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--;
}
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;
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);
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
};
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");
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);
/*
* 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);
+
#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;
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);
}
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);
#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 @@
}
}
/*
* 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
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
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 @@
}
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
+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.
{
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'.
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
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)
{
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;
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 <linux/mtd/mtd.h>
#include <linux/mtd/partitions.h>
+ );
+ }
+}
---- 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).
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
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
+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
+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
+
+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);
}
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)
{
/* 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 @@
}
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.
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",
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__)
} 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.
*/
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.
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");
/*
* 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
__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
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.
*
+ 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.
+
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
# 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
+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
#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);
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"
+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/
+
+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"
+ 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 \
+ 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
+
+#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"
+
+ 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
+
+#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
+ 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
+
+#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"
+
+ 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
+
+#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
+
+}
--- /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
+
+#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
+ 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
+
+#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
+ 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
+
+#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 @@
+
+/*
+MODULE_LICENSE("GPL");
+MODULE_AUTHOR("Kalle Valo <kalle.valo@nokia.com>");
--- /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
+ 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
+
+#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
+}
+
--- /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__
+
+#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
+
+#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
+ 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
+
+#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
+ 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
+
+#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
+ }
+}
--- /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
+
+#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
+
+#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"
+
+ 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
+
+#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
+ 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
+
+#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
+ 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
+
+#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
+
+}
--- /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
+
+#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
+ 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
+
+#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
+ 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
+
+#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
+MODULE_AUTHOR("Kalle Valo <Kalle.Valo@nokia.com>, "
+ "Luciano Coelho <luciano.coelho@nokia.com>");
--- /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
+ 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
+
+#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
+
+
--- /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__
+
+#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
+
+#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
+
+}
--- /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
+
+#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
+ 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
+
+#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
+ }
+}
--- /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
+
+#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__
+} __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.
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
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
+}
+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.
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
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
+
+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)
}
#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);
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.
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
# ... 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
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
+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
+
+MODULE_AUTHOR("Juha Yrjölä <juha.yrjola@nokia.com>");
+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
+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
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.
*/
}
+#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
# 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
+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 <linux/kernel.h>
#include <linux/slab.h>
.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;
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;
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
+ 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
+ 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
}
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
+}
+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:
}
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
+}
+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
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
+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 {
+ 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
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
#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
+ }
+};
--- /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
+#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 <linux/jiffies.h>
#include <linux/platform_device.h>
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
+ 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
+ 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
+ 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.
+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 <linux/io.h>
#include <linux/gpio.h>
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
+#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
/* 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"
+#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)
-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
#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;
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;
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.
*/
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;
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) \
+
#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
+
+ 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__
+#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);
}
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 <linux/interrupt.h>
#include <linux/platform_device.h>
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
+ 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;
+}
+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)
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 <linux/usb.h>
#include <linux/platform_device.h>
#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,
+
+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
+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
+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
+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
+
+#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
+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"
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
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)"
- 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
+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 <linux/fb.h>
#include <linux/delay.h>
.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 <linux/vmalloc.h>
#include <linux/clk.h>
.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
+#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 <linux/fb.h>
#include <linux/delay.h>
#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
+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
+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
+
+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 <linux/module.h>
#include <linux/platform_device.h>
#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 <linux/module.h>
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 <linux/module.h>
#include <linux/platform_device.h>
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 <linux/module.h>
#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
+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
+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
+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
+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
+
+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 <linux/module.h>
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
+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
+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 <linux/module.h>
#include <linux/platform_device.h>
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 <linux/platform_device.h>
#include <linux/module.h>
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 <linux/module.h>
#include <linux/platform_device.h>
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 <linux/dma-mapping.h>
#include <linux/vmalloc.h>
#include <asm/mach-types.h>
---- 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 <linux/platform_device.h>
#include <linux/mm.h>
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
*
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
*
#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
+ 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
+ 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
+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
+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 <linux/kernel.h>
+#include <linux/module.h>
+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
+#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
+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
+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
+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
+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
+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)"
+
+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
+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
+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
+}
+
--- /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
+}
+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
+}
+
--- /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
+}
+
--- /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
+}
+
--- /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
+
+#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
+#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
+}
+
--- /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
+ 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
+{
+}
--- /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
+#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)"
+ 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
+
+
--- /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
+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
+}
+
--- /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
+}
+
+#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
# 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
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)");
}
--- /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
+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);
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);
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))
}
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/
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;
&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);
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)
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());
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;
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;
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)
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,
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));
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)) {
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) {
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;
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)
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,
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);
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 @@
}
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)) {
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) {
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 */
__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;
}
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 */
__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) {
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;
"%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;
/* 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"
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;
}
"%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;
}
"%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 @@
}
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);
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)
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);
}
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)
{
}
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);
}
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)
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;
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);
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);
}
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)) {
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)
{
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)
}
/* 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)
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 <linux/stat.h>
#include <linux/module.h>
.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)
}
/*
---- 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 <linux/sched.h>
#include <linux/module.h>
.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 <linux/sched.h>
#include <linux/module.h>
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();
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);
}
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);
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))
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);
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;
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 <asm/byteorder.h>
#include "sysv.h"
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)
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)
}
---- 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"
+
+ 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;
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 = {
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 <linux/module.h>
+}
+
#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
+#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 @@
}
.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;
}
.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
}
/**
---- 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
* @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);
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;
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__
}
/**
---- 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
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
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);
+}
+
#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;
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
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
}
/**
---- 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
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"
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 <linux/parser.h>
#include <linux/seq_file.h>
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
}
/* 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 @@
}
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
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
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);
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))
}
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));
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));
}
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;
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))
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);
}
/*
---- 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 @@
+/*
+ *
+#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
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 -*-
+ *
+
+#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
+
+#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;
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 */
#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
+};
+
+#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);
/* 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;
};
#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
#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
+
+#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
+
+#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
+
+#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
+#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
+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.
+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 */
#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 */
#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,
+
#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
+#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
+};
+
+#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
/*
* 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 @@
};
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);
/**
* 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
+
#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 */
/*
* 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);
};
---- 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
*/
/**
* 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
+
+#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
+
+#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
+
+#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
+
+#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
+#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
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
#include <asm/page.h>
/*
---- 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 */
#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;
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);
};
--- /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
+
+#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
+
+#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
+
+#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
+
+#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
+
+#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
+ 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;
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.
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;
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
+ 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 */
};
---- 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 */
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
+
+#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 */
#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
+
+#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
+
+#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
+
+#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
+ 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;
};
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
};
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 */
/* ---- 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;
}
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;
#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)
};
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
+ 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 <linux/err.h>
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;
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;
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;
};
#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
};
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);
/* 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;
}
#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 <linux/err.h>
#include <linux/kfifo.h>
+ 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);
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;
}
};
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)
/*
* 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)
}
/**
---- 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();
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;
}
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 {
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.
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 <linux/tty.h>
#include <linux/wait.h>
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
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
+
+}
+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;
/* 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 <linux/syscalls.h>
#include <linux/buffer_head.h>
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 <asm/pgtable.h>
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 @@
*/
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)
{
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));
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"
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 <net/bluetooth/bluetooth.h>
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;
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"
#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"
#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"
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"
#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"
}
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"
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 <net/bluetooth/bluetooth.h>
#include <net/bluetooth/hci_core.h>
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 <net/bluetooth/bluetooth.h>
#include <net/bluetooth/hci_core.h>
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 <net/bluetooth/bluetooth.h>
#include <net/bluetooth/hci_core.h>
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 <net/bluetooth/bluetooth.h>
#include <net/bluetooth/hci_core.h>
/* ----- 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 <net/bluetooth/bluetooth.h>
#include <net/bluetooth/hci_core.h>
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"
#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"
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 <net/bluetooth/hci_core.h>
#include <net/bluetooth/l2cap.h>
.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 <net/bluetooth/l2cap.h>
#include <net/bluetooth/rfcomm.h>
};
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 <net/bluetooth/l2cap.h>
#include <net/bluetooth/rfcomm.h>
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 <net/bluetooth/hci_core.h>
#include <net/bluetooth/rfcomm.h>
}
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 <net/bluetooth/hci_core.h>
#include <net/bluetooth/sco.h>
.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,
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;
}
.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;
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.
+
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
+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
+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
+MODULE_AUTHOR("Timo Teras <ext-timo.teras@nokia.com>");
+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);
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;
#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;
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)
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
+
+ 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;
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.
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;
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 @@
}
}
#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);
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);
}
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;
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;
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 *);
+ 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);
}
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 <linux/netdevice.h>
#include <linux/phonet.h>
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)
+ __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.
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),
{ .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;
}
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)) {
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 = {
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
# 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.
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;
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 <linux/module.h>
+#include <linux/kernel.h>
+
+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 <sound/jack.h>
#include <sound/core.h>
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
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
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 <sound/soc.h>
#include <sound/soc-dapm.h>
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 */
#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
+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
+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.
+ 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
+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
+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
+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"
.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 <sound/pcm_params.h>
#include <sound/soc.h>
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
+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
+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
+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_
+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 =
}
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