summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--include/kernel-version.mk4
-rw-r--r--target/linux/avr32/Makefile2
-rw-r--r--target/linux/generic-2.6/patches-2.6.28/900-headers_type_and_time.patch2
-rw-r--r--target/linux/generic-2.6/patches-2.6.28/924-cs5535_gpio.patch12
-rw-r--r--target/linux/generic-2.6/patches-2.6.28/971-ocf_20080917.patch2
-rw-r--r--target/linux/generic-2.6/patches-2.6.28/980-vm_exports.patch4
-rw-r--r--target/linux/ixp4xx/Makefile2
-rw-r--r--target/linux/orion/Makefile2
-rw-r--r--target/linux/s3c24xx/Makefile2
-rw-r--r--target/linux/s3c24xx/patches-2.6.28/001-merge-openmoko.patch3482
-rw-r--r--target/linux/s3c24xx/patches-2.6.28/002-call-preinit-instead-of-init.patch6
-rw-r--r--target/linux/s3c24xx/patches-2.6.28/003-disable-xt-chaos.patch6
-rw-r--r--target/linux/s3c24xx/patches-2.6.28/004-rename-serialdevs.patch7
-rw-r--r--target/linux/sibyte/Makefile2
-rw-r--r--target/linux/uml/Makefile2
15 files changed, 1186 insertions, 2351 deletions
diff --git a/include/kernel-version.mk b/include/kernel-version.mk
index 2fe6611a5..cb3678c12 100644
--- a/include/kernel-version.mk
+++ b/include/kernel-version.mk
@@ -31,8 +31,8 @@ endif
ifeq ($(LINUX_VERSION),2.6.27.13)
LINUX_KERNEL_MD5SUM:=e1035cd771ef2aed59396d8cab543a0c
endif
-ifeq ($(LINUX_VERSION),2.6.28)
- LINUX_KERNEL_MD5SUM:=d351e44709c9810b85e29b877f50968a
+ifeq ($(LINUX_VERSION),2.6.28.2)
+ LINUX_KERNEL_MD5SUM:=8fce853ebfe658f0833d34bb1dc14d86
endif
# disable the md5sum check for unknown kernel versions
diff --git a/target/linux/avr32/Makefile b/target/linux/avr32/Makefile
index 9baae6fcd..da6cd7aa2 100644
--- a/target/linux/avr32/Makefile
+++ b/target/linux/avr32/Makefile
@@ -10,7 +10,7 @@ ARCH:=avr32
BOARD:=avr32
BOARDNAME:=Atmel AVR32
FEATURES:=squashfs
-LINUX_VERSION:=2.6.28
+LINUX_VERSION:=2.6.28.2
include $(INCLUDE_DIR)/target.mk
diff --git a/target/linux/generic-2.6/patches-2.6.28/900-headers_type_and_time.patch b/target/linux/generic-2.6/patches-2.6.28/900-headers_type_and_time.patch
index 4127cd49f..f21478b08 100644
--- a/target/linux/generic-2.6/patches-2.6.28/900-headers_type_and_time.patch
+++ b/target/linux/generic-2.6/patches-2.6.28/900-headers_type_and_time.patch
@@ -11,7 +11,7 @@
#include <linux/types.h>
#ifdef __KERNEL__
-@@ -239,4 +243,6 @@ struct itimerval {
+@@ -240,4 +244,6 @@ struct itimerval {
*/
#define TIMER_ABSTIME 0x01
diff --git a/target/linux/generic-2.6/patches-2.6.28/924-cs5535_gpio.patch b/target/linux/generic-2.6/patches-2.6.28/924-cs5535_gpio.patch
index 94b9e21c2..453affe58 100644
--- a/target/linux/generic-2.6/patches-2.6.28/924-cs5535_gpio.patch
+++ b/target/linux/generic-2.6/patches-2.6.28/924-cs5535_gpio.patch
@@ -1,5 +1,5 @@
---- ../../cs5535_gpio.c.orig 2009-01-07 10:16:12.000000000 +0100
-+++ linux-2.6.28/drivers/char/cs5535_gpio.c 2009-01-07 10:13:54.000000000 +0100
+--- a/drivers/char/cs5535_gpio.c
++++ b/drivers/char/cs5535_gpio.c
@@ -15,6 +15,7 @@
#include <linux/kernel.h>
#include <linux/init.h>
@@ -8,7 +8,7 @@
#include <linux/ioport.h>
#include <linux/pci.h>
#include <linux/smp_lock.h>
-@@ -48,6 +49,7 @@
+@@ -48,6 +49,7 @@ static struct pci_device_id divil_pci[]
MODULE_DEVICE_TABLE(pci, divil_pci);
static struct cdev cs5535_gpio_cdev;
@@ -16,7 +16,7 @@
/* reserve 32 entries even though some aren't usable */
#define CS5535_GPIO_COUNT 32
-@@ -66,9 +68,14 @@
+@@ -66,9 +68,14 @@ static struct gpio_regmap rm[] =
{ 0x30, 0x00, '1', '0' }, /* GPIOx_READ_BACK / GPIOx_OUT_VAL */
{ 0x20, 0x20, 'I', 'i' }, /* GPIOx_IN_EN */
{ 0x04, 0x04, 'O', 'o' }, /* GPIOx_OUT_EN */
@@ -31,7 +31,7 @@
};
-@@ -177,7 +184,7 @@
+@@ -177,7 +184,7 @@ static int __init cs5535_gpio_init(void)
{
dev_t dev_id;
u32 low, hi;
@@ -40,7 +40,7 @@
if (pci_dev_present(divil_pci) == 0) {
printk(KERN_WARNING NAME ": DIVIL not found\n");
-@@ -232,23 +239,54 @@
+@@ -232,23 +239,54 @@ static int __init cs5535_gpio_init(void)
major = MAJOR(dev_id);
}
diff --git a/target/linux/generic-2.6/patches-2.6.28/971-ocf_20080917.patch b/target/linux/generic-2.6/patches-2.6.28/971-ocf_20080917.patch
index f7924c6b1..203266c56 100644
--- a/target/linux/generic-2.6/patches-2.6.28/971-ocf_20080917.patch
+++ b/target/linux/generic-2.6/patches-2.6.28/971-ocf_20080917.patch
@@ -88,7 +88,7 @@
/*********************************************************************
--- a/fs/fcntl.c
+++ b/fs/fcntl.c
-@@ -140,6 +140,7 @@ asmlinkage long sys_dup(unsigned int fil
+@@ -140,6 +140,7 @@ SYSCALL_DEFINE1(dup, unsigned int, filde
}
return ret;
}
diff --git a/target/linux/generic-2.6/patches-2.6.28/980-vm_exports.patch b/target/linux/generic-2.6/patches-2.6.28/980-vm_exports.patch
index ad36593a6..e0c7387cf 100644
--- a/target/linux/generic-2.6/patches-2.6.28/980-vm_exports.patch
+++ b/target/linux/generic-2.6/patches-2.6.28/980-vm_exports.patch
@@ -95,7 +95,7 @@
* We enter with non-exclusive mmap_sem (to exclude vma changes,
--- a/mm/vmalloc.c
+++ b/mm/vmalloc.c
-@@ -980,6 +980,7 @@ void unmap_kernel_range(unsigned long ad
+@@ -981,6 +981,7 @@ void unmap_kernel_range(unsigned long ad
vunmap_page_range(addr, end);
flush_tlb_kernel_range(addr, end);
}
@@ -103,7 +103,7 @@
int map_vm_area(struct vm_struct *area, pgprot_t prot, struct page ***pages)
{
-@@ -1085,6 +1086,7 @@ struct vm_struct *get_vm_area(unsigned l
+@@ -1086,6 +1087,7 @@ struct vm_struct *get_vm_area(unsigned l
return __get_vm_area_node(size, flags, VMALLOC_START, VMALLOC_END,
-1, GFP_KERNEL, __builtin_return_address(0));
}
diff --git a/target/linux/ixp4xx/Makefile b/target/linux/ixp4xx/Makefile
index 92da4c166..6a7ba81c4 100644
--- a/target/linux/ixp4xx/Makefile
+++ b/target/linux/ixp4xx/Makefile
@@ -12,7 +12,7 @@ BOARDNAME:=Intel IXP4xx
FEATURES:=squashfs
SUBTARGETS=generic harddisk
-LINUX_VERSION:=2.6.28.1
+LINUX_VERSION:=2.6.28.2
include $(INCLUDE_DIR)/target.mk
diff --git a/target/linux/orion/Makefile b/target/linux/orion/Makefile
index 506fc2173..cc57848a1 100644
--- a/target/linux/orion/Makefile
+++ b/target/linux/orion/Makefile
@@ -11,7 +11,7 @@ BOARD:=orion
BOARDNAME:=Marvell Orion
FEATURES:=squashfs
-LINUX_VERSION:=2.6.28
+LINUX_VERSION:=2.6.28.2
include $(INCLUDE_DIR)/target.mk
diff --git a/target/linux/s3c24xx/Makefile b/target/linux/s3c24xx/Makefile
index acd3b926c..d6fc80a96 100644
--- a/target/linux/s3c24xx/Makefile
+++ b/target/linux/s3c24xx/Makefile
@@ -11,7 +11,7 @@ BOARD:=s3c24xx
BOARDNAME:=s3c24xx
FEATURES:=jffs2
-LINUX_VERSION:=2.6.28
+LINUX_VERSION:=2.6.28.2
DEVICE_TYPE=phone
diff --git a/target/linux/s3c24xx/patches-2.6.28/001-merge-openmoko.patch b/target/linux/s3c24xx/patches-2.6.28/001-merge-openmoko.patch
index 3a04ef71a..79763135d 100644
--- a/target/linux/s3c24xx/patches-2.6.28/001-merge-openmoko.patch
+++ b/target/linux/s3c24xx/patches-2.6.28/001-merge-openmoko.patch
@@ -5,10 +5,8 @@ mb@homer Thu Jan 1 22:58:51 UTC 2009
---
-Index: linux-2.6.28/arch/arm/common/vic.c
-===================================================================
---- linux-2.6.28.orig/arch/arm/common/vic.c 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.28/arch/arm/common/vic.c 2009-01-02 00:01:56.000000000 +0100
+--- a/arch/arm/common/vic.c
++++ b/arch/arm/common/vic.c
@@ -69,12 +69,12 @@ void __init vic_init(void __iomem *base,
/*
* Make sure we clear all existing interrupts
@@ -34,10 +32,8 @@ Index: linux-2.6.28/arch/arm/common/vic.c
for (i = 0; i < 32; i++) {
unsigned int irq = irq_start + i;
-Index: linux-2.6.28/arch/arm/configs/gta02-moredrivers-defconfig
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/arch/arm/configs/gta02-moredrivers-defconfig 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/arch/arm/configs/gta02-moredrivers-defconfig
@@ -0,0 +1,2107 @@
+#
+# Automatically generated make config: don't edit
@@ -2146,10 +2142,8 @@ Index: linux-2.6.28/arch/arm/configs/gta02-moredrivers-defconfig
+CONFIG_PLIST=y
+CONFIG_HAS_IOMEM=y
+CONFIG_HAS_DMA=y
-Index: linux-2.6.28/arch/arm/configs/gta02-packaging-defconfig
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/arch/arm/configs/gta02-packaging-defconfig 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/arch/arm/configs/gta02-packaging-defconfig
@@ -0,0 +1,2111 @@
+#
+# Automatically generated make config: don't edit
@@ -4262,10 +4256,8 @@ Index: linux-2.6.28/arch/arm/configs/gta02-packaging-defconfig
+CONFIG_PLIST=y
+CONFIG_HAS_IOMEM=y
+CONFIG_HAS_DMA=y
-Index: linux-2.6.28/arch/arm/configs/gta03_defconfig
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/arch/arm/configs/gta03_defconfig 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/arch/arm/configs/gta03_defconfig
@@ -0,0 +1,1548 @@
+#
+# Automatically generated make config: don't edit
@@ -5815,10 +5807,8 @@ Index: linux-2.6.28/arch/arm/configs/gta03_defconfig
+CONFIG_PLIST=y
+CONFIG_HAS_IOMEM=y
+CONFIG_HAS_DMA=y
-Index: linux-2.6.28/arch/arm/configs/s3c6400_defconfig
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/arch/arm/configs/s3c6400_defconfig 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/arch/arm/configs/s3c6400_defconfig
@@ -0,0 +1,845 @@
+#
+# Automatically generated make config: don't edit
@@ -6665,10 +6655,8 @@ Index: linux-2.6.28/arch/arm/configs/s3c6400_defconfig
+CONFIG_PLIST=y
+CONFIG_HAS_IOMEM=y
+CONFIG_HAS_DMA=y
-Index: linux-2.6.28/arch/arm/Kconfig
-===================================================================
---- linux-2.6.28.orig/arch/arm/Kconfig 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.28/arch/arm/Kconfig 2009-01-02 00:01:56.000000000 +0100
+--- a/arch/arm/Kconfig
++++ b/arch/arm/Kconfig
@@ -498,6 +498,13 @@ config ARCH_S3C2410
BAST (<http://www.simtec.co.uk/products/EB110ITX/>), the IPAQ 1940 or
the Samsung SMDK2410 development board (and derivatives).
@@ -6721,10 +6709,8 @@ Index: linux-2.6.28/arch/arm/Kconfig
source "drivers/dca/Kconfig"
source "drivers/auxdisplay/Kconfig"
-Index: linux-2.6.28/arch/arm/kernel/vmlinux.lds.S
-===================================================================
---- linux-2.6.28.orig/arch/arm/kernel/vmlinux.lds.S 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.28/arch/arm/kernel/vmlinux.lds.S 2009-01-02 00:01:56.000000000 +0100
+--- a/arch/arm/kernel/vmlinux.lds.S
++++ b/arch/arm/kernel/vmlinux.lds.S
@@ -106,6 +106,8 @@ SECTIONS
*(.got) /* Global offset table */
}
@@ -6734,10 +6720,8 @@ Index: linux-2.6.28/arch/arm/kernel/vmlinux.lds.S
RODATA
_etext = .; /* End of text and rodata section */
-Index: linux-2.6.28/arch/arm/mach-s3c2410/clock.c
-===================================================================
---- linux-2.6.28.orig/arch/arm/mach-s3c2410/clock.c 2008-12-25 00:26:37.000000000 +0100
-+++ /dev/null 1970-01-01 00:00:00.000000000 +0000
+--- a/arch/arm/mach-s3c2410/clock.c
++++ /dev/null
@@ -1,276 +0,0 @@
-/* linux/arch/arm/mach-s3c2410/clock.c
- *
@@ -7015,10 +6999,8 @@ Index: linux-2.6.28/arch/arm/mach-s3c2410/clock.c
-
- return 0;
-}
-Index: linux-2.6.28/arch/arm/mach-s3c2410/dma.c
-===================================================================
---- linux-2.6.28.orig/arch/arm/mach-s3c2410/dma.c 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.28/arch/arm/mach-s3c2410/dma.c 2009-01-02 00:01:56.000000000 +0100
+--- a/arch/arm/mach-s3c2410/dma.c
++++ b/arch/arm/mach-s3c2410/dma.c
@@ -25,12 +25,12 @@
#include <plat/regs-serial.h>
@@ -7034,10 +7016,8 @@ Index: linux-2.6.28/arch/arm/mach-s3c2410/dma.c
static struct s3c24xx_dma_map __initdata s3c2410_dma_mappings[] = {
[DMACH_XD0] = {
-Index: linux-2.6.28/arch/arm/mach-s3c2410/include/mach/fiq_ipc_gta02.h
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/arch/arm/mach-s3c2410/include/mach/fiq_ipc_gta02.h 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/arch/arm/mach-s3c2410/include/mach/fiq_ipc_gta02.h
@@ -0,0 +1,60 @@
+#ifndef _LINUX_FIQ_IPC_H
+#define _LINUX_FIQ_IPC_H
@@ -7099,10 +7079,8 @@ Index: linux-2.6.28/arch/arm/mach-s3c2410/include/mach/fiq_ipc_gta02.h
+extern void fiq_kick(void); /* provoke a FIQ "immediately" */
+
+#endif /* _LINUX_FIQ_IPC_H */
-Index: linux-2.6.28/arch/arm/mach-s3c2410/include/mach/gpio-core.h
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/arch/arm/mach-s3c2410/include/mach/gpio-core.h 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/arch/arm/mach-s3c2410/include/mach/gpio-core.h
@@ -0,0 +1,21 @@
+/* arch/arm/mach-s3c24100/include/mach/gpio-core.h
+ *
@@ -7125,10 +7103,8 @@ Index: linux-2.6.28/arch/arm/mach-s3c2410/include/mach/gpio-core.h
+#include <plat/gpio-core.h>
+
+#endif /* __ASM_ARCH_GPIO_CORE_H */
-Index: linux-2.6.28/arch/arm/mach-s3c2410/include/mach/gpio.h
-===================================================================
---- linux-2.6.28.orig/arch/arm/mach-s3c2410/include/mach/gpio.h 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.28/arch/arm/mach-s3c2410/include/mach/gpio.h 2009-01-02 00:01:56.000000000 +0100
+--- a/arch/arm/mach-s3c2410/include/mach/gpio.h
++++ b/arch/arm/mach-s3c2410/include/mach/gpio.h
@@ -15,4 +15,14 @@
#define gpio_set_value __gpio_set_value
#define gpio_cansleep __gpio_cansleep
@@ -7144,10 +7120,8 @@ Index: linux-2.6.28/arch/arm/mach-s3c2410/include/mach/gpio.h
+#include <mach/gpio-nrs.h>
+
+#define S3C_GPIO_END (S3C2410_GPIO_BANKH + 32)
-Index: linux-2.6.28/arch/arm/mach-s3c2410/include/mach/gpio-nrs.h
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/arch/arm/mach-s3c2410/include/mach/gpio-nrs.h 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/arch/arm/mach-s3c2410/include/mach/gpio-nrs.h
@@ -0,0 +1,23 @@
+/* arch/arm/mach-s3c2410/include/mach/gpio-nrs.h
+ *
@@ -7172,10 +7146,8 @@ Index: linux-2.6.28/arch/arm/mach-s3c2410/include/mach/gpio-nrs.h
+#define S3C2410_GPIO_BANKF (32*5)
+#define S3C2410_GPIO_BANKG (32*6)
+#define S3C2410_GPIO_BANKH (32*7)
-Index: linux-2.6.28/arch/arm/mach-s3c2410/include/mach/gta01.h
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/arch/arm/mach-s3c2410/include/mach/gta01.h 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/arch/arm/mach-s3c2410/include/mach/gta01.h
@@ -0,0 +1,74 @@
+#ifndef _GTA01_H
+#define _GTA01_H
@@ -7251,10 +7223,8 @@ Index: linux-2.6.28/arch/arm/mach-s3c2410/include/mach/gta01.h
+#define GTA01Bv4_IRQ_PCF50606 IRQ_EINT9
+
+#endif /* _GTA01_H */
-Index: linux-2.6.28/arch/arm/mach-s3c2410/include/mach/gta02.h
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/arch/arm/mach-s3c2410/include/mach/gta02.h 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/arch/arm/mach-s3c2410/include/mach/gta02.h
@@ -0,0 +1,113 @@
+#ifndef _GTA02_H
+#define _GTA02_H
@@ -7369,16 +7339,12 @@ Index: linux-2.6.28/arch/arm/mach-s3c2410/include/mach/gta02.h
+extern struct pcf50633_platform_data gta02_pcf_pdata;
+
+#endif /* _GTA02_H */
-Index: linux-2.6.28/arch/arm/mach-s3c2410/include/mach/gta02-pm-wlan.h
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/arch/arm/mach-s3c2410/include/mach/gta02-pm-wlan.h 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/arch/arm/mach-s3c2410/include/mach/gta02-pm-wlan.h
@@ -0,0 +1 @@
+void gta02_wlan_power(int on);
-Index: linux-2.6.28/arch/arm/mach-s3c2410/include/mach/irqs.h
-===================================================================
---- linux-2.6.28.orig/arch/arm/mach-s3c2410/include/mach/irqs.h 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.28/arch/arm/mach-s3c2410/include/mach/irqs.h 2009-01-02 00:01:56.000000000 +0100
+--- a/arch/arm/mach-s3c2410/include/mach/irqs.h
++++ b/arch/arm/mach-s3c2410/include/mach/irqs.h
@@ -12,9 +12,9 @@
#ifndef __ASM_ARCH_IRQS_H
#define __ASM_ARCH_IRQS_H __FILE__
@@ -7460,10 +7426,8 @@ Index: linux-2.6.28/arch/arm/mach-s3c2410/include/mach/irqs.h
+#define IRQ_GLAMO_RISC IRQ_GLAMO(8)
+
#endif /* __ASM_ARCH_IRQ_H */
-Index: linux-2.6.28/arch/arm/mach-s3c2410/include/mach/map.h
-===================================================================
---- linux-2.6.28.orig/arch/arm/mach-s3c2410/include/mach/map.h 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.28/arch/arm/mach-s3c2410/include/mach/map.h 2009-01-02 00:01:56.000000000 +0100
+--- a/arch/arm/mach-s3c2410/include/mach/map.h
++++ b/arch/arm/mach-s3c2410/include/mach/map.h
@@ -13,34 +13,20 @@
#ifndef __ASM_ARCH_MAP_H
#define __ASM_ARCH_MAP_H
@@ -7612,10 +7576,8 @@ Index: linux-2.6.28/arch/arm/mach-s3c2410/include/mach/map.h
+#define S3C_PA_HSMMC0 S3C2443_PA_HSMMC
#endif /* __ASM_ARCH_MAP_H */
-Index: linux-2.6.28/arch/arm/mach-s3c2410/include/mach/mci.h
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/arch/arm/mach-s3c2410/include/mach/mci.h 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/arch/arm/mach-s3c2410/include/mach/mci.h
@@ -0,0 +1,13 @@
+#ifndef _ARCH_MCI_H
+#define _ARCH_MCI_H
@@ -7630,16 +7592,12 @@ Index: linux-2.6.28/arch/arm/mach-s3c2410/include/mach/mci.h
+};
+
+#endif /* _ARCH_NCI_H */
-Index: linux-2.6.28/arch/arm/mach-s3c2410/include/mach/neo1973-pm-gsm.h
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/arch/arm/mach-s3c2410/include/mach/neo1973-pm-gsm.h 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/arch/arm/mach-s3c2410/include/mach/neo1973-pm-gsm.h
@@ -0,0 +1 @@
+extern int gta_gsm_interrupts;
-Index: linux-2.6.28/arch/arm/mach-s3c2410/include/mach/pwm.h
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/arch/arm/mach-s3c2410/include/mach/pwm.h 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/arch/arm/mach-s3c2410/include/mach/pwm.h
@@ -0,0 +1,46 @@
+#ifndef __S3C2410_PWM_H
+#define __S3C2410_PWM_H
@@ -7687,10 +7645,8 @@ Index: linux-2.6.28/arch/arm/mach-s3c2410/include/mach/pwm.h
+int s3c2410_pwm_dumpregs(void);
+
+#endif /* __S3C2410_PWM_H */
-Index: linux-2.6.28/arch/arm/mach-s3c2410/include/mach/regs-clock.h
-===================================================================
---- linux-2.6.28.orig/arch/arm/mach-s3c2410/include/mach/regs-clock.h 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.28/arch/arm/mach-s3c2410/include/mach/regs-clock.h 2009-01-02 00:01:56.000000000 +0100
+--- a/arch/arm/mach-s3c2410/include/mach/regs-clock.h
++++ b/arch/arm/mach-s3c2410/include/mach/regs-clock.h
@@ -42,13 +42,6 @@
#define S3C2410_CLKCON_IIS (1<<17)
#define S3C2410_CLKCON_SPI (1<<18)
@@ -7738,10 +7694,8 @@ Index: linux-2.6.28/arch/arm/mach-s3c2410/include/mach/regs-clock.h
#if defined(CONFIG_CPU_S3C2440) || defined(CONFIG_CPU_S3C2442)
/* extra registers */
-Index: linux-2.6.28/arch/arm/mach-s3c2410/include/mach/regs-gpio.h
-===================================================================
---- linux-2.6.28.orig/arch/arm/mach-s3c2410/include/mach/regs-gpio.h 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.28/arch/arm/mach-s3c2410/include/mach/regs-gpio.h 2009-01-02 00:01:56.000000000 +0100
+--- a/arch/arm/mach-s3c2410/include/mach/regs-gpio.h
++++ b/arch/arm/mach-s3c2410/include/mach/regs-gpio.h
@@ -14,16 +14,7 @@
#ifndef __ASM_ARCH_REGS_GPIO_H
#define __ASM_ARCH_REGS_GPIO_H
@@ -7774,10 +7728,8 @@ Index: linux-2.6.28/arch/arm/mach-s3c2410/include/mach/regs-gpio.h
/* interrupt filtering conrrol for EINT16..EINT23 */
#define S3C2410_EINFLT0 S3C2410_GPIOREG(0x94)
#define S3C2410_EINFLT1 S3C2410_GPIOREG(0x98)
-Index: linux-2.6.28/arch/arm/mach-s3c2410/include/mach/regs-sdi.h
-===================================================================
---- linux-2.6.28.orig/arch/arm/mach-s3c2410/include/mach/regs-sdi.h 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.28/arch/arm/mach-s3c2410/include/mach/regs-sdi.h 2009-01-02 00:01:56.000000000 +0100
+--- a/arch/arm/mach-s3c2410/include/mach/regs-sdi.h
++++ b/arch/arm/mach-s3c2410/include/mach/regs-sdi.h
@@ -30,6 +30,7 @@
#define S3C2410_SDIFSTA (0x38)
@@ -7795,20 +7747,16 @@ Index: linux-2.6.28/arch/arm/mach-s3c2410/include/mach/regs-sdi.h
#define S3C2410_SDICON_BYTEORDER (1<<4)
#define S3C2410_SDICON_SDIOIRQ (1<<3)
#define S3C2410_SDICON_RWAITEN (1<<2)
-Index: linux-2.6.28/arch/arm/mach-s3c2410/include/mach/s3c24xx-serial.h
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/arch/arm/mach-s3c2410/include/mach/s3c24xx-serial.h 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/arch/arm/mach-s3c2410/include/mach/s3c24xx-serial.h
@@ -0,0 +1,5 @@
+#include <linux/resume-dependency.h>
+
+extern void s3c24xx_serial_console_set_silence(int silence);
+extern void s3c24xx_serial_register_resume_dependency(struct resume_dependency *
+ resume_dependency, int uart_index);
-Index: linux-2.6.28/arch/arm/mach-s3c2410/include/mach/spi-gpio.h
-===================================================================
---- linux-2.6.28.orig/arch/arm/mach-s3c2410/include/mach/spi-gpio.h 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.28/arch/arm/mach-s3c2410/include/mach/spi-gpio.h 2009-01-02 00:43:03.000000000 +0100
+--- a/arch/arm/mach-s3c2410/include/mach/spi-gpio.h
++++ b/arch/arm/mach-s3c2410/include/mach/spi-gpio.h
@@ -21,7 +21,15 @@ struct s3c2410_spigpio_info {
int num_chipselect;
int bus_num;
@@ -7826,10 +7774,8 @@ Index: linux-2.6.28/arch/arm/mach-s3c2410/include/mach/spi-gpio.h
};
-Index: linux-2.6.28/arch/arm/mach-s3c2410/include/mach/spi.h
-===================================================================
---- linux-2.6.28.orig/arch/arm/mach-s3c2410/include/mach/spi.h 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.28/arch/arm/mach-s3c2410/include/mach/spi.h 2009-01-02 00:01:56.000000000 +0100
+--- a/arch/arm/mach-s3c2410/include/mach/spi.h
++++ b/arch/arm/mach-s3c2410/include/mach/spi.h
@@ -22,5 +22,12 @@ struct s3c2410_spi_info {
void (*set_cs)(struct s3c2410_spi_info *spi, int cs, int pol);
};
@@ -7843,10 +7789,8 @@ Index: linux-2.6.28/arch/arm/mach-s3c2410/include/mach/spi.h
+ int enable);
#endif /* __ASM_ARCH_SPI_H */
-Index: linux-2.6.28/arch/arm/mach-s3c2410/include/mach/system-reset.h
-===================================================================
---- linux-2.6.28.orig/arch/arm/mach-s3c2410/include/mach/system-reset.h 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.28/arch/arm/mach-s3c2410/include/mach/system-reset.h 2009-01-02 00:01:56.000000000 +0100
+--- a/arch/arm/mach-s3c2410/include/mach/system-reset.h
++++ b/arch/arm/mach-s3c2410/include/mach/system-reset.h
@@ -13,7 +13,7 @@
#include <mach/hardware.h>
#include <linux/io.h>
@@ -7856,10 +7800,8 @@ Index: linux-2.6.28/arch/arm/mach-s3c2410/include/mach/system-reset.h
#include <mach/regs-clock.h>
#include <linux/clk.h>
-Index: linux-2.6.28/arch/arm/mach-s3c2410/include/mach/tick.h
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/arch/arm/mach-s3c2410/include/mach/tick.h 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/arch/arm/mach-s3c2410/include/mach/tick.h
@@ -0,0 +1,15 @@
+/* linux/arch/arm/mach-s3c2410/include/mach/tick.h
+ *
@@ -7876,10 +7818,8 @@ Index: linux-2.6.28/arch/arm/mach-s3c2410/include/mach/tick.h
+{
+ return __raw_readl(S3C2410_SRCPND) & SRCPND_TIMER4;
+}
-Index: linux-2.6.28/arch/arm/mach-s3c2410/include/mach/timex.h
-===================================================================
---- linux-2.6.28.orig/arch/arm/mach-s3c2410/include/mach/timex.h 2008-12-25 00:26:37.000000000 +0100
-+++ /dev/null 1970-01-01 00:00:00.000000000 +0000
+--- a/arch/arm/mach-s3c2410/include/mach/timex.h
++++ /dev/null
@@ -1,26 +0,0 @@
-/* arch/arm/mach-s3c2410/include/mach/timex.h
- *
@@ -7907,10 +7847,8 @@ Index: linux-2.6.28/arch/arm/mach-s3c2410/include/mach/timex.h
-
-
-#endif /* __ASM_ARCH_TIMEX_H */
-Index: linux-2.6.28/arch/arm/mach-s3c2410/include/mach/ts.h
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/arch/arm/mach-s3c2410/include/mach/ts.h 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/arch/arm/mach-s3c2410/include/mach/ts.h
@@ -0,0 +1,35 @@
+/* arch/arm/mach-s3c2410/include/mach/ts.h
+ *
@@ -7947,19 +7885,15 @@ Index: linux-2.6.28/arch/arm/mach-s3c2410/include/mach/ts.h
+
+#endif /* __ASM_ARM_TS_H */
+
-Index: linux-2.6.28/arch/arm/mach-s3c2410/include/mach/uncompress.h
-===================================================================
---- linux-2.6.28.orig/arch/arm/mach-s3c2410/include/mach/uncompress.h 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.28/arch/arm/mach-s3c2410/include/mach/uncompress.h 2009-01-02 00:01:56.000000000 +0100
+--- a/arch/arm/mach-s3c2410/include/mach/uncompress.h
++++ b/arch/arm/mach-s3c2410/include/mach/uncompress.h
@@ -1,3 +1,4 @@
+
/* arch/arm/mach-s3c2410/include/mach/uncompress.h
*
* Copyright (c) 2003, 2007 Simtec Electronics
-Index: linux-2.6.28/arch/arm/mach-s3c2410/include/mach/vmalloc.h
-===================================================================
---- linux-2.6.28.orig/arch/arm/mach-s3c2410/include/mach/vmalloc.h 2008-12-25 00:26:37.000000000 +0100
-+++ /dev/null 1970-01-01 00:00:00.000000000 +0000
+--- a/arch/arm/mach-s3c2410/include/mach/vmalloc.h
++++ /dev/null
@@ -1,20 +0,0 @@
-/* arch/arm/mach-s3c2410/include/mach/vmalloc.h
- *
@@ -7981,10 +7915,8 @@ Index: linux-2.6.28/arch/arm/mach-s3c2410/include/mach/vmalloc.h
-#define VMALLOC_END (0xE0000000)
-
-#endif /* __ASM_ARCH_VMALLOC_H */
-Index: linux-2.6.28/arch/arm/mach-s3c2410/Kconfig
-===================================================================
---- linux-2.6.28.orig/arch/arm/mach-s3c2410/Kconfig 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.28/arch/arm/mach-s3c2410/Kconfig 2009-01-02 00:01:56.000000000 +0100
+--- a/arch/arm/mach-s3c2410/Kconfig
++++ b/arch/arm/mach-s3c2410/Kconfig
@@ -9,6 +9,7 @@ config CPU_S3C2410
depends on ARCH_S3C2410
select S3C2410_CLOCK
@@ -8051,10 +7983,8 @@ Index: linux-2.6.28/arch/arm/mach-s3c2410/Kconfig
+ Say Y here if you are using the FIC Neo1973 GSM Phone
+
endmenu
-Index: linux-2.6.28/arch/arm/mach-s3c2410/mach-amlm5900.c
-===================================================================
---- linux-2.6.28.orig/arch/arm/mach-s3c2410/mach-amlm5900.c 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.28/arch/arm/mach-s3c2410/mach-amlm5900.c 2009-01-02 00:01:56.000000000 +0100
+--- a/arch/arm/mach-s3c2410/mach-amlm5900.c
++++ b/arch/arm/mach-s3c2410/mach-amlm5900.c
@@ -52,6 +52,7 @@
#include <mach/regs-lcd.h>
#include <mach/regs-gpio.h>
@@ -8080,10 +8010,8 @@ Index: linux-2.6.28/arch/arm/mach-s3c2410/mach-amlm5900.c
platform_add_devices(amlm5900_devices, ARRAY_SIZE(amlm5900_devices));
}
-Index: linux-2.6.28/arch/arm/mach-s3c2410/mach-bast.c
-===================================================================
---- linux-2.6.28.orig/arch/arm/mach-s3c2410/mach-bast.c 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.28/arch/arm/mach-s3c2410/mach-bast.c 2009-01-02 00:01:56.000000000 +0100
+--- a/arch/arm/mach-s3c2410/mach-bast.c
++++ b/arch/arm/mach-s3c2410/mach-bast.c
@@ -44,8 +44,8 @@
#include <mach/regs-mem.h>
#include <mach/regs-lcd.h>
@@ -8123,10 +8051,8 @@ Index: linux-2.6.28/arch/arm/mach-s3c2410/mach-bast.c
s3c24xx_init_io(bast_iodesc, ARRAY_SIZE(bast_iodesc));
s3c24xx_init_clocks(0);
-Index: linux-2.6.28/arch/arm/mach-s3c2410/mach-gta01.c
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/arch/arm/mach-s3c2410/mach-gta01.c 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/arch/arm/mach-s3c2410/mach-gta01.c
@@ -0,0 +1,786 @@
+/*
+ * linux/arch/arm/mach-s3c2410/mach-gta01.c
@@ -8914,10 +8840,8 @@ Index: linux-2.6.28/arch/arm/mach-s3c2410/mach-gta01.c
+ .init_machine = gta01_machine_init,
+ .timer = &s3c24xx_timer,
+MACHINE_END
-Index: linux-2.6.28/arch/arm/mach-s3c2410/mach-h1940.c
-===================================================================
---- linux-2.6.28.orig/arch/arm/mach-s3c2410/mach-h1940.c 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.28/arch/arm/mach-s3c2410/mach-h1940.c 2009-01-02 00:01:56.000000000 +0100
+--- a/arch/arm/mach-s3c2410/mach-h1940.c
++++ b/arch/arm/mach-s3c2410/mach-h1940.c
@@ -38,11 +38,13 @@
#include <mach/h1940.h>
#include <mach/h1940-latch.h>
@@ -8990,10 +8914,8 @@ Index: linux-2.6.28/arch/arm/mach-s3c2410/mach-h1940.c
writel(tmp, S3C2410_UPLLCON);
platform_add_devices(h1940_devices, ARRAY_SIZE(h1940_devices));
-Index: linux-2.6.28/arch/arm/mach-s3c2410/mach-n30.c
-===================================================================
---- linux-2.6.28.orig/arch/arm/mach-s3c2410/mach-n30.c 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.28/arch/arm/mach-s3c2410/mach-n30.c 2009-01-02 00:01:56.000000000 +0100
+--- a/arch/arm/mach-s3c2410/mach-n30.c
++++ b/arch/arm/mach-s3c2410/mach-n30.c
@@ -40,14 +40,14 @@
#include <asm/mach/irq.h>
#include <asm/mach/map.h>
@@ -9038,10 +8960,8 @@ Index: linux-2.6.28/arch/arm/mach-s3c2410/mach-n30.c
s3c24xx_udc_set_platdata(&n30_udc_cfg);
/* Turn off suspend on both USB ports, and switch the
-Index: linux-2.6.28/arch/arm/mach-s3c2410/mach-otom.c
-===================================================================
---- linux-2.6.28.orig/arch/arm/mach-s3c2410/mach-otom.c 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.28/arch/arm/mach-s3c2410/mach-otom.c 2009-01-02 00:01:56.000000000 +0100
+--- a/arch/arm/mach-s3c2410/mach-otom.c
++++ b/arch/arm/mach-s3c2410/mach-otom.c
@@ -35,6 +35,7 @@
#include <plat/s3c2410.h>
#include <plat/clock.h>
@@ -9067,10 +8987,8 @@ Index: linux-2.6.28/arch/arm/mach-s3c2410/mach-otom.c
platform_add_devices(otom11_devices, ARRAY_SIZE(otom11_devices));
}
-Index: linux-2.6.28/arch/arm/mach-s3c2410/mach-qt2410.c
-===================================================================
---- linux-2.6.28.orig/arch/arm/mach-s3c2410/mach-qt2410.c 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.28/arch/arm/mach-s3c2410/mach-qt2410.c 2009-01-02 00:01:56.000000000 +0100
+--- a/arch/arm/mach-s3c2410/mach-qt2410.c
++++ b/arch/arm/mach-s3c2410/mach-qt2410.c
@@ -1,6 +1,6 @@
/* linux/arch/arm/mach-s3c2410/mach-qt2410.c
*
@@ -9150,10 +9068,8 @@ Index: linux-2.6.28/arch/arm/mach-s3c2410/mach-qt2410.c
}
MACHINE_START(QT2410, "QT2410")
-Index: linux-2.6.28/arch/arm/mach-s3c2410/mach-smdk2410.c
-===================================================================
---- linux-2.6.28.orig/arch/arm/mach-s3c2410/mach-smdk2410.c 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.28/arch/arm/mach-s3c2410/mach-smdk2410.c 2009-01-02 00:01:56.000000000 +0100
+--- a/arch/arm/mach-s3c2410/mach-smdk2410.c
++++ b/arch/arm/mach-s3c2410/mach-smdk2410.c
@@ -47,6 +47,7 @@
#include <asm/mach-types.h>
@@ -9179,10 +9095,8 @@ Index: linux-2.6.28/arch/arm/mach-s3c2410/mach-smdk2410.c
platform_add_devices(smdk2410_devices, ARRAY_SIZE(smdk2410_devices));
smdk_machine_init();
}
-Index: linux-2.6.28/arch/arm/mach-s3c2410/mach-tct_hammer.c
-===================================================================
---- linux-2.6.28.orig/arch/arm/mach-s3c2410/mach-tct_hammer.c 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.28/arch/arm/mach-s3c2410/mach-tct_hammer.c 2009-01-02 00:01:56.000000000 +0100
+--- a/arch/arm/mach-s3c2410/mach-tct_hammer.c
++++ b/arch/arm/mach-s3c2410/mach-tct_hammer.c
@@ -45,6 +45,7 @@
#include <asm/mach-types.h>
@@ -9208,10 +9122,8 @@ Index: linux-2.6.28/arch/arm/mach-s3c2410/mach-tct_hammer.c
platform_add_devices(tct_hammer_devices, ARRAY_SIZE(tct_hammer_devices));
}
-Index: linux-2.6.28/arch/arm/mach-s3c2410/mach-vr1000.c
-===================================================================
---- linux-2.6.28.orig/arch/arm/mach-s3c2410/mach-vr1000.c 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.28/arch/arm/mach-s3c2410/mach-vr1000.c 2009-01-02 00:01:56.000000000 +0100
+--- a/arch/arm/mach-s3c2410/mach-vr1000.c
++++ b/arch/arm/mach-s3c2410/mach-vr1000.c
@@ -47,6 +47,7 @@
#include <plat/clock.h>
#include <plat/devs.h>
@@ -9237,10 +9149,8 @@ Index: linux-2.6.28/arch/arm/mach-s3c2410/mach-vr1000.c
platform_add_devices(vr1000_devices, ARRAY_SIZE(vr1000_devices));
i2c_register_board_info(0, vr1000_i2c_devs,
-Index: linux-2.6.28/arch/arm/mach-s3c2410/Makefile
-===================================================================
---- linux-2.6.28.orig/arch/arm/mach-s3c2410/Makefile 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.28/arch/arm/mach-s3c2410/Makefile 2009-01-02 00:01:56.000000000 +0100
+--- a/arch/arm/mach-s3c2410/Makefile
++++ b/arch/arm/mach-s3c2410/Makefile
@@ -15,7 +15,8 @@ obj-$(CONFIG_CPU_S3C2410_DMA) += dma.o
obj-$(CONFIG_CPU_S3C2410_DMA) += dma.o
obj-$(CONFIG_S3C2410_PM) += pm.o sleep.o
@@ -9257,10 +9167,8 @@ Index: linux-2.6.28/arch/arm/mach-s3c2410/Makefile
obj-$(CONFIG_MACH_BAST_IDE) += bast-ide.o
+obj-$(CONFIG_MACH_NEO1973_GTA01)+= mach-gta01.o
+
-Index: linux-2.6.28/arch/arm/mach-s3c2410/pm.c
-===================================================================
---- linux-2.6.28.orig/arch/arm/mach-s3c2410/pm.c 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.28/arch/arm/mach-s3c2410/pm.c 2009-01-02 00:01:56.000000000 +0100
+--- a/arch/arm/mach-s3c2410/pm.c
++++ b/arch/arm/mach-s3c2410/pm.c
@@ -37,21 +37,14 @@
#include <plat/cpu.h>
#include <plat/pm.h>
@@ -9286,10 +9194,8 @@ Index: linux-2.6.28/arch/arm/mach-s3c2410/pm.c
if (machine_is_h1940()) {
void *base = phys_to_virt(H1940_SUSPEND_CHECK);
-Index: linux-2.6.28/arch/arm/mach-s3c2410/pwm.c
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/arch/arm/mach-s3c2410/pwm.c 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/arch/arm/mach-s3c2410/pwm.c
@@ -0,0 +1,288 @@
+/*
+ * arch/arm/mach-s3c2410/3c2410-pwm.c
@@ -9579,10 +9485,8 @@ Index: linux-2.6.28/arch/arm/mach-s3c2410/pwm.c
+
+module_init(s3c24xx_pwm_init);
+module_exit(s3c24xx_pwm_exit);
-Index: linux-2.6.28/arch/arm/mach-s3c2410/s3c2410.c
-===================================================================
---- linux-2.6.28.orig/arch/arm/mach-s3c2410/s3c2410.c 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.28/arch/arm/mach-s3c2410/s3c2410.c 2009-01-02 00:01:56.000000000 +0100
+--- a/arch/arm/mach-s3c2410/s3c2410.c
++++ b/arch/arm/mach-s3c2410/s3c2410.c
@@ -16,6 +16,7 @@
#include <linux/list.h>
#include <linux/timer.h>
@@ -9658,10 +9562,8 @@ Index: linux-2.6.28/arch/arm/mach-s3c2410/s3c2410.c
s3c2410_baseclk_add();
}
-Index: linux-2.6.28/arch/arm/mach-s3c2412/clock.c
-===================================================================
---- linux-2.6.28.orig/arch/arm/mach-s3c2412/clock.c 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.28/arch/arm/mach-s3c2412/clock.c 2009-01-02 00:01:56.000000000 +0100
+--- a/arch/arm/mach-s3c2412/clock.c
++++ b/arch/arm/mach-s3c2412/clock.c
@@ -93,12 +93,6 @@ static int s3c2412_upll_enable(struct cl
/* clock selections */
@@ -9682,10 +9584,8 @@ Index: linux-2.6.28/arch/arm/mach-s3c2412/clock.c
+ s3c_pwmclk_init();
return 0;
}
-Index: linux-2.6.28/arch/arm/mach-s3c2412/dma.c
-===================================================================
---- linux-2.6.28.orig/arch/arm/mach-s3c2412/dma.c 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.28/arch/arm/mach-s3c2412/dma.c 2009-01-02 00:01:56.000000000 +0100
+--- a/arch/arm/mach-s3c2412/dma.c
++++ b/arch/arm/mach-s3c2412/dma.c
@@ -26,13 +26,13 @@
#include <plat/regs-serial.h>
@@ -9702,10 +9602,8 @@ Index: linux-2.6.28/arch/arm/mach-s3c2412/dma.c
#define MAP(x) { (x)| DMA_CH_VALID, (x)| DMA_CH_VALID, (x)| DMA_CH_VALID, (x)| DMA_CH_VALID }
-Index: linux-2.6.28/arch/arm/mach-s3c2412/mach-jive.c
-===================================================================
---- linux-2.6.28.orig/arch/arm/mach-s3c2412/mach-jive.c 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.28/arch/arm/mach-s3c2412/mach-jive.c 2009-01-02 00:01:56.000000000 +0100
+--- a/arch/arm/mach-s3c2412/mach-jive.c
++++ b/arch/arm/mach-s3c2412/mach-jive.c
@@ -31,8 +31,8 @@
#include <asm/mach/irq.h>
@@ -9780,10 +9678,8 @@ Index: linux-2.6.28/arch/arm/mach-s3c2412/mach-jive.c
i2c_register_board_info(0, jive_i2c_devs, ARRAY_SIZE(jive_i2c_devs));
pm_power_off = jive_power_off;
-Index: linux-2.6.28/arch/arm/mach-s3c2412/mach-smdk2413.c
-===================================================================
---- linux-2.6.28.orig/arch/arm/mach-s3c2412/mach-smdk2413.c 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.28/arch/arm/mach-s3c2412/mach-smdk2413.c 2009-01-02 00:01:56.000000000 +0100
+--- a/arch/arm/mach-s3c2412/mach-smdk2413.c
++++ b/arch/arm/mach-s3c2412/mach-smdk2413.c
@@ -37,7 +37,8 @@
#include <mach/regs-lcd.h>
@@ -9811,10 +9707,8 @@ Index: linux-2.6.28/arch/arm/mach-s3c2412/mach-smdk2413.c
platform_add_devices(smdk2413_devices, ARRAY_SIZE(smdk2413_devices));
smdk_machine_init();
-Index: linux-2.6.28/arch/arm/mach-s3c2412/mach-vstms.c
-===================================================================
---- linux-2.6.28.orig/arch/arm/mach-s3c2412/mach-vstms.c 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.28/arch/arm/mach-s3c2412/mach-vstms.c 2009-01-02 00:01:56.000000000 +0100
+--- a/arch/arm/mach-s3c2412/mach-vstms.c
++++ b/arch/arm/mach-s3c2412/mach-vstms.c
@@ -39,7 +39,8 @@
#include <mach/idle.h>
#include <mach/fb.h>
@@ -9842,10 +9736,8 @@ Index: linux-2.6.28/arch/arm/mach-s3c2412/mach-vstms.c
platform_add_devices(vstms_devices, ARRAY_SIZE(vstms_devices));
}
-Index: linux-2.6.28/arch/arm/mach-s3c2412/pm.c
-===================================================================
---- linux-2.6.28.orig/arch/arm/mach-s3c2412/pm.c 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.28/arch/arm/mach-s3c2412/pm.c 2009-01-02 00:01:56.000000000 +0100
+--- a/arch/arm/mach-s3c2412/pm.c
++++ b/arch/arm/mach-s3c2412/pm.c
@@ -85,7 +85,7 @@ static struct sleep_save s3c2412_sleep[]
static int s3c2412_pm_suspend(struct sys_device *dev, pm_message_t state)
@@ -9864,10 +9756,8 @@ Index: linux-2.6.28/arch/arm/mach-s3c2412/pm.c
return 0;
}
-Index: linux-2.6.28/arch/arm/mach-s3c2412/s3c2412.c
-===================================================================
---- linux-2.6.28.orig/arch/arm/mach-s3c2412/s3c2412.c 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.28/arch/arm/mach-s3c2412/s3c2412.c 2009-01-02 00:01:56.000000000 +0100
+--- a/arch/arm/mach-s3c2412/s3c2412.c
++++ b/arch/arm/mach-s3c2412/s3c2412.c
@@ -16,6 +16,7 @@
#include <linux/list.h>
#include <linux/timer.h>
@@ -9967,10 +9857,8 @@ Index: linux-2.6.28/arch/arm/mach-s3c2412/s3c2412.c
+
return sysdev_register(&s3c2412_sysdev);
}
-Index: linux-2.6.28/arch/arm/mach-s3c2440/camera/bits.h
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/arch/arm/mach-s3c2440/camera/bits.h 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/arch/arm/mach-s3c2440/camera/bits.h
@@ -0,0 +1,48 @@
+/*
+ * Copyright (C) Samsung Electroincs 2003
@@ -10020,10 +9908,8 @@ Index: linux-2.6.28/arch/arm/mach-s3c2440/camera/bits.h
+#define BIT31 0x80000000
+
+#endif
-Index: linux-2.6.28/arch/arm/mach-s3c2440/camera/camif.c
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/arch/arm/mach-s3c2440/camera/camif.c 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/arch/arm/mach-s3c2440/camera/camif.c
@@ -0,0 +1,1047 @@
+/*
+ * Copyright (C) 2004 Samsung Electronics
@@ -11072,10 +10958,8 @@ Index: linux-2.6.28/arch/arm/mach-s3c2440/camera/camif.c
+ * c-set-style: "K&R"
+ * End:
+ */
-Index: linux-2.6.28/arch/arm/mach-s3c2440/camera/camif_fsm.c
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/arch/arm/mach-s3c2440/camera/camif_fsm.c 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/arch/arm/mach-s3c2440/camera/camif_fsm.c
@@ -0,0 +1,432 @@
+/*
+ Copyright (C) 2004 Samsung Electronics
@@ -11509,10 +11393,8 @@ Index: linux-2.6.28/arch/arm/mach-s3c2440/camera/camif_fsm.c
+ * c-basic-offset: 8
+ * End:
+ */
-Index: linux-2.6.28/arch/arm/mach-s3c2440/camera/camif.h
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/arch/arm/mach-s3c2440/camera/camif.h 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/arch/arm/mach-s3c2440/camera/camif.h
@@ -0,0 +1,304 @@
+/*
+ FIMC2.0 Camera Header File
@@ -11818,10 +11700,8 @@ Index: linux-2.6.28/arch/arm/mach-s3c2440/camera/camif.h
+ * c-set-style: "K&R"
+ * End:
+ */
-Index: linux-2.6.28/arch/arm/mach-s3c2440/camera/cam_reg.h
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/arch/arm/mach-s3c2440/camera/cam_reg.h 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/arch/arm/mach-s3c2440/camera/cam_reg.h
@@ -0,0 +1,234 @@
+ /*----------------------------------------------------------
+ * (C) 2004 Samsung Electronics
@@ -12057,10 +11937,8 @@ Index: linux-2.6.28/arch/arm/mach-s3c2440/camera/cam_reg.h
+
+
+#endif /* S3C2440_CAMER_H */
-Index: linux-2.6.28/arch/arm/mach-s3c2440/camera/imgsensor.c
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/arch/arm/mach-s3c2440/camera/imgsensor.c 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/arch/arm/mach-s3c2440/camera/imgsensor.c
@@ -0,0 +1,250 @@
+/*
+ * Copyright (C) 2004 Samsung Electronics
@@ -12312,10 +12190,8 @@ Index: linux-2.6.28/arch/arm/mach-s3c2440/camera/imgsensor.c
+ * c-basic-offset: 8
+ * End:
+ */
-Index: linux-2.6.28/arch/arm/mach-s3c2440/camera/Kconfig
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/arch/arm/mach-s3c2440/camera/Kconfig 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/arch/arm/mach-s3c2440/camera/Kconfig
@@ -0,0 +1,7 @@
+
+config S3C2440_CAMERA
@@ -12324,10 +12200,8 @@ Index: linux-2.6.28/arch/arm/mach-s3c2440/camera/Kconfig
+ help
+ Camera driver for S3C2440 camera unit
+
-Index: linux-2.6.28/arch/arm/mach-s3c2440/camera/Makefile
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/arch/arm/mach-s3c2440/camera/Makefile 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/arch/arm/mach-s3c2440/camera/Makefile
@@ -0,0 +1,8 @@
+obj-$(CONFIG_S3C2440_CAMERA) += \
+ videodev.o \
@@ -12337,10 +12211,8 @@ Index: linux-2.6.28/arch/arm/mach-s3c2440/camera/Makefile
+ camif_fsm.o \
+ qt-driver.o
+
-Index: linux-2.6.28/arch/arm/mach-s3c2440/camera/miscdevice.h
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/arch/arm/mach-s3c2440/camera/miscdevice.h 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/arch/arm/mach-s3c2440/camera/miscdevice.h
@@ -0,0 +1,18 @@
+
+ /*----------------------------------------------------------
@@ -12360,10 +12232,8 @@ Index: linux-2.6.28/arch/arm/mach-s3c2440/camera/miscdevice.h
+
+
+#endif
-Index: linux-2.6.28/arch/arm/mach-s3c2440/camera/qt-driver.c
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/arch/arm/mach-s3c2440/camera/qt-driver.c 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/arch/arm/mach-s3c2440/camera/qt-driver.c
@@ -0,0 +1,172 @@
+/*
+ * SW.LEE <hitchcar@samsung.com>
@@ -12537,10 +12407,8 @@ Index: linux-2.6.28/arch/arm/mach-s3c2440/camera/qt-driver.c
+ return c;
+}
+
-Index: linux-2.6.28/arch/arm/mach-s3c2440/camera/qt.h
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/arch/arm/mach-s3c2440/camera/qt.h 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/arch/arm/mach-s3c2440/camera/qt.h
@@ -0,0 +1,18 @@
+/*
+ * SW.LEE <hitchcar@samsung.com>
@@ -12560,10 +12428,8 @@ Index: linux-2.6.28/arch/arm/mach-s3c2440/camera/qt.h
+
+#endif
+
-Index: linux-2.6.28/arch/arm/mach-s3c2440/camera/s5x532.h
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/arch/arm/mach-s3c2440/camera/s5x532.h 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/arch/arm/mach-s3c2440/camera/s5x532.h
@@ -0,0 +1,143 @@
+/*
+ * 2004 (C) Samsung Electronics
@@ -12708,10 +12574,8 @@ Index: linux-2.6.28/arch/arm/mach-s3c2440/camera/s5x532.h
+#endif
+
+
-Index: linux-2.6.28/arch/arm/mach-s3c2440/camera/s5x532_rev36.h
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/arch/arm/mach-s3c2440/camera/s5x532_rev36.h 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/arch/arm/mach-s3c2440/camera/s5x532_rev36.h
@@ -0,0 +1,208 @@
+/*
+ * 2004 (C) Samsung Electronics
@@ -12921,10 +12785,8 @@ Index: linux-2.6.28/arch/arm/mach-s3c2440/camera/s5x532_rev36.h
+#endif
+
+
-Index: linux-2.6.28/arch/arm/mach-s3c2440/camera/sensor.h
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/arch/arm/mach-s3c2440/camera/sensor.h 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/arch/arm/mach-s3c2440/camera/sensor.h
@@ -0,0 +1,20 @@
+/*
+ *
@@ -12946,10 +12808,8 @@ Index: linux-2.6.28/arch/arm/mach-s3c2440/camera/sensor.h
+#define USER_EXIT BIT2
+
+#endif
-Index: linux-2.6.28/arch/arm/mach-s3c2440/camera/sxga.h
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/arch/arm/mach-s3c2440/camera/sxga.h 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/arch/arm/mach-s3c2440/camera/sxga.h
@@ -0,0 +1,504 @@
+/*
+ * 2004 (C) Samsung Electronics
@@ -13455,10 +13315,8 @@ Index: linux-2.6.28/arch/arm/mach-s3c2440/camera/sxga.h
+#endif
+
+
-Index: linux-2.6.28/arch/arm/mach-s3c2440/camera/userapp.h
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/arch/arm/mach-s3c2440/camera/userapp.h 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/arch/arm/mach-s3c2440/camera/userapp.h
@@ -0,0 +1,44 @@
+/*
+ Character Driver API Interface
@@ -13504,10 +13362,8 @@ Index: linux-2.6.28/arch/arm/mach-s3c2440/camera/userapp.h
+ * c-set-style: "K&R"
+ * End:
+ */
-Index: linux-2.6.28/arch/arm/mach-s3c2440/camera/v4l2_api.c
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/arch/arm/mach-s3c2440/camera/v4l2_api.c 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/arch/arm/mach-s3c2440/camera/v4l2_api.c
@@ -0,0 +1,311 @@
+/*
+ * . 2004-01-03: SW.LEE <hitchcar@sec.samsung.com>
@@ -13820,10 +13676,8 @@ Index: linux-2.6.28/arch/arm/mach-s3c2440/camera/v4l2_api.c
+ * c-set-style: "K&R"
+ * End:
+ */
-Index: linux-2.6.28/arch/arm/mach-s3c2440/camera/videodev2.h
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/arch/arm/mach-s3c2440/camera/videodev2.h 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/arch/arm/mach-s3c2440/camera/videodev2.h
@@ -0,0 +1,938 @@
+#ifndef __LINUX_VIDEODEV2_H
+#define __LINUX_VIDEODEV2_H
@@ -14763,10 +14617,8 @@ Index: linux-2.6.28/arch/arm/mach-s3c2440/camera/videodev2.h
+ * c-basic-offset: 8
+ * End:
+ */
-Index: linux-2.6.28/arch/arm/mach-s3c2440/camera/videodev.c
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/arch/arm/mach-s3c2440/camera/videodev.c 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/arch/arm/mach-s3c2440/camera/videodev.c
@@ -0,0 +1,332 @@
+/*
+ * Video capture interface for Linux Character Device Driver.
@@ -15100,10 +14952,8 @@ Index: linux-2.6.28/arch/arm/mach-s3c2440/camera/videodev.c
+ * c-basic-offset: 8
+ * End:
+ */
-Index: linux-2.6.28/arch/arm/mach-s3c2440/camera/videodev.h
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/arch/arm/mach-s3c2440/camera/videodev.h 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/arch/arm/mach-s3c2440/camera/videodev.h
@@ -0,0 +1,108 @@
+//#ifndef __LINUX_S3C_VIDEODEV_H
+//#define __LINUX_S3C_VIDEODEV_H
@@ -15213,10 +15063,8 @@ Index: linux-2.6.28/arch/arm/mach-s3c2440/camera/videodev.h
+ * c-basic-offset: 8
+ * End:
+ */
-Index: linux-2.6.28/arch/arm/mach-s3c2440/camera/video-driver.c
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/arch/arm/mach-s3c2440/camera/video-driver.c 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/arch/arm/mach-s3c2440/camera/video-driver.c
@@ -0,0 +1,624 @@
+/*
+ Copyright (C) 2004 Samsung Electronics
@@ -15842,10 +15690,8 @@ Index: linux-2.6.28/arch/arm/mach-s3c2440/camera/video-driver.c
+ * c-basic-offset: 8
+ * End:
+ */
-Index: linux-2.6.28/arch/arm/mach-s3c2440/dma.c
-===================================================================
---- linux-2.6.28.orig/arch/arm/mach-s3c2440/dma.c 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.28/arch/arm/mach-s3c2440/dma.c 2009-01-02 00:01:56.000000000 +0100
+--- a/arch/arm/mach-s3c2440/dma.c
++++ b/arch/arm/mach-s3c2440/dma.c
@@ -25,12 +25,12 @@
#include <plat/regs-serial.h>
@@ -15861,10 +15707,8 @@ Index: linux-2.6.28/arch/arm/mach-s3c2440/dma.c
static struct s3c24xx_dma_map __initdata s3c2440_dma_mappings[] = {
[DMACH_XD0] = {
-Index: linux-2.6.28/arch/arm/mach-s3c2440/fiq_c_isr.c
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/arch/arm/mach-s3c2440/fiq_c_isr.c 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/arch/arm/mach-s3c2440/fiq_c_isr.c
@@ -0,0 +1,321 @@
+/*
+ * Copyright 2007 Andy Green <andy@warmcat.com>
@@ -16187,10 +16031,8 @@ Index: linux-2.6.28/arch/arm/mach-s3c2440/fiq_c_isr.c
+
+module_init(sc32440_fiq_init);
+module_exit(sc32440_fiq_exit);
-Index: linux-2.6.28/arch/arm/mach-s3c2440/fiq_c_isr.h
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/arch/arm/mach-s3c2440/fiq_c_isr.h 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/arch/arm/mach-s3c2440/fiq_c_isr.h
@@ -0,0 +1,76 @@
+#ifndef _LINUX_FIQ_C_ISR_H
+#define _LINUX_FIQ_C_ISR_H
@@ -16268,10 +16110,8 @@ Index: linux-2.6.28/arch/arm/mach-s3c2440/fiq_c_isr.h
+}
+
+#endif /* _LINUX_FIQ_C_ISR_H */
-Index: linux-2.6.28/arch/arm/mach-s3c2440/Kconfig
-===================================================================
---- linux-2.6.28.orig/arch/arm/mach-s3c2440/Kconfig 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.28/arch/arm/mach-s3c2440/Kconfig 2009-01-02 00:01:56.000000000 +0100
+--- a/arch/arm/mach-s3c2440/Kconfig
++++ b/arch/arm/mach-s3c2440/Kconfig
@@ -22,12 +22,20 @@ config S3C2440_DMA
help
Support for S3C2440 specific DMA code5A
@@ -16332,10 +16172,8 @@ Index: linux-2.6.28/arch/arm/mach-s3c2440/Kconfig
endmenu
+#source "arch/arm/mach-s3c2440/camera/Kconfig"
-Index: linux-2.6.28/arch/arm/mach-s3c2440/mach-anubis.c
-===================================================================
---- linux-2.6.28.orig/arch/arm/mach-s3c2440/mach-anubis.c 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.28/arch/arm/mach-s3c2440/mach-anubis.c 2009-01-02 00:01:56.000000000 +0100
+--- a/arch/arm/mach-s3c2440/mach-anubis.c
++++ b/arch/arm/mach-s3c2440/mach-anubis.c
@@ -39,7 +39,8 @@
#include <mach/regs-gpio.h>
#include <mach/regs-mem.h>
@@ -16363,10 +16201,8 @@ Index: linux-2.6.28/arch/arm/mach-s3c2440/mach-anubis.c
platform_add_devices(anubis_devices, ARRAY_SIZE(anubis_devices));
i2c_register_board_info(0, anubis_i2c_devs,
-Index: linux-2.6.28/arch/arm/mach-s3c2440/mach-at2440evb.c
-===================================================================
---- linux-2.6.28.orig/arch/arm/mach-s3c2440/mach-at2440evb.c 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.28/arch/arm/mach-s3c2440/mach-at2440evb.c 2009-01-02 00:01:56.000000000 +0100
+--- a/arch/arm/mach-s3c2440/mach-at2440evb.c
++++ b/arch/arm/mach-s3c2440/mach-at2440evb.c
@@ -35,7 +35,8 @@
#include <mach/regs-gpio.h>
#include <mach/regs-mem.h>
@@ -16394,10 +16230,8 @@ Index: linux-2.6.28/arch/arm/mach-s3c2440/mach-at2440evb.c
platform_add_devices(at2440evb_devices, ARRAY_SIZE(at2440evb_devices));
}
-Index: linux-2.6.28/arch/arm/mach-s3c2440/mach-gta02.c
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/arch/arm/mach-s3c2440/mach-gta02.c 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/arch/arm/mach-s3c2440/mach-gta02.c
@@ -0,0 +1,1778 @@
+/*
+ * linux/arch/arm/mach-s3c2440/mach-gta02.c
@@ -18177,10 +18011,8 @@ Index: linux-2.6.28/arch/arm/mach-s3c2440/mach-gta02.c
+ .init_machine = gta02_machine_init,
+ .timer = &s3c24xx_timer,
+MACHINE_END
-Index: linux-2.6.28/arch/arm/mach-s3c2440/mach-nexcoder.c
-===================================================================
---- linux-2.6.28.orig/arch/arm/mach-s3c2440/mach-nexcoder.c 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.28/arch/arm/mach-s3c2440/mach-nexcoder.c 2009-01-02 00:01:56.000000000 +0100
+--- a/arch/arm/mach-s3c2440/mach-nexcoder.c
++++ b/arch/arm/mach-s3c2440/mach-nexcoder.c
@@ -37,6 +37,7 @@
//#include <asm/debug-ll.h>
#include <mach/regs-gpio.h>
@@ -18206,10 +18038,8 @@ Index: linux-2.6.28/arch/arm/mach-s3c2440/mach-nexcoder.c
platform_add_devices(nexcoder_devices, ARRAY_SIZE(nexcoder_devices));
};
-Index: linux-2.6.28/arch/arm/mach-s3c2440/mach-osiris.c
-===================================================================
---- linux-2.6.28.orig/arch/arm/mach-s3c2440/mach-osiris.c 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.28/arch/arm/mach-s3c2440/mach-osiris.c 2009-01-02 00:01:56.000000000 +0100
+--- a/arch/arm/mach-s3c2440/mach-osiris.c
++++ b/arch/arm/mach-s3c2440/mach-osiris.c
@@ -37,7 +37,8 @@
#include <mach/regs-gpio.h>
#include <mach/regs-mem.h>
@@ -18238,10 +18068,8 @@ Index: linux-2.6.28/arch/arm/mach-s3c2440/mach-osiris.c
i2c_register_board_info(0, osiris_i2c_devs,
ARRAY_SIZE(osiris_i2c_devs));
-Index: linux-2.6.28/arch/arm/mach-s3c2440/mach-rx3715.c
-===================================================================
---- linux-2.6.28.orig/arch/arm/mach-s3c2440/mach-rx3715.c 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.28/arch/arm/mach-s3c2440/mach-rx3715.c 2009-01-02 00:01:56.000000000 +0100
+--- a/arch/arm/mach-s3c2440/mach-rx3715.c
++++ b/arch/arm/mach-s3c2440/mach-rx3715.c
@@ -42,7 +42,7 @@
#include <mach/regs-lcd.h>
@@ -18269,10 +18097,8 @@ Index: linux-2.6.28/arch/arm/mach-s3c2440/mach-rx3715.c
s3c24xx_fb_set_platdata(&rx3715_fb_info);
platform_add_devices(rx3715_devices, ARRAY_SIZE(rx3715_devices));
-Index: linux-2.6.28/arch/arm/mach-s3c2440/mach-smdk2440.c
-===================================================================
---- linux-2.6.28.orig/arch/arm/mach-s3c2440/mach-smdk2440.c 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.28/arch/arm/mach-s3c2440/mach-smdk2440.c 2009-01-02 00:01:56.000000000 +0100
+--- a/arch/arm/mach-s3c2440/mach-smdk2440.c
++++ b/arch/arm/mach-s3c2440/mach-smdk2440.c
@@ -37,6 +37,7 @@
#include <mach/idle.h>
@@ -18298,10 +18124,8 @@ Index: linux-2.6.28/arch/arm/mach-s3c2440/mach-smdk2440.c
platform_add_devices(smdk2440_devices, ARRAY_SIZE(smdk2440_devices));
smdk_machine_init();
-Index: linux-2.6.28/arch/arm/mach-s3c2440/Makefile
-===================================================================
---- linux-2.6.28.orig/arch/arm/mach-s3c2440/Makefile 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.28/arch/arm/mach-s3c2440/Makefile 2009-01-02 00:01:56.000000000 +0100
+--- a/arch/arm/mach-s3c2440/Makefile
++++ b/arch/arm/mach-s3c2440/Makefile
@@ -13,6 +13,7 @@ obj-$(CONFIG_CPU_S3C2440) += s3c2440.o d
obj-$(CONFIG_CPU_S3C2440) += irq.o
obj-$(CONFIG_CPU_S3C2440) += clock.o
@@ -18317,10 +18141,8 @@ Index: linux-2.6.28/arch/arm/mach-s3c2440/Makefile
+obj-$(CONFIG_MACH_HXD8) += mach-hxd8.o
+obj-$(CONFIG_MACH_NEO1973_GTA02) += mach-gta02.o
+
-Index: linux-2.6.28/arch/arm/mach-s3c2440/s3c2440.c
-===================================================================
---- linux-2.6.28.orig/arch/arm/mach-s3c2440/s3c2440.c 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.28/arch/arm/mach-s3c2440/s3c2440.c 2009-01-02 00:01:56.000000000 +0100
+--- a/arch/arm/mach-s3c2440/s3c2440.c
++++ b/arch/arm/mach-s3c2440/s3c2440.c
@@ -46,6 +46,9 @@ int __init s3c2440_init(void)
s3c_device_wdt.resource[1].start = IRQ_S3C2440_WDT;
s3c_device_wdt.resource[1].end = IRQ_S3C2440_WDT;
@@ -18331,10 +18153,8 @@ Index: linux-2.6.28/arch/arm/mach-s3c2440/s3c2440.c
/* register our system device for everything else */
return sysdev_register(&s3c2440_sysdev);
-Index: linux-2.6.28/arch/arm/mach-s3c2442/Kconfig
-===================================================================
---- linux-2.6.28.orig/arch/arm/mach-s3c2442/Kconfig 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.28/arch/arm/mach-s3c2442/Kconfig 2009-01-02 00:01:56.000000000 +0100
+--- a/arch/arm/mach-s3c2442/Kconfig
++++ b/arch/arm/mach-s3c2442/Kconfig
@@ -6,10 +6,11 @@
config CPU_S3C2442
@@ -18348,10 +18168,8 @@ Index: linux-2.6.28/arch/arm/mach-s3c2442/Kconfig
select CPU_S3C244X
select CPU_LLSERIAL_S3C2440
help
-Index: linux-2.6.28/arch/arm/mach-s3c2442/s3c2442.c
-===================================================================
---- linux-2.6.28.orig/arch/arm/mach-s3c2442/s3c2442.c 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.28/arch/arm/mach-s3c2442/s3c2442.c 2009-01-02 00:01:56.000000000 +0100
+--- a/arch/arm/mach-s3c2442/s3c2442.c
++++ b/arch/arm/mach-s3c2442/s3c2442.c
@@ -21,6 +21,7 @@
#include <plat/s3c2442.h>
@@ -18369,10 +18187,8 @@ Index: linux-2.6.28/arch/arm/mach-s3c2442/s3c2442.c
+
return sysdev_register(&s3c2442_sysdev);
}
-Index: linux-2.6.28/arch/arm/mach-s3c2443/clock.c
-===================================================================
---- linux-2.6.28.orig/arch/arm/mach-s3c2443/clock.c 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.28/arch/arm/mach-s3c2443/clock.c 2009-01-02 00:01:56.000000000 +0100
+--- a/arch/arm/mach-s3c2443/clock.c
++++ b/arch/arm/mach-s3c2443/clock.c
@@ -39,6 +39,8 @@
#include <mach/regs-s3c2443-clock.h>
@@ -18486,10 +18302,8 @@ Index: linux-2.6.28/arch/arm/mach-s3c2443/clock.c
+
+ s3c_pwmclk_init();
}
-Index: linux-2.6.28/arch/arm/mach-s3c2443/dma.c
-===================================================================
---- linux-2.6.28.orig/arch/arm/mach-s3c2443/dma.c 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.28/arch/arm/mach-s3c2443/dma.c 2009-01-02 00:01:56.000000000 +0100
+--- a/arch/arm/mach-s3c2443/dma.c
++++ b/arch/arm/mach-s3c2443/dma.c
@@ -26,12 +26,12 @@
#include <plat/regs-serial.h>
@@ -18505,10 +18319,8 @@ Index: linux-2.6.28/arch/arm/mach-s3c2443/dma.c
#define MAP(x) { \
[0] = (x) | DMA_CH_VALID, \
-Index: linux-2.6.28/arch/arm/mach-s3c2443/Kconfig
-===================================================================
---- linux-2.6.28.orig/arch/arm/mach-s3c2443/Kconfig 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.28/arch/arm/mach-s3c2443/Kconfig 2009-01-02 00:01:56.000000000 +0100
+--- a/arch/arm/mach-s3c2443/Kconfig
++++ b/arch/arm/mach-s3c2443/Kconfig
@@ -24,6 +24,7 @@ config MACH_SMDK2443
bool "SMDK2443"
select CPU_S3C2443
@@ -18517,10 +18329,8 @@ Index: linux-2.6.28/arch/arm/mach-s3c2443/Kconfig
help
Say Y here if you are using an SMDK2443
-Index: linux-2.6.28/arch/arm/mach-s3c2443/mach-smdk2443.c
-===================================================================
---- linux-2.6.28.orig/arch/arm/mach-s3c2443/mach-smdk2443.c 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.28/arch/arm/mach-s3c2443/mach-smdk2443.c 2009-01-02 00:01:56.000000000 +0100
+--- a/arch/arm/mach-s3c2443/mach-smdk2443.c
++++ b/arch/arm/mach-s3c2443/mach-smdk2443.c
@@ -37,6 +37,7 @@
#include <mach/idle.h>
@@ -18548,10 +18358,8 @@ Index: linux-2.6.28/arch/arm/mach-s3c2443/mach-smdk2443.c
platform_add_devices(smdk2443_devices, ARRAY_SIZE(smdk2443_devices));
smdk_machine_init();
}
-Index: linux-2.6.28/arch/arm/mach-s3c2443/s3c2443.c
-===================================================================
---- linux-2.6.28.orig/arch/arm/mach-s3c2443/s3c2443.c 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.28/arch/arm/mach-s3c2443/s3c2443.c 2009-01-02 00:01:56.000000000 +0100
+--- a/arch/arm/mach-s3c2443/s3c2443.c
++++ b/arch/arm/mach-s3c2443/s3c2443.c
@@ -81,10 +81,9 @@ void __init s3c2443_init_uarts(struct s3
* machine specific initialisation.
*/
@@ -18564,10 +18372,8 @@ Index: linux-2.6.28/arch/arm/mach-s3c2443/s3c2443.c
}
/* need to register class before we actually register the device, and
-Index: linux-2.6.28/arch/arm/mach-s3c24a0/include/mach/debug-macro.S
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/arch/arm/mach-s3c24a0/include/mach/debug-macro.S 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/arch/arm/mach-s3c24a0/include/mach/debug-macro.S
@@ -0,0 +1,28 @@
+/* arch/arm/mach-s3c2410/include/mach/debug-macro.S
+ *
@@ -18597,10 +18403,8 @@ Index: linux-2.6.28/arch/arm/mach-s3c24a0/include/mach/debug-macro.S
+ */
+
+#include <plat/debug-macro.S>
-Index: linux-2.6.28/arch/arm/mach-s3c24a0/include/mach/io.h
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/arch/arm/mach-s3c24a0/include/mach/io.h 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/arch/arm/mach-s3c24a0/include/mach/io.h
@@ -0,0 +1,16 @@
+/* arch/arm/mach-s3c24a0/include/mach/io.h
+ *
@@ -18618,10 +18422,8 @@ Index: linux-2.6.28/arch/arm/mach-s3c24a0/include/mach/io.h
+#define __mem_pci(a) (a)
+
+#endif
-Index: linux-2.6.28/arch/arm/mach-s3c24a0/include/mach/irqs.h
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/arch/arm/mach-s3c24a0/include/mach/irqs.h 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/arch/arm/mach-s3c24a0/include/mach/irqs.h
@@ -0,0 +1,117 @@
+/* linux/arch/arm/mach-s3c24a0/include/mach/irqs.h
+ *
@@ -18740,10 +18542,8 @@ Index: linux-2.6.28/arch/arm/mach-s3c24a0/include/mach/irqs.h
+#define NR_IRQS (IRQ_DMA3+1)
+
+#endif /* __ASM_ARCH_24A0_IRQS_H */
-Index: linux-2.6.28/arch/arm/mach-s3c24a0/include/mach/map.h
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/arch/arm/mach-s3c24a0/include/mach/map.h 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/arch/arm/mach-s3c24a0/include/mach/map.h
@@ -0,0 +1,85 @@
+/* linux/arch/arm/mach-s3c24a0/include/mach/map.h
+ *
@@ -18830,10 +18630,8 @@ Index: linux-2.6.28/arch/arm/mach-s3c24a0/include/mach/map.h
+#define S3C_PA_IIC S3C24A0_PA_IIC
+
+#endif /* __ASM_ARCH_24A0_MAP_H */
-Index: linux-2.6.28/arch/arm/mach-s3c24a0/include/mach/memory.h
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/arch/arm/mach-s3c24a0/include/mach/memory.h 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/arch/arm/mach-s3c24a0/include/mach/memory.h
@@ -0,0 +1,19 @@
+/* linux/arch/arm/mach-s3c24a0/include/mach/memory.h
+ * from linux/include/asm-arm/arch-rpc/memory.h
@@ -18854,10 +18652,8 @@ Index: linux-2.6.28/arch/arm/mach-s3c24a0/include/mach/memory.h
+#define __bus_to_virt(x) __phys_to_virt(x)
+
+#endif
-Index: linux-2.6.28/arch/arm/mach-s3c24a0/include/mach/regs-clock.h
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/arch/arm/mach-s3c24a0/include/mach/regs-clock.h 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/arch/arm/mach-s3c24a0/include/mach/regs-clock.h
@@ -0,0 +1,88 @@
+/* linux/arch/arm/mach-s3c24a0/include/mach/regs-clock.h
+ *
@@ -18947,10 +18743,8 @@ Index: linux-2.6.28/arch/arm/mach-s3c24a0/include/mach/regs-clock.h
+#define S3C2410_CLKSLOW_GET_SLOWVAL(x) (0x1)
+
+#endif /* __ASM_ARCH_24A0_REGS_CLOCK_H */
-Index: linux-2.6.28/arch/arm/mach-s3c24a0/include/mach/regs-irq.h
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/arch/arm/mach-s3c24a0/include/mach/regs-irq.h 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/arch/arm/mach-s3c24a0/include/mach/regs-irq.h
@@ -0,0 +1,25 @@
+/* linux/arch/arm/mach-s3c24a0/include/mach/regs-irq.h
+ *
@@ -18977,10 +18771,8 @@ Index: linux-2.6.28/arch/arm/mach-s3c24a0/include/mach/regs-irq.h
+
+
+
-Index: linux-2.6.28/arch/arm/mach-s3c24a0/include/mach/system.h
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/arch/arm/mach-s3c24a0/include/mach/system.h 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/arch/arm/mach-s3c24a0/include/mach/system.h
@@ -0,0 +1,25 @@
+/* linux/arch/arm/mach-s3c24a0/include/mach/system.h
+ *
@@ -19007,10 +18799,8 @@ Index: linux-2.6.28/arch/arm/mach-s3c24a0/include/mach/system.h
+void (*s3c24xx_reset_hook)(void);
+
+#include <asm/plat-s3c24xx/system-reset.h>
-Index: linux-2.6.28/arch/arm/mach-s3c24a0/include/mach/tick.h
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/arch/arm/mach-s3c24a0/include/mach/tick.h 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/arch/arm/mach-s3c24a0/include/mach/tick.h
@@ -0,0 +1,15 @@
+/* linux/arch/arm/mach-s3c24a0/include/mach/tick.h
+ *
@@ -19027,10 +18817,8 @@ Index: linux-2.6.28/arch/arm/mach-s3c24a0/include/mach/tick.h
+{
+ return __raw_readl(S3C2410_SUBSRCPND) & SUBSRC_TIMER4;
+}
-Index: linux-2.6.28/arch/arm/mach-s3c24a0/include/mach/timex.h
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/arch/arm/mach-s3c24a0/include/mach/timex.h 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/arch/arm/mach-s3c24a0/include/mach/timex.h
@@ -0,0 +1,18 @@
+/* linux/arch/arm/mach-s3c24a0/include/mach/timex.h
+ *
@@ -19050,10 +18838,8 @@ Index: linux-2.6.28/arch/arm/mach-s3c24a0/include/mach/timex.h
+#define CLOCK_TICK_RATE 12000000
+
+#endif /* __ASM_ARCH_TIMEX_H */
-Index: linux-2.6.28/arch/arm/mach-s3c24a0/include/mach/vmalloc.h
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/arch/arm/mach-s3c24a0/include/mach/vmalloc.h 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/arch/arm/mach-s3c24a0/include/mach/vmalloc.h
@@ -0,0 +1,17 @@
+/* linux/include/asm-arm/arch-s3c24ao/vmalloc.h
+ *
@@ -19072,10 +18858,8 @@ Index: linux-2.6.28/arch/arm/mach-s3c24a0/include/mach/vmalloc.h
+#define VMALLOC_END (0xE0000000)
+
+#endif /* __ASM_ARCH_VMALLOC_H */
-Index: linux-2.6.28/arch/arm/mach-s3c6400/include/mach/debug-macro.S
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/arch/arm/mach-s3c6400/include/mach/debug-macro.S 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/arch/arm/mach-s3c6400/include/mach/debug-macro.S
@@ -0,0 +1,39 @@
+/* arch/arm/mach-s3c6400/include/mach/debug-macro.S
+ *
@@ -19116,10 +18900,8 @@ Index: linux-2.6.28/arch/arm/mach-s3c6400/include/mach/debug-macro.S
+ */
+
+#include <plat/debug-macro.S>
-Index: linux-2.6.28/arch/arm/mach-s3c6400/include/mach/dma.h
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/arch/arm/mach-s3c6400/include/mach/dma.h 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/arch/arm/mach-s3c6400/include/mach/dma.h
@@ -0,0 +1,16 @@
+/* linux/arch/arm/mach-s3c6400/include/mach/dma.h
+ *
@@ -19137,10 +18919,8 @@ Index: linux-2.6.28/arch/arm/mach-s3c6400/include/mach/dma.h
+/* currently nothing here, placeholder */
+
+#endif /* __ASM_ARCH_IRQ_H */
-Index: linux-2.6.28/arch/arm/mach-s3c6400/include/mach/entry-macro.S
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/arch/arm/mach-s3c6400/include/mach/entry-macro.S 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/arch/arm/mach-s3c6400/include/mach/entry-macro.S
@@ -0,0 +1,44 @@
+/* arch/arm/mach-s3c6400/include/mach/entry-macro.S
+ *
@@ -19186,10 +18966,8 @@ Index: linux-2.6.28/arch/arm/mach-s3c6400/include/mach/entry-macro.S
+ clzne \irqstat, \irqstat
+ subne \irqnr, \irqnr, \irqstat
+ .endm
-Index: linux-2.6.28/arch/arm/mach-s3c6400/include/mach/gpio-core.h
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/arch/arm/mach-s3c6400/include/mach/gpio-core.h 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/arch/arm/mach-s3c6400/include/mach/gpio-core.h
@@ -0,0 +1,21 @@
+/* arch/arm/mach-s3c6400/include/mach/gpio-core.h
+ *
@@ -19212,10 +18990,8 @@ Index: linux-2.6.28/arch/arm/mach-s3c6400/include/mach/gpio-core.h
+#include <plat/gpio-core.h>
+
+#endif /* __ASM_ARCH_GPIO_CORE_H */
-Index: linux-2.6.28/arch/arm/mach-s3c6400/include/mach/gpio.h
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/arch/arm/mach-s3c6400/include/mach/gpio.h 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/arch/arm/mach-s3c6400/include/mach/gpio.h
@@ -0,0 +1,96 @@
+/* arch/arm/mach-s3c6400/include/mach/gpio.h
+ *
@@ -19313,10 +19089,8 @@ Index: linux-2.6.28/arch/arm/mach-s3c6400/include/mach/gpio.h
+#define ARCH_NR_GPIOS (S3C64XX_GPQ(S3C64XX_GPIO_Q_NR) + 1)
+
+#include <asm-generic/gpio.h>
-Index: linux-2.6.28/arch/arm/mach-s3c6400/include/mach/hardware.h
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/arch/arm/mach-s3c6400/include/mach/hardware.h 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/arch/arm/mach-s3c6400/include/mach/hardware.h
@@ -0,0 +1,16 @@
+/* linux/arch/arm/mach-s3c6400/include/mach/hardware.h
+ *
@@ -19334,10 +19108,8 @@ Index: linux-2.6.28/arch/arm/mach-s3c6400/include/mach/hardware.h
+/* currently nothing here, placeholder */
+
+#endif /* __ASM_ARCH_IRQ_H */
-Index: linux-2.6.28/arch/arm/mach-s3c6400/include/mach/irqs.h
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/arch/arm/mach-s3c6400/include/mach/irqs.h 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/arch/arm/mach-s3c6400/include/mach/irqs.h
@@ -0,0 +1,20 @@
+/* linux/arch/arm/mach-s3c6400/include/mach/irqs.h
+ *
@@ -19359,10 +19131,8 @@ Index: linux-2.6.28/arch/arm/mach-s3c6400/include/mach/irqs.h
+#include <plat/irqs.h>
+
+#endif /* __ASM_ARCH_IRQ_H */
-Index: linux-2.6.28/arch/arm/mach-s3c6400/include/mach/map.h
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/arch/arm/mach-s3c6400/include/mach/map.h 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/arch/arm/mach-s3c6400/include/mach/map.h
@@ -0,0 +1,71 @@
+/* linux/arch/arm/mach-s3c6400/include/mach/map.h
+ *
@@ -19435,10 +19205,8 @@ Index: linux-2.6.28/arch/arm/mach-s3c6400/include/mach/map.h
+#define S3C_PA_FB S3C64XX_PA_FB
+
+#endif /* __ASM_ARCH_6400_MAP_H */
-Index: linux-2.6.28/arch/arm/mach-s3c6400/include/mach/memory.h
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/arch/arm/mach-s3c6400/include/mach/memory.h 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/arch/arm/mach-s3c6400/include/mach/memory.h
@@ -0,0 +1,21 @@
+/* arch/arm/mach-s3c6400/include/mach/memory.h
+ *
@@ -19461,10 +19229,8 @@ Index: linux-2.6.28/arch/arm/mach-s3c6400/include/mach/memory.h
+#define __bus_to_virt(x) __phys_to_virt(x)
+
+#endif
-Index: linux-2.6.28/arch/arm/mach-s3c6400/include/mach/pwm-clock.h
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/arch/arm/mach-s3c6400/include/mach/pwm-clock.h 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/arch/arm/mach-s3c6400/include/mach/pwm-clock.h
@@ -0,0 +1,56 @@
+/* linux/arch/arm/mach-s3c6400/include/mach/pwm-clock.h
+ *
@@ -19522,10 +19288,8 @@ Index: linux-2.6.28/arch/arm/mach-s3c6400/include/mach/pwm-clock.h
+}
+
+#define S3C_TCFG1_MUX_TCLK S3C64XX_TCFG1_MUX_TCLK
-Index: linux-2.6.28/arch/arm/mach-s3c6400/include/mach/regs-clock.h
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/arch/arm/mach-s3c6400/include/mach/regs-clock.h 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/arch/arm/mach-s3c6400/include/mach/regs-clock.h
@@ -0,0 +1,16 @@
+/* linux/arch/arm/mach-s3c6400/include/mach/regs-clock.h
+ *
@@ -19543,10 +19307,8 @@ Index: linux-2.6.28/arch/arm/mach-s3c6400/include/mach/regs-clock.h
+
+#include <plat/regs-clock.h>
+
-Index: linux-2.6.28/arch/arm/mach-s3c6400/include/mach/regs-fb.h
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/arch/arm/mach-s3c6400/include/mach/regs-fb.h 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/arch/arm/mach-s3c6400/include/mach/regs-fb.h
@@ -0,0 +1,259 @@
+/* arch/arm/mach-s3c6400/include/mach/regs-fb.h
+ *
@@ -19807,10 +19569,8 @@ Index: linux-2.6.28/arch/arm/mach-s3c6400/include/mach/regs-fb.h
+ * 1110 -none- -none- -none- -none- -none-
+ * 1111 -none- -none- -none- -none- -none-
+*/
-Index: linux-2.6.28/arch/arm/mach-s3c6400/include/mach/regs-irq.h
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/arch/arm/mach-s3c6400/include/mach/regs-irq.h 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/arch/arm/mach-s3c6400/include/mach/regs-irq.h
@@ -0,0 +1,20 @@
+/* linux/arch/arm/mach-s3c6400/include/mach/regs-irq.h
+ *
@@ -19832,10 +19592,8 @@ Index: linux-2.6.28/arch/arm/mach-s3c6400/include/mach/regs-irq.h
+#include <asm/hardware/vic.h>
+
+#endif /* __ASM_ARCH_6400_REGS_IRQ_H */
-Index: linux-2.6.28/arch/arm/mach-s3c6400/include/mach/system.h
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/arch/arm/mach-s3c6400/include/mach/system.h 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/arch/arm/mach-s3c6400/include/mach/system.h
@@ -0,0 +1,44 @@
+/* linux/arch/arm/mach-s3c6400/include/mach/system.h
+ *
@@ -19881,10 +19639,8 @@ Index: linux-2.6.28/arch/arm/mach-s3c6400/include/mach/system.h
+}
+
+#endif /* __ASM_ARCH_IRQ_H */
-Index: linux-2.6.28/arch/arm/mach-s3c6400/include/mach/tick.h
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/arch/arm/mach-s3c6400/include/mach/tick.h 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/arch/arm/mach-s3c6400/include/mach/tick.h
@@ -0,0 +1,29 @@
+/* linux/arch/arm/mach-s3c6400/include/mach/tick.h
+ *
@@ -19915,10 +19671,8 @@ Index: linux-2.6.28/arch/arm/mach-s3c6400/include/mach/tick.h
+#define TICK_MAX (0xffffffff)
+
+#endif /* __ASM_ARCH_6400_TICK_H */
-Index: linux-2.6.28/arch/arm/mach-s3c6400/include/mach/uncompress.h
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/arch/arm/mach-s3c6400/include/mach/uncompress.h 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/arch/arm/mach-s3c6400/include/mach/uncompress.h
@@ -0,0 +1,28 @@
+/* arch/arm/mach-s3c6400/include/mach/uncompress.h
+ *
@@ -19948,10 +19702,8 @@ Index: linux-2.6.28/arch/arm/mach-s3c6400/include/mach/uncompress.h
+}
+
+#endif /* __ASM_ARCH_UNCOMPRESS_H */
-Index: linux-2.6.28/arch/arm/mach-s3c6400/Kconfig
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/arch/arm/mach-s3c6400/Kconfig 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/arch/arm/mach-s3c6400/Kconfig
@@ -0,0 +1,8 @@
+# arch/arm/mach-s3c6400/Kconfig
+#
@@ -19961,10 +19713,8 @@ Index: linux-2.6.28/arch/arm/mach-s3c6400/Kconfig
+# Licensed under GPLv2
+
+# Currently nothing here, this will be added later
-Index: linux-2.6.28/arch/arm/mach-s3c6400/Makefile
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/arch/arm/mach-s3c6400/Makefile 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/arch/arm/mach-s3c6400/Makefile
@@ -0,0 +1,15 @@
+# arch/arm/mach-s3c6400/Makefile
+#
@@ -19981,17 +19731,13 @@ Index: linux-2.6.28/arch/arm/mach-s3c6400/Makefile
+# Core support for S3C6400 system
+
+obj-n += blank.o
-Index: linux-2.6.28/arch/arm/mach-s3c6400/Makefile.boot
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/arch/arm/mach-s3c6400/Makefile.boot 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/arch/arm/mach-s3c6400/Makefile.boot
@@ -0,0 +1,2 @@
+ zreladdr-y := 0x50008000
+params_phys-y := 0x50000100
-Index: linux-2.6.28/arch/arm/mach-s3c6410/cpu.c
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/arch/arm/mach-s3c6410/cpu.c 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/arch/arm/mach-s3c6410/cpu.c
@@ -0,0 +1,101 @@
+/* linux/arch/arm/mach-s3c6410/cpu.c
+ *
@@ -20094,10 +19840,8 @@ Index: linux-2.6.28/arch/arm/mach-s3c6410/cpu.c
+
+ return sysdev_register(&s3c6410_sysdev);
+}
-Index: linux-2.6.28/arch/arm/mach-s3c6410/include/mach/om-gta03.h
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/arch/arm/mach-s3c6410/include/mach/om-gta03.h 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/arch/arm/mach-s3c6410/include/mach/om-gta03.h
@@ -0,0 +1,91 @@
+/*
+ * GTA03 GPIO Mappings
@@ -20190,10 +19934,8 @@ Index: linux-2.6.28/arch/arm/mach-s3c6410/include/mach/om-gta03.h
+#define GTA03_IRQ_NONKEYWAKE S3C_EINT(12)
+
+#endif /* _OM_GTA03_H */
-Index: linux-2.6.28/arch/arm/mach-s3c6410/Kconfig
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/arch/arm/mach-s3c6410/Kconfig 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/arch/arm/mach-s3c6410/Kconfig
@@ -0,0 +1,80 @@
+# arch/arm/mach-s3c6410/Kconfig
+#
@@ -20275,10 +20017,8 @@ Index: linux-2.6.28/arch/arm/mach-s3c6410/Kconfig
+ help
+ Machine support for the Openmoko GTA03 Phone
+
-Index: linux-2.6.28/arch/arm/mach-s3c6410/mach-om-gta03.c
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/arch/arm/mach-s3c6410/mach-om-gta03.c 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/arch/arm/mach-s3c6410/mach-om-gta03.c
@@ -0,0 +1,654 @@
+/* linux/arch/arm/mach-s3c6410/mach-om_gta03.c
+ *
@@ -20934,10 +20674,8 @@ Index: linux-2.6.28/arch/arm/mach-s3c6410/mach-om-gta03.c
+ .timer = &s3c24xx_timer,
+MACHINE_END
+
-Index: linux-2.6.28/arch/arm/mach-s3c6410/mach-smdk6410.c
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/arch/arm/mach-s3c6410/mach-smdk6410.c 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/arch/arm/mach-s3c6410/mach-smdk6410.c
@@ -0,0 +1,205 @@
+/* linux/arch/arm/mach-s3c6410/mach-smdk6410.c
+ *
@@ -21144,10 +20882,8 @@ Index: linux-2.6.28/arch/arm/mach-s3c6410/mach-smdk6410.c
+ .init_machine = smdk6410_machine_init,
+ .timer = &s3c24xx_timer,
+MACHINE_END
-Index: linux-2.6.28/arch/arm/mach-s3c6410/Makefile
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/arch/arm/mach-s3c6410/Makefile 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/arch/arm/mach-s3c6410/Makefile
@@ -0,0 +1,26 @@
+# arch/arm/plat-s3c6410/Makefile
+#
@@ -21175,10 +20911,8 @@ Index: linux-2.6.28/arch/arm/mach-s3c6410/Makefile
+obj-$(CONFIG_MACH_OPENMOKO_GTA03) += mach-om-gta03.o \
+ om-gta03-features.o
+
-Index: linux-2.6.28/arch/arm/mach-s3c6410/om-gta03-features.c
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/arch/arm/mach-s3c6410/om-gta03-features.c 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/arch/arm/mach-s3c6410/om-gta03-features.c
@@ -0,0 +1,344 @@
+/*
+ * Support for features of Openmoko GTA03
@@ -21524,10 +21258,8 @@ Index: linux-2.6.28/arch/arm/mach-s3c6410/om-gta03-features.c
+MODULE_LICENSE("GPL");
+MODULE_AUTHOR("Andy Green <andy@openmoko.com>");
+MODULE_DESCRIPTION("Openmoko GTA03 Feature Driver");
-Index: linux-2.6.28/arch/arm/mach-s3c6410/setup-sdhci.c
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/arch/arm/mach-s3c6410/setup-sdhci.c 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/arch/arm/mach-s3c6410/setup-sdhci.c
@@ -0,0 +1,103 @@
+/* linux/arch/arm/mach-s3c6410/setup-sdhci.c
+ *
@@ -21632,10 +21364,8 @@ Index: linux-2.6.28/arch/arm/mach-s3c6410/setup-sdhci.c
+// s3c_gpio_setpull(S3C64XX_GPG(6), S3C_GPIO_PULL_UP);
+// s3c_gpio_cfgpin(S3C64XX_GPG(6), S3C_GPIO_SFN(3));
+}
-Index: linux-2.6.28/arch/arm/Makefile
-===================================================================
---- linux-2.6.28.orig/arch/arm/Makefile 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.28/arch/arm/Makefile 2009-01-02 00:01:56.000000000 +0100
+--- a/arch/arm/Makefile
++++ b/arch/arm/Makefile
@@ -121,7 +121,10 @@ endif
machine-$(CONFIG_ARCH_OMAP3) := omap2
plat-$(CONFIG_ARCH_OMAP) := omap
@@ -21647,10 +21377,8 @@ Index: linux-2.6.28/arch/arm/Makefile
machine-$(CONFIG_ARCH_LH7A40X) := lh7a40x
machine-$(CONFIG_ARCH_VERSATILE) := versatile
machine-$(CONFIG_ARCH_IMX) := imx
-Index: linux-2.6.28/arch/arm/mm/Kconfig
-===================================================================
---- linux-2.6.28.orig/arch/arm/mm/Kconfig 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.28/arch/arm/mm/Kconfig 2009-01-02 00:01:56.000000000 +0100
+--- a/arch/arm/mm/Kconfig
++++ b/arch/arm/mm/Kconfig
@@ -183,14 +183,14 @@ config CPU_ARM926T
depends on ARCH_INTEGRATOR || ARCH_VERSATILE_PB || \
MACH_VERSATILE_AB || ARCH_OMAP730 || \
@@ -21680,10 +21408,8 @@ Index: linux-2.6.28/arch/arm/mm/Kconfig
select CPU_32v6
select CPU_ABRT_EV6
select CPU_PABRT_NOIFAR
-Index: linux-2.6.28/arch/arm/plat-s3c/clock.c
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/arch/arm/plat-s3c/clock.c 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/arch/arm/plat-s3c/clock.c
@@ -0,0 +1,369 @@
+/* linux/arch/arm/plat-s3c24xx/clock.c
+ *
@@ -22054,10 +21780,8 @@ Index: linux-2.6.28/arch/arm/plat-s3c/clock.c
+ return 0;
+}
+
-Index: linux-2.6.28/arch/arm/plat-s3c/dev-fb.c
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/arch/arm/plat-s3c/dev-fb.c 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/arch/arm/plat-s3c/dev-fb.c
@@ -0,0 +1,72 @@
+/* linux/arch/arm/plat-s3c/dev-fb.c
+ *
@@ -22131,10 +21855,8 @@ Index: linux-2.6.28/arch/arm/plat-s3c/dev-fb.c
+
+ s3c_device_fb.dev.platform_data = npd;
+}
-Index: linux-2.6.28/arch/arm/plat-s3c/dev-hsmmc1.c
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/arch/arm/plat-s3c/dev-hsmmc1.c 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/arch/arm/plat-s3c/dev-hsmmc1.c
@@ -0,0 +1,68 @@
+/* linux/arch/arm/plat-s3c/dev-hsmmc1.c
+ *
@@ -22204,10 +21926,8 @@ Index: linux-2.6.28/arch/arm/plat-s3c/dev-hsmmc1.c
+ if (pd->cfg_card)
+ set->cfg_card = pd->cfg_card;
+}
-Index: linux-2.6.28/arch/arm/plat-s3c/dev-hsmmc.c
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/arch/arm/plat-s3c/dev-hsmmc.c 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/arch/arm/plat-s3c/dev-hsmmc.c
@@ -0,0 +1,68 @@
+/* linux/arch/arm/plat-s3c/dev-hsmmc.c
+ *
@@ -22277,10 +21997,8 @@ Index: linux-2.6.28/arch/arm/plat-s3c/dev-hsmmc.c
+ if (pd->cfg_card)
+ set->cfg_card = pd->cfg_card;
+}
-Index: linux-2.6.28/arch/arm/plat-s3c/dev-i2c0.c
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/arch/arm/plat-s3c/dev-i2c0.c 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/arch/arm/plat-s3c/dev-i2c0.c
@@ -0,0 +1,71 @@
+/* linux/arch/arm/plat-s3c/dev-i2c0.c
+ *
@@ -22353,10 +22071,8 @@ Index: linux-2.6.28/arch/arm/plat-s3c/dev-i2c0.c
+
+ s3c_device_i2c0.dev.platform_data = npd;
+}
-Index: linux-2.6.28/arch/arm/plat-s3c/dev-i2c1.c
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/arch/arm/plat-s3c/dev-i2c1.c 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/arch/arm/plat-s3c/dev-i2c1.c
@@ -0,0 +1,68 @@
+/* linux/arch/arm/plat-s3c/dev-i2c1.c
+ *
@@ -22426,10 +22142,8 @@ Index: linux-2.6.28/arch/arm/plat-s3c/dev-i2c1.c
+
+ s3c_device_i2c1.dev.platform_data = npd;
+}
-Index: linux-2.6.28/arch/arm/plat-s3c/gpio.c
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/arch/arm/plat-s3c/gpio.c 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/arch/arm/plat-s3c/gpio.c
@@ -0,0 +1,156 @@
+/* linux/arch/arm/plat-s3c/gpio.c
+ *
@@ -22587,10 +22301,8 @@ Index: linux-2.6.28/arch/arm/plat-s3c/gpio.c
+ if (ret >= 0)
+ s3c_gpiolib_track(chip);
+}
-Index: linux-2.6.28/arch/arm/plat-s3c/gpio-config.c
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/arch/arm/plat-s3c/gpio-config.c 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/arch/arm/plat-s3c/gpio-config.c
@@ -0,0 +1,163 @@
+/* linux/arch/arm/plat-s3c/gpio-config.c
+ *
@@ -22755,10 +22467,8 @@ Index: linux-2.6.28/arch/arm/plat-s3c/gpio-config.c
+ return (__force s3c_gpio_pull_t)pup;
+}
+#endif
-Index: linux-2.6.28/arch/arm/plat-s3c/include/mach/io.h
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/arch/arm/plat-s3c/include/mach/io.h 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/arch/arm/plat-s3c/include/mach/io.h
@@ -0,0 +1,18 @@
+/* arch/arm/plat-s3c/include/mach/io.h
+ *
@@ -22778,10 +22488,8 @@ Index: linux-2.6.28/arch/arm/plat-s3c/include/mach/io.h
+#define IO_SPACE_LIMIT (0xFFFFFFFF)
+
+#endif
-Index: linux-2.6.28/arch/arm/plat-s3c/include/mach/timex.h
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/arch/arm/plat-s3c/include/mach/timex.h 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/arch/arm/plat-s3c/include/mach/timex.h
@@ -0,0 +1,26 @@
+/* arch/arm/mach-s3c2410/include/mach/timex.h
+ *
@@ -22809,10 +22517,8 @@ Index: linux-2.6.28/arch/arm/plat-s3c/include/mach/timex.h
+
+
+#endif /* __ASM_ARCH_TIMEX_H */
-Index: linux-2.6.28/arch/arm/plat-s3c/include/mach/vmalloc.h
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/arch/arm/plat-s3c/include/mach/vmalloc.h 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/arch/arm/plat-s3c/include/mach/vmalloc.h
@@ -0,0 +1,20 @@
+/* arch/arm/plat-s3c/include/mach/vmalloc.h
+ *
@@ -22834,10 +22540,8 @@ Index: linux-2.6.28/arch/arm/plat-s3c/include/mach/vmalloc.h
+#define VMALLOC_END (0xE0000000)
+
+#endif /* __ASM_ARCH_VMALLOC_H */
-Index: linux-2.6.28/arch/arm/plat-s3c/include/plat/clock.h
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/arch/arm/plat-s3c/include/plat/clock.h 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/arch/arm/plat-s3c/include/plat/clock.h
@@ -0,0 +1,88 @@
+/* linux/arch/arm/plat-s3c/include/plat/clock.h
+ *
@@ -22927,10 +22631,8 @@ Index: linux-2.6.28/arch/arm/plat-s3c/include/plat/clock.h
+
+extern void s3c_pwmclk_init(void);
+
-Index: linux-2.6.28/arch/arm/plat-s3c/include/plat/cpu-freq.h
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/arch/arm/plat-s3c/include/plat/cpu-freq.h 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/arch/arm/plat-s3c/include/plat/cpu-freq.h
@@ -0,0 +1,94 @@
+/* arch/arm/plat-s3c/include/plat/cpu-freq.h
+ *
@@ -23026,10 +22728,8 @@ Index: linux-2.6.28/arch/arm/plat-s3c/include/plat/cpu-freq.h
+ return 0;
+}
+#endif /* CONFIG_CPU_FREQ_S3C */
-Index: linux-2.6.28/arch/arm/plat-s3c/include/plat/cpu.h
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/arch/arm/plat-s3c/include/plat/cpu.h 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/arch/arm/plat-s3c/include/plat/cpu.h
@@ -0,0 +1,74 @@
+/* linux/arch/arm/plat-s3c/include/plat/cpu.h
+ *
@@ -23105,10 +22805,8 @@ Index: linux-2.6.28/arch/arm/plat-s3c/include/plat/cpu.h
+extern struct sysdev_class s3c6410_sysclass;
+extern struct sysdev_class s3c64xx_sysclass;
+
-Index: linux-2.6.28/arch/arm/plat-s3c/include/plat/debug-macro.S
-===================================================================
---- linux-2.6.28.orig/arch/arm/plat-s3c/include/plat/debug-macro.S 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.28/arch/arm/plat-s3c/include/plat/debug-macro.S 2009-01-02 00:01:56.000000000 +0100
+--- a/arch/arm/plat-s3c/include/plat/debug-macro.S
++++ b/arch/arm/plat-s3c/include/plat/debug-macro.S
@@ -20,7 +20,7 @@
.endm
@@ -23118,10 +22816,8 @@ Index: linux-2.6.28/arch/arm/plat-s3c/include/plat/debug-macro.S
#endif
.macro fifo_full_s3c2440 rd, rx
-Index: linux-2.6.28/arch/arm/plat-s3c/include/plat/devs.h
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/arch/arm/plat-s3c/include/plat/devs.h 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/arch/arm/plat-s3c/include/plat/devs.h
@@ -0,0 +1,55 @@
+/* linux/include/asm-arm/plat-s3c24xx/devs.h
+ *
@@ -23178,10 +22874,8 @@ Index: linux-2.6.28/arch/arm/plat-s3c/include/plat/devs.h
+
+extern struct platform_device s3c_device_camif;
+#endif
-Index: linux-2.6.28/arch/arm/plat-s3c/include/plat/fb.h
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/arch/arm/plat-s3c/include/plat/fb.h 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/arch/arm/plat-s3c/include/plat/fb.h
@@ -0,0 +1,73 @@
+/* linux/arch/arm/plat-s3c/include/plat/fb.h
+ *
@@ -23256,10 +22950,8 @@ Index: linux-2.6.28/arch/arm/plat-s3c/include/plat/fb.h
+extern void s3c64xx_fb_gpio_setup_24bpp(void);
+
+#endif /* __PLAT_S3C_FB_H */
-Index: linux-2.6.28/arch/arm/plat-s3c/include/plat/gpio-cfg.h
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/arch/arm/plat-s3c/include/plat/gpio-cfg.h 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/arch/arm/plat-s3c/include/plat/gpio-cfg.h
@@ -0,0 +1,110 @@
+/* linux/arch/arm/plat-s3c/include/plat/gpio-cfg.h
+ *
@@ -23371,10 +23063,8 @@ Index: linux-2.6.28/arch/arm/plat-s3c/include/plat/gpio-cfg.h
+extern s3c_gpio_pull_t s3c_gpio_getpull(unsigned int pin);
+
+#endif /* __PLAT_GPIO_CFG_H */
-Index: linux-2.6.28/arch/arm/plat-s3c/include/plat/gpio-cfg-helpers.h
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/arch/arm/plat-s3c/include/plat/gpio-cfg-helpers.h 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/arch/arm/plat-s3c/include/plat/gpio-cfg-helpers.h
@@ -0,0 +1,176 @@
+/* linux/arch/arm/plat-s3c/include/plat/gpio-cfg-helper.h
+ *
@@ -23552,10 +23242,8 @@ Index: linux-2.6.28/arch/arm/plat-s3c/include/plat/gpio-cfg-helpers.h
+
+#endif /* __PLAT_GPIO_CFG_HELPERS_H */
+
-Index: linux-2.6.28/arch/arm/plat-s3c/include/plat/gpio-core.h
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/arch/arm/plat-s3c/include/plat/gpio-core.h 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/arch/arm/plat-s3c/include/plat/gpio-core.h
@@ -0,0 +1,107 @@
+/* linux/arch/arm/plat-s3c/include/plat/gpio-core.h
+ *
@@ -23664,10 +23352,8 @@ Index: linux-2.6.28/arch/arm/plat-s3c/include/plat/gpio-core.h
+#define __gpio_pm(x) NULL
+
+#endif /* CONFIG_PM */
-Index: linux-2.6.28/arch/arm/plat-s3c/include/plat/iic-core.h
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/arch/arm/plat-s3c/include/plat/iic-core.h 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/arch/arm/plat-s3c/include/plat/iic-core.h
@@ -0,0 +1,35 @@
+/* arch/arm/mach-s3c2410/include/mach/iic-core.h
+ *
@@ -23704,10 +23390,8 @@ Index: linux-2.6.28/arch/arm/plat-s3c/include/plat/iic-core.h
+}
+
+#endif /* __ASM_ARCH_IIC_H */
-Index: linux-2.6.28/arch/arm/plat-s3c/include/plat/iic.h
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/arch/arm/plat-s3c/include/plat/iic.h 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/arch/arm/plat-s3c/include/plat/iic.h
@@ -0,0 +1,57 @@
+/* arch/arm/mach-s3c2410/include/mach/iic.h
+ *
@@ -23766,10 +23450,8 @@ Index: linux-2.6.28/arch/arm/plat-s3c/include/plat/iic.h
+extern void s3c_i2c1_cfg_gpio(struct platform_device *dev);
+
+#endif /* __ASM_ARCH_IIC_H */
-Index: linux-2.6.28/arch/arm/plat-s3c/include/plat/map-base.h
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/arch/arm/plat-s3c/include/plat/map-base.h 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/arch/arm/plat-s3c/include/plat/map-base.h
@@ -0,0 +1,40 @@
+/* linux/include/asm-arm/plat-s3c/map.h
+ *
@@ -23811,10 +23493,8 @@ Index: linux-2.6.28/arch/arm/plat-s3c/include/plat/map-base.h
+#define S3C_VA_UART S3C_ADDR(0x01000000) /* UART */
+
+#endif /* __ASM_PLAT_MAP_H */
-Index: linux-2.6.28/arch/arm/plat-s3c/include/plat/map.h
-===================================================================
---- linux-2.6.28.orig/arch/arm/plat-s3c/include/plat/map.h 2008-12-25 00:26:37.000000000 +0100
-+++ /dev/null 1970-01-01 00:00:00.000000000 +0000
+--- a/arch/arm/plat-s3c/include/plat/map.h
++++ /dev/null
@@ -1,40 +0,0 @@
-/* linux/include/asm-arm/plat-s3c/map.h
- *
@@ -23856,10 +23536,8 @@ Index: linux-2.6.28/arch/arm/plat-s3c/include/plat/map.h
-#define S3C_VA_UART S3C_ADDR(0x01000000) /* UART */
-
-#endif /* __ASM_PLAT_MAP_H */
-Index: linux-2.6.28/arch/arm/plat-s3c/include/plat/nand.h
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/arch/arm/plat-s3c/include/plat/nand.h 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/arch/arm/plat-s3c/include/plat/nand.h
@@ -0,0 +1,56 @@
+/* arch/arm/mach-s3c2410/include/mach/nand.h
+ *
@@ -23917,10 +23595,8 @@ Index: linux-2.6.28/arch/arm/plat-s3c/include/plat/nand.h
+ int chip);
+};
+
-Index: linux-2.6.28/arch/arm/plat-s3c/include/plat/pm.h
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/arch/arm/plat-s3c/include/plat/pm.h 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/arch/arm/plat-s3c/include/plat/pm.h
@@ -0,0 +1,184 @@
+/* linux/include/asm-arm/plat-s3c24xx/pm.h
+ *
@@ -24106,10 +23782,8 @@ Index: linux-2.6.28/arch/arm/plat-s3c/include/plat/pm.h
+extern void s3c_pm_save_core(void);
+extern void s3c_pm_restore_core(void);
+
-Index: linux-2.6.28/arch/arm/plat-s3c/include/plat/regs-ac97.h
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/arch/arm/plat-s3c/include/plat/regs-ac97.h 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/arch/arm/plat-s3c/include/plat/regs-ac97.h
@@ -0,0 +1,67 @@
+/* arch/arm/mach-s3c2410/include/mach/regs-ac97.h
+ *
@@ -24178,10 +23852,8 @@ Index: linux-2.6.28/arch/arm/plat-s3c/include/plat/regs-ac97.h
+#define S3C_AC97_MIC_DATA (0x1C)
+
+#endif /* __ASM_ARCH_REGS_AC97_H */
-Index: linux-2.6.28/arch/arm/plat-s3c/include/plat/regs-fb.h
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/arch/arm/plat-s3c/include/plat/regs-fb.h 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/arch/arm/plat-s3c/include/plat/regs-fb.h
@@ -0,0 +1,366 @@
+/* arch/arm/plat-s3c/include/plat/regs-fb.h
+ *
@@ -24549,10 +24221,8 @@ Index: linux-2.6.28/arch/arm/plat-s3c/include/plat/regs-fb.h
+#define WPALCON_W0PAL_16BPP_A555 (0x5 << 0)
+#define WPALCON_W0PAL_16BPP_565 (0x6 << 0)
+
-Index: linux-2.6.28/arch/arm/plat-s3c/include/plat/regs-iic.h
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/arch/arm/plat-s3c/include/plat/regs-iic.h 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/arch/arm/plat-s3c/include/plat/regs-iic.h
@@ -0,0 +1,56 @@
+/* arch/arm/mach-s3c2410/include/mach/regs-iic.h
+ *
@@ -24610,10 +24280,8 @@ Index: linux-2.6.28/arch/arm/plat-s3c/include/plat/regs-iic.h
+#define S3C2410_IICLC_FILTER_ON (1<<2)
+
+#endif /* __ASM_ARCH_REGS_IIC_H */
-Index: linux-2.6.28/arch/arm/plat-s3c/include/plat/regs-irqtype.h
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/arch/arm/plat-s3c/include/plat/regs-irqtype.h 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/arch/arm/plat-s3c/include/plat/regs-irqtype.h
@@ -0,0 +1,21 @@
+/* arch/arm/plat-s3c/include/plat/regs-irqtype.h
+ *
@@ -24636,10 +24304,8 @@ Index: linux-2.6.28/arch/arm/plat-s3c/include/plat/regs-irqtype.h
+#define S3C2410_EXTINT_FALLEDGE (0x02)
+#define S3C2410_EXTINT_RISEEDGE (0x04)
+#define S3C2410_EXTINT_BOTHEDGE (0x06)
-Index: linux-2.6.28/arch/arm/plat-s3c/include/plat/regs-nand.h
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/arch/arm/plat-s3c/include/plat/regs-nand.h 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/arch/arm/plat-s3c/include/plat/regs-nand.h
@@ -0,0 +1,123 @@
+/* arch/arm/mach-s3c2410/include/mach/regs-nand.h
+ *
@@ -24764,10 +24430,8 @@ Index: linux-2.6.28/arch/arm/plat-s3c/include/plat/regs-nand.h
+
+#endif /* __ASM_ARM_REGS_NAND */
+
-Index: linux-2.6.28/arch/arm/plat-s3c/include/plat/regs-rtc.h
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/arch/arm/plat-s3c/include/plat/regs-rtc.h 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/arch/arm/plat-s3c/include/plat/regs-rtc.h
@@ -0,0 +1,61 @@
+/* arch/arm/mach-s3c2410/include/mach/regs-rtc.h
+ *
@@ -24830,10 +24494,8 @@ Index: linux-2.6.28/arch/arm/plat-s3c/include/plat/regs-rtc.h
+
+
+#endif /* __ASM_ARCH_REGS_RTC_H */
-Index: linux-2.6.28/arch/arm/plat-s3c/include/plat/regs-sdhci.h
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/arch/arm/plat-s3c/include/plat/regs-sdhci.h 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/arch/arm/plat-s3c/include/plat/regs-sdhci.h
@@ -0,0 +1,87 @@
+/* linux/arch/arm/plat-s3c/include/plat/regs-sdhci.h
+ *
@@ -24922,10 +24584,8 @@ Index: linux-2.6.28/arch/arm/plat-s3c/include/plat/regs-sdhci.h
+#define S3C64XX_SDHCI_CONTROL4_BUSY (1)
+
+#endif /* __PLAT_S3C_SDHCI_REGS_H */
-Index: linux-2.6.28/arch/arm/plat-s3c/include/plat/regs-serial.h
-===================================================================
---- linux-2.6.28.orig/arch/arm/plat-s3c/include/plat/regs-serial.h 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.28/arch/arm/plat-s3c/include/plat/regs-serial.h 2009-01-02 00:01:56.000000000 +0100
+--- a/arch/arm/plat-s3c/include/plat/regs-serial.h
++++ b/arch/arm/plat-s3c/include/plat/regs-serial.h
@@ -77,6 +77,12 @@
#define S3C2440_UCON_FCLK (3<<10)
#define S3C2443_UCON_EPLL (3<<10)
@@ -24975,10 +24635,8 @@ Index: linux-2.6.28/arch/arm/plat-s3c/include/plat/regs-serial.h
#endif /* __ASSEMBLY__ */
-Index: linux-2.6.28/arch/arm/plat-s3c/include/plat/regs-timer.h
-===================================================================
---- linux-2.6.28.orig/arch/arm/plat-s3c/include/plat/regs-timer.h 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.28/arch/arm/plat-s3c/include/plat/regs-timer.h 2009-01-02 00:01:56.000000000 +0100
+--- a/arch/arm/plat-s3c/include/plat/regs-timer.h
++++ b/arch/arm/plat-s3c/include/plat/regs-timer.h
@@ -10,7 +10,6 @@
* S3C2410 Timer configuration
*/
@@ -25011,10 +24669,8 @@ Index: linux-2.6.28/arch/arm/plat-s3c/include/plat/regs-timer.h
#define S3C2410_TCFG1_SHIFT(x) ((x) * 4)
/* for each timer, we have an count buffer, an compare buffer and
-Index: linux-2.6.28/arch/arm/plat-s3c/include/plat/regs-watchdog.h
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/arch/arm/plat-s3c/include/plat/regs-watchdog.h 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/arch/arm/plat-s3c/include/plat/regs-watchdog.h
@@ -0,0 +1,41 @@
+/* arch/arm/mach-s3c2410/include/mach/regs-watchdog.h
+ *
@@ -25057,10 +24713,8 @@ Index: linux-2.6.28/arch/arm/plat-s3c/include/plat/regs-watchdog.h
+#endif /* __ASM_ARCH_REGS_WATCHDOG_H */
+
+
-Index: linux-2.6.28/arch/arm/plat-s3c/include/plat/sdhci.h
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/arch/arm/plat-s3c/include/plat/sdhci.h 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/arch/arm/plat-s3c/include/plat/sdhci.h
@@ -0,0 +1,112 @@
+/* linux/arch/arm/plat-s3c/include/plat/sdhci.h
+ *
@@ -25174,10 +24828,8 @@ Index: linux-2.6.28/arch/arm/plat-s3c/include/plat/sdhci.h
+#endif /* CONFIG_S3C6410_SETUP_SDHCI */
+
+#endif /* __PLAT_S3C_SDHCI_H */
-Index: linux-2.6.28/arch/arm/plat-s3c/include/plat/uncompress.h
-===================================================================
---- linux-2.6.28.orig/arch/arm/plat-s3c/include/plat/uncompress.h 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.28/arch/arm/plat-s3c/include/plat/uncompress.h 2009-01-02 00:01:56.000000000 +0100
+--- a/arch/arm/plat-s3c/include/plat/uncompress.h
++++ b/arch/arm/plat-s3c/include/plat/uncompress.h
@@ -28,7 +28,7 @@ static void arch_detect_cpu(void);
/* defines for UART registers */
@@ -25238,10 +24890,8 @@ Index: linux-2.6.28/arch/arm/plat-s3c/include/plat/uncompress.h
}
-Index: linux-2.6.28/arch/arm/plat-s3c/init.c
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/arch/arm/plat-s3c/init.c 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/arch/arm/plat-s3c/init.c
@@ -0,0 +1,161 @@
+/* linux/arch/arm/plat-s3c/init.c
+ *
@@ -25404,10 +25054,8 @@ Index: linux-2.6.28/arch/arm/plat-s3c/init.c
+}
+
+arch_initcall(s3c_arch_init);
-Index: linux-2.6.28/arch/arm/plat-s3c/Kconfig
-===================================================================
---- linux-2.6.28.orig/arch/arm/plat-s3c/Kconfig 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.28/arch/arm/plat-s3c/Kconfig 2009-01-02 00:01:56.000000000 +0100
+--- a/arch/arm/plat-s3c/Kconfig
++++ b/arch/arm/plat-s3c/Kconfig
@@ -6,8 +6,8 @@
config PLAT_S3C
@@ -25553,10 +25201,8 @@ Index: linux-2.6.28/arch/arm/plat-s3c/Kconfig
+ depends on PLAT_S3C
+ help
+ Compile in platform device definition for framebuffer
-Index: linux-2.6.28/arch/arm/plat-s3c/Makefile
-===================================================================
---- linux-2.6.28.orig/arch/arm/plat-s3c/Makefile 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.28/arch/arm/plat-s3c/Makefile 2009-01-02 00:01:56.000000000 +0100
+--- a/arch/arm/plat-s3c/Makefile
++++ b/arch/arm/plat-s3c/Makefile
@@ -1,3 +1,33 @@
-# dummy makefile, currently just including asm/arm/plat-s3c/include/plat
+# arch/arm/plat-s3c/Makefile
@@ -25593,10 +25239,8 @@ Index: linux-2.6.28/arch/arm/plat-s3c/Makefile
+obj-y += dev-i2c0.o
+obj-$(CONFIG_S3C_DEV_I2C1) += dev-i2c1.o
+obj-$(CONFIG_S3C_DEV_FB) += dev-fb.o
-Index: linux-2.6.28/arch/arm/plat-s3c/pm.c
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/arch/arm/plat-s3c/pm.c 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/arch/arm/plat-s3c/pm.c
@@ -0,0 +1,387 @@
+/* linux/arch/arm/plat-s3c/pm.c
+ *
@@ -25985,10 +25629,8 @@ Index: linux-2.6.28/arch/arm/plat-s3c/pm.c
+ suspend_set_ops(&s3c_pm_ops);
+ return 0;
+}
-Index: linux-2.6.28/arch/arm/plat-s3c/pm-check.c
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/arch/arm/plat-s3c/pm-check.c 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/arch/arm/plat-s3c/pm-check.c
@@ -0,0 +1,242 @@
+/* linux/arch/arm/plat-s3c/pm-check.c
+ * originally in linux/arch/arm/plat-s3c24xx/pm.c
@@ -26232,10 +25874,8 @@ Index: linux-2.6.28/arch/arm/plat-s3c/pm-check.c
+ crcs = NULL;
+}
+
-Index: linux-2.6.28/arch/arm/plat-s3c/pm-gpio.c
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/arch/arm/plat-s3c/pm-gpio.c 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/arch/arm/plat-s3c/pm-gpio.c
@@ -0,0 +1,378 @@
+/* linux/arch/arm/plat-s3c/pm-gpio.c
+ *
@@ -26615,10 +26255,8 @@ Index: linux-2.6.28/arch/arm/plat-s3c/pm-gpio.c
+ gpio_nr += CONFIG_S3C_GPIO_SPACE;
+ }
+}
-Index: linux-2.6.28/arch/arm/plat-s3c/pwm-clock.c
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/arch/arm/plat-s3c/pwm-clock.c 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/arch/arm/plat-s3c/pwm-clock.c
@@ -0,0 +1,463 @@
+/* linux/arch/arm/plat-s3c24xx/pwm-clock.c
+ *
@@ -27083,10 +26721,8 @@ Index: linux-2.6.28/arch/arm/plat-s3c/pwm-clock.c
+ }
+ }
+}
-Index: linux-2.6.28/arch/arm/plat-s3c/time.c
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/arch/arm/plat-s3c/time.c 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/arch/arm/plat-s3c/time.c
@@ -0,0 +1,285 @@
+/* linux/arch/arm/plat-s3c24xx/time.c
+ *
@@ -27373,10 +27009,8 @@ Index: linux-2.6.28/arch/arm/plat-s3c/time.c
+ .offset = s3c2410_gettimeoffset,
+ .resume = s3c2410_timer_setup
+};
-Index: linux-2.6.28/arch/arm/plat-s3c24xx/clock.c
-===================================================================
---- linux-2.6.28.orig/arch/arm/plat-s3c24xx/clock.c 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.28/arch/arm/plat-s3c24xx/clock.c 2009-01-02 00:01:56.000000000 +0100
+--- a/arch/arm/plat-s3c24xx/clock.c
++++ b/arch/arm/plat-s3c24xx/clock.c
@@ -27,18 +27,8 @@
*/
@@ -27895,10 +27529,8 @@ Index: linux-2.6.28/arch/arm/plat-s3c24xx/clock.c
-
- return 0;
}
-Index: linux-2.6.28/arch/arm/plat-s3c24xx/clock-dclk.c
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/arch/arm/plat-s3c24xx/clock-dclk.c 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/arch/arm/plat-s3c24xx/clock-dclk.c
@@ -0,0 +1,194 @@
+/* linux/arch/arm/plat-s3c24xx/clock-dclk.c
+ *
@@ -28094,10 +27726,8 @@ Index: linux-2.6.28/arch/arm/plat-s3c24xx/clock-dclk.c
+ .id = -1,
+ .set_parent = s3c24xx_clkout_setparent,
+};
-Index: linux-2.6.28/arch/arm/plat-s3c24xx/common-smdk.c
-===================================================================
---- linux-2.6.28.orig/arch/arm/plat-s3c24xx/common-smdk.c 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.28/arch/arm/plat-s3c24xx/common-smdk.c 2009-01-02 00:01:56.000000000 +0100
+--- a/arch/arm/plat-s3c24xx/common-smdk.c
++++ b/arch/arm/plat-s3c24xx/common-smdk.c
@@ -38,7 +38,7 @@
#include <mach/regs-gpio.h>
#include <mach/leds-gpio.h>
@@ -28114,10 +27744,8 @@ Index: linux-2.6.28/arch/arm/plat-s3c24xx/common-smdk.c
- s3c2410_pm_init();
+ s3c_pm_init();
}
-Index: linux-2.6.28/arch/arm/plat-s3c24xx/cpu.c
-===================================================================
---- linux-2.6.28.orig/arch/arm/plat-s3c24xx/cpu.c 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.28/arch/arm/plat-s3c24xx/cpu.c 2009-01-02 00:01:56.000000000 +0100
+--- a/arch/arm/plat-s3c24xx/cpu.c
++++ b/arch/arm/plat-s3c24xx/cpu.c
@@ -55,16 +55,6 @@
#include <plat/s3c2442.h>
#include <plat/s3c2443.h>
@@ -28311,10 +27939,8 @@ Index: linux-2.6.28/arch/arm/plat-s3c24xx/cpu.c
-}
-
-arch_initcall(s3c_arch_init);
-Index: linux-2.6.28/arch/arm/plat-s3c24xx/devs.c
-===================================================================
---- linux-2.6.28.orig/arch/arm/plat-s3c24xx/devs.c 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.28/arch/arm/plat-s3c24xx/devs.c 2009-01-02 00:01:56.000000000 +0100
+--- a/arch/arm/plat-s3c24xx/devs.c
++++ b/arch/arm/plat-s3c24xx/devs.c
@@ -26,14 +26,16 @@
#include <asm/mach/irq.h>
#include <mach/fb.h>
@@ -28501,10 +28127,8 @@ Index: linux-2.6.28/arch/arm/plat-s3c24xx/devs.c
/* SPI (0) */
static struct resource s3c_spi0_resource[] = {
-Index: linux-2.6.28/arch/arm/plat-s3c24xx/gpio.c
-===================================================================
---- linux-2.6.28.orig/arch/arm/plat-s3c24xx/gpio.c 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.28/arch/arm/plat-s3c24xx/gpio.c 2009-01-02 00:01:56.000000000 +0100
+--- a/arch/arm/plat-s3c24xx/gpio.c
++++ b/arch/arm/plat-s3c24xx/gpio.c
@@ -32,6 +32,7 @@
#include <asm/irq.h>
@@ -28937,10 +28561,8 @@ Index: linux-2.6.28/arch/arm/plat-s3c24xx/gpio.c
+}
+EXPORT_SYMBOL(s3c24xx_dump_gpio_states);
+
-Index: linux-2.6.28/arch/arm/plat-s3c24xx/gpiolib.c
-===================================================================
---- linux-2.6.28.orig/arch/arm/plat-s3c24xx/gpiolib.c 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.28/arch/arm/plat-s3c24xx/gpiolib.c 2009-01-02 00:01:56.000000000 +0100
+--- a/arch/arm/plat-s3c24xx/gpiolib.c
++++ b/arch/arm/plat-s3c24xx/gpiolib.c
@@ -19,104 +19,13 @@
#include <linux/io.h>
#include <linux/gpio.h>
@@ -29187,10 +28809,8 @@ Index: linux-2.6.28/arch/arm/plat-s3c24xx/gpiolib.c
return 0;
}
-Index: linux-2.6.28/arch/arm/plat-s3c24xx/gta02_pm_wlan.c
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/arch/arm/plat-s3c24xx/gta02_pm_wlan.c 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/arch/arm/plat-s3c24xx/gta02_pm_wlan.c
@@ -0,0 +1,161 @@
+/*
+ * GTA02 WLAN power management
@@ -29353,10 +28973,8 @@ Index: linux-2.6.28/arch/arm/plat-s3c24xx/gta02_pm_wlan.c
+MODULE_LICENSE("GPL");
+MODULE_AUTHOR("Andy Green <andy@openmoko.com>");
+MODULE_DESCRIPTION("Openmoko GTA02 WLAN power management");
-Index: linux-2.6.28/arch/arm/plat-s3c24xx/include/mach/pwm-clock.h
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/arch/arm/plat-s3c24xx/include/mach/pwm-clock.h 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/arch/arm/plat-s3c24xx/include/mach/pwm-clock.h
@@ -0,0 +1,55 @@
+/* linux/arch/arm/plat-s3c24xx/include/mach/pwm-clock.h
+ *
@@ -29413,10 +29031,8 @@ Index: linux-2.6.28/arch/arm/plat-s3c24xx/include/mach/pwm-clock.h
+}
+
+#define S3C_TCFG1_MUX_TCLK S3C2410_TCFG1_MUX_TCLK
-Index: linux-2.6.28/arch/arm/plat-s3c24xx/include/plat/clock.h
-===================================================================
---- linux-2.6.28.orig/arch/arm/plat-s3c24xx/include/plat/clock.h 2008-12-25 00:26:37.000000000 +0100
-+++ /dev/null 1970-01-01 00:00:00.000000000 +0000
+--- a/arch/arm/plat-s3c24xx/include/plat/clock.h
++++ /dev/null
@@ -1,64 +0,0 @@
-/* linux/include/asm-arm/plat-s3c24xx/clock.h
- * linux/arch/arm/mach-s3c2410/clock.h
@@ -29482,10 +29098,8 @@ Index: linux-2.6.28/arch/arm/plat-s3c24xx/include/plat/clock.h
- unsigned long fclk,
- unsigned long hclk,
- unsigned long pclk);
-Index: linux-2.6.28/arch/arm/plat-s3c24xx/include/plat/cpu.h
-===================================================================
---- linux-2.6.28.orig/arch/arm/plat-s3c24xx/include/plat/cpu.h 2008-12-25 00:26:37.000000000 +0100
-+++ /dev/null 1970-01-01 00:00:00.000000000 +0000
+--- a/arch/arm/plat-s3c24xx/include/plat/cpu.h
++++ /dev/null
@@ -1,54 +0,0 @@
-/* linux/include/asm-arm/plat-s3c24xx/cpu.h
- *
@@ -29541,10 +29155,8 @@ Index: linux-2.6.28/arch/arm/plat-s3c24xx/include/plat/cpu.h
-extern struct sysdev_class s3c2440_sysclass;
-extern struct sysdev_class s3c2442_sysclass;
-extern struct sysdev_class s3c2443_sysclass;
-Index: linux-2.6.28/arch/arm/plat-s3c24xx/include/plat/devs.h
-===================================================================
---- linux-2.6.28.orig/arch/arm/plat-s3c24xx/include/plat/devs.h 2008-12-25 00:26:37.000000000 +0100
-+++ /dev/null 1970-01-01 00:00:00.000000000 +0000
+--- a/arch/arm/plat-s3c24xx/include/plat/devs.h
++++ /dev/null
@@ -1,49 +0,0 @@
-/* linux/include/asm-arm/plat-s3c24xx/devs.h
- *
@@ -29595,10 +29207,8 @@ Index: linux-2.6.28/arch/arm/plat-s3c24xx/include/plat/devs.h
-extern struct platform_device s3c_device_camif;
-
-#endif
-Index: linux-2.6.28/arch/arm/plat-s3c24xx/include/plat/irq.h
-===================================================================
---- linux-2.6.28.orig/arch/arm/plat-s3c24xx/include/plat/irq.h 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.28/arch/arm/plat-s3c24xx/include/plat/irq.h 2009-01-02 00:01:56.000000000 +0100
+--- a/arch/arm/plat-s3c24xx/include/plat/irq.h
++++ b/arch/arm/plat-s3c24xx/include/plat/irq.h
@@ -10,6 +10,12 @@
* published by the Free Software Foundation.
*/
@@ -29664,10 +29274,8 @@ Index: linux-2.6.28/arch/arm/plat-s3c24xx/include/plat/irq.h
}
-Index: linux-2.6.28/arch/arm/plat-s3c24xx/include/plat/map.h
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/arch/arm/plat-s3c24xx/include/plat/map.h 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/arch/arm/plat-s3c24xx/include/plat/map.h
@@ -0,0 +1,101 @@
+/* linux/include/asm-arm/plat-s3c24xx/map.h
+ *
@@ -29770,10 +29378,8 @@ Index: linux-2.6.28/arch/arm/plat-s3c24xx/include/plat/map.h
+#endif
+
+#endif /* __ASM_PLAT_S3C24XX_MAP_H */
-Index: linux-2.6.28/arch/arm/plat-s3c24xx/include/plat/mci.h
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/arch/arm/plat-s3c24xx/include/plat/mci.h 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/arch/arm/plat-s3c24xx/include/plat/mci.h
@@ -0,0 +1,15 @@
+#ifndef _ARCH_MCI_H
+#define _ARCH_MCI_H
@@ -29790,10 +29396,8 @@ Index: linux-2.6.28/arch/arm/plat-s3c24xx/include/plat/mci.h
+};
+
+#endif /* _ARCH_NCI_H */
-Index: linux-2.6.28/arch/arm/plat-s3c24xx/include/plat/pll.h
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/arch/arm/plat-s3c24xx/include/plat/pll.h 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/arch/arm/plat-s3c24xx/include/plat/pll.h
@@ -0,0 +1,37 @@
+/* linux/arch/arm/plat-s3c24xx/include/plat/pll.h
+ *
@@ -29832,10 +29436,8 @@ Index: linux-2.6.28/arch/arm/plat-s3c24xx/include/plat/pll.h
+
+ return (unsigned int)fvco;
+}
-Index: linux-2.6.28/arch/arm/plat-s3c24xx/include/plat/pm-core.h
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/arch/arm/plat-s3c24xx/include/plat/pm-core.h 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/arch/arm/plat-s3c24xx/include/plat/pm-core.h
@@ -0,0 +1,64 @@
+/* linux/arch/arm/plat-s3c24xx/include/plat/pll.h
+ *
@@ -29901,10 +29503,8 @@ Index: linux-2.6.28/arch/arm/plat-s3c24xx/include/plat/pm-core.h
+ struct pm_uart_save *save)
+{
+}
-Index: linux-2.6.28/arch/arm/plat-s3c24xx/include/plat/pm.h
-===================================================================
---- linux-2.6.28.orig/arch/arm/plat-s3c24xx/include/plat/pm.h 2008-12-25 00:26:37.000000000 +0100
-+++ /dev/null 1970-01-01 00:00:00.000000000 +0000
+--- a/arch/arm/plat-s3c24xx/include/plat/pm.h
++++ /dev/null
@@ -1,73 +0,0 @@
-/* linux/include/asm-arm/plat-s3c24xx/pm.h
- *
@@ -29979,10 +29579,8 @@ Index: linux-2.6.28/arch/arm/plat-s3c24xx/include/plat/pm.h
-#define s3c24xx_irq_suspend NULL
-#define s3c24xx_irq_resume NULL
-#endif
-Index: linux-2.6.28/arch/arm/plat-s3c24xx/include/plat/regs-spi.h
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/arch/arm/plat-s3c24xx/include/plat/regs-spi.h 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/arch/arm/plat-s3c24xx/include/plat/regs-spi.h
@@ -0,0 +1,82 @@
+/* arch/arm/mach-s3c2410/include/mach/regs-spi.h
+ *
@@ -30066,10 +29664,8 @@ Index: linux-2.6.28/arch/arm/plat-s3c24xx/include/plat/regs-spi.h
+
+
+#endif /* __ASM_ARCH_REGS_SPI_H */
-Index: linux-2.6.28/arch/arm/plat-s3c24xx/include/plat/regs-udc.h
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/arch/arm/plat-s3c24xx/include/plat/regs-udc.h 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/arch/arm/plat-s3c24xx/include/plat/regs-udc.h
@@ -0,0 +1,153 @@
+/* arch/arm/mach-s3c2410/include/mach/regs-udc.h
+ *
@@ -30224,10 +29820,8 @@ Index: linux-2.6.28/arch/arm/plat-s3c24xx/include/plat/regs-udc.h
+
+
+#endif
-Index: linux-2.6.28/arch/arm/plat-s3c24xx/include/plat/s3c2400.h
-===================================================================
---- linux-2.6.28.orig/arch/arm/plat-s3c24xx/include/plat/s3c2400.h 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.28/arch/arm/plat-s3c24xx/include/plat/s3c2400.h 2009-01-02 00:01:56.000000000 +0100
+--- a/arch/arm/plat-s3c24xx/include/plat/s3c2400.h
++++ b/arch/arm/plat-s3c24xx/include/plat/s3c2400.h
@@ -17,7 +17,7 @@
extern int s3c2400_init(void);
@@ -30237,10 +29831,8 @@ Index: linux-2.6.28/arch/arm/plat-s3c24xx/include/plat/s3c2400.h
extern void s3c2400_init_uarts(struct s3c2410_uartcfg *cfg, int no);
-Index: linux-2.6.28/arch/arm/plat-s3c24xx/include/plat/s3c2410.h
-===================================================================
---- linux-2.6.28.orig/arch/arm/plat-s3c24xx/include/plat/s3c2410.h 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.28/arch/arm/plat-s3c24xx/include/plat/s3c2410.h 2009-01-02 00:01:56.000000000 +0100
+--- a/arch/arm/plat-s3c24xx/include/plat/s3c2410.h
++++ b/arch/arm/plat-s3c24xx/include/plat/s3c2410.h
@@ -15,7 +15,7 @@
extern int s3c2410_init(void);
@@ -30250,10 +29842,8 @@ Index: linux-2.6.28/arch/arm/plat-s3c24xx/include/plat/s3c2410.h
extern void s3c2410_init_uarts(struct s3c2410_uartcfg *cfg, int no);
-Index: linux-2.6.28/arch/arm/plat-s3c24xx/include/plat/s3c2412.h
-===================================================================
---- linux-2.6.28.orig/arch/arm/plat-s3c24xx/include/plat/s3c2412.h 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.28/arch/arm/plat-s3c24xx/include/plat/s3c2412.h 2009-01-02 00:01:56.000000000 +0100
+--- a/arch/arm/plat-s3c24xx/include/plat/s3c2412.h
++++ b/arch/arm/plat-s3c24xx/include/plat/s3c2412.h
@@ -14,7 +14,7 @@
extern int s3c2412_init(void);
@@ -30263,10 +29853,8 @@ Index: linux-2.6.28/arch/arm/plat-s3c24xx/include/plat/s3c2412.h
extern void s3c2412_init_uarts(struct s3c2410_uartcfg *cfg, int no);
-Index: linux-2.6.28/arch/arm/plat-s3c24xx/include/plat/s3c2443.h
-===================================================================
---- linux-2.6.28.orig/arch/arm/plat-s3c24xx/include/plat/s3c2443.h 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.28/arch/arm/plat-s3c24xx/include/plat/s3c2443.h 2009-01-02 00:01:56.000000000 +0100
+--- a/arch/arm/plat-s3c24xx/include/plat/s3c2443.h
++++ b/arch/arm/plat-s3c24xx/include/plat/s3c2443.h
@@ -16,7 +16,7 @@ struct s3c2410_uartcfg;
extern int s3c2443_init(void);
@@ -30276,10 +29864,8 @@ Index: linux-2.6.28/arch/arm/plat-s3c24xx/include/plat/s3c2443.h
extern void s3c2443_init_uarts(struct s3c2410_uartcfg *cfg, int no);
-Index: linux-2.6.28/arch/arm/plat-s3c24xx/include/plat/udc.h
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/arch/arm/plat-s3c24xx/include/plat/udc.h 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/arch/arm/plat-s3c24xx/include/plat/udc.h
@@ -0,0 +1,36 @@
+/* arch/arm/mach-s3c2410/include/mach/udc.h
+ *
@@ -30317,10 +29903,8 @@ Index: linux-2.6.28/arch/arm/plat-s3c24xx/include/plat/udc.h
+extern void __init s3c24xx_udc_set_platdata(struct s3c2410_udc_mach_info *);
+
+#endif /* __ASM_ARM_ARCH_UDC_H */
-Index: linux-2.6.28/arch/arm/plat-s3c24xx/irq.c
-===================================================================
---- linux-2.6.28.orig/arch/arm/plat-s3c24xx/irq.c 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.28/arch/arm/plat-s3c24xx/irq.c 2009-01-02 00:01:56.000000000 +0100
+--- a/arch/arm/plat-s3c24xx/irq.c
++++ b/arch/arm/plat-s3c24xx/irq.c
@@ -1,6 +1,6 @@
/* linux/arch/arm/plat-s3c24xx/irq.c
*
@@ -30610,10 +30194,8 @@ Index: linux-2.6.28/arch/arm/plat-s3c24xx/irq.c
last = pend;
}
-Index: linux-2.6.28/arch/arm/plat-s3c24xx/irq-pm.c
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/arch/arm/plat-s3c24xx/irq-pm.c 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/arch/arm/plat-s3c24xx/irq-pm.c
@@ -0,0 +1,118 @@
+/* linux/arch/arm/plat-s3c24xx/irq-om.c
+ *
@@ -30733,10 +30315,8 @@ Index: linux-2.6.28/arch/arm/plat-s3c24xx/irq-pm.c
+
+ return 0;
+}
-Index: linux-2.6.28/arch/arm/plat-s3c24xx/Kconfig
-===================================================================
---- linux-2.6.28.orig/arch/arm/plat-s3c24xx/Kconfig 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.28/arch/arm/plat-s3c24xx/Kconfig 2009-01-02 00:01:56.000000000 +0100
+--- a/arch/arm/plat-s3c24xx/Kconfig
++++ b/arch/arm/plat-s3c24xx/Kconfig
@@ -6,18 +6,32 @@
config PLAT_S3C24XX
@@ -30805,10 +30385,8 @@ Index: linux-2.6.28/arch/arm/plat-s3c24xx/Kconfig
+ Common machine code for Neo1973 hardware
+
endif
-Index: linux-2.6.28/arch/arm/plat-s3c24xx/Makefile
-===================================================================
---- linux-2.6.28.orig/arch/arm/plat-s3c24xx/Makefile 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.28/arch/arm/plat-s3c24xx/Makefile 2009-01-02 00:01:56.000000000 +0100
+--- a/arch/arm/plat-s3c24xx/Makefile
++++ b/arch/arm/plat-s3c24xx/Makefile
@@ -17,9 +17,8 @@ obj-y += irq.o
obj-y += devs.o
obj-y += gpio.o
@@ -30847,10 +30425,8 @@ Index: linux-2.6.28/arch/arm/plat-s3c24xx/Makefile
+ neo1973_pm_bt.o \
+ gta02_pm_wlan.o \
+ neo1973_shadow.o
-Index: linux-2.6.28/arch/arm/plat-s3c24xx/neo1973_pm_bt.c
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/arch/arm/plat-s3c24xx/neo1973_pm_bt.c 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/arch/arm/plat-s3c24xx/neo1973_pm_bt.c
@@ -0,0 +1,323 @@
+/*
+ * Bluetooth PM code for the FIC Neo1973 GSM Phone
@@ -31175,10 +30751,8 @@ Index: linux-2.6.28/arch/arm/plat-s3c24xx/neo1973_pm_bt.c
+MODULE_LICENSE("GPL");
+MODULE_AUTHOR("Harald Welte <laforge@openmoko.org>");
+MODULE_DESCRIPTION(DRVMSG);
-Index: linux-2.6.28/arch/arm/plat-s3c24xx/neo1973_pm_gps.c
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/arch/arm/plat-s3c24xx/neo1973_pm_gps.c 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/arch/arm/plat-s3c24xx/neo1973_pm_gps.c
@@ -0,0 +1,699 @@
+/*
+ * GPS Power Management code for the FIC Neo1973 GSM Phone
@@ -31879,16 +31453,12 @@ Index: linux-2.6.28/arch/arm/plat-s3c24xx/neo1973_pm_gps.c
+MODULE_LICENSE("GPL");
+MODULE_AUTHOR("Harald Welte <laforge@openmoko.org>");
+MODULE_DESCRIPTION("FIC Neo1973 GPS Power Management");
-Index: linux-2.6.28/arch/arm/plat-s3c24xx/neo1973_pm_gps.h
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/arch/arm/plat-s3c24xx/neo1973_pm_gps.h 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/arch/arm/plat-s3c24xx/neo1973_pm_gps.h
@@ -0,0 +1 @@
+extern int neo1973_pm_gps_is_on(void);
-Index: linux-2.6.28/arch/arm/plat-s3c24xx/neo1973_pm_gsm.c
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/arch/arm/plat-s3c24xx/neo1973_pm_gsm.c 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/arch/arm/plat-s3c24xx/neo1973_pm_gsm.c
@@ -0,0 +1,360 @@
+/*
+ * GSM Management code for the FIC Neo1973 GSM Phone
@@ -32250,10 +31820,8 @@ Index: linux-2.6.28/arch/arm/plat-s3c24xx/neo1973_pm_gsm.c
+MODULE_LICENSE("GPL");
+MODULE_AUTHOR("Harald Welte <laforge@openmoko.org>");
+MODULE_DESCRIPTION("FIC Neo1973 GSM Power Management");
-Index: linux-2.6.28/arch/arm/plat-s3c24xx/neo1973_shadow.c
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/arch/arm/plat-s3c24xx/neo1973_shadow.c 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/arch/arm/plat-s3c24xx/neo1973_shadow.c
@@ -0,0 +1,88 @@
+/*
+ * include/asm-arm/plat-s3c24xx/neo1973.h
@@ -32343,10 +31911,8 @@ Index: linux-2.6.28/arch/arm/plat-s3c24xx/neo1973_shadow.c
+ local_irq_restore(flags);
+}
+EXPORT_SYMBOL(neo1973_gpb_setpin);
-Index: linux-2.6.28/arch/arm/plat-s3c24xx/pm.c
-===================================================================
---- linux-2.6.28.orig/arch/arm/plat-s3c24xx/pm.c 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.28/arch/arm/plat-s3c24xx/pm.c 2009-01-02 00:01:56.000000000 +0100
+--- a/arch/arm/plat-s3c24xx/pm.c
++++ b/arch/arm/plat-s3c24xx/pm.c
@@ -31,14 +31,9 @@
#include <linux/errno.h>
#include <linux/time.h>
@@ -33122,10 +32688,8 @@ Index: linux-2.6.28/arch/arm/plat-s3c24xx/pm.c
- suspend_set_ops(&s3c2410_pm_ops);
- return 0;
-}
-Index: linux-2.6.28/arch/arm/plat-s3c24xx/pm-simtec.c
-===================================================================
---- linux-2.6.28.orig/arch/arm/plat-s3c24xx/pm-simtec.c 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.28/arch/arm/plat-s3c24xx/pm-simtec.c 2009-01-02 00:01:56.000000000 +0100
+--- a/arch/arm/plat-s3c24xx/pm-simtec.c
++++ b/arch/arm/plat-s3c24xx/pm-simtec.c
@@ -61,7 +61,7 @@ static __init int pm_simtec_init(void)
__raw_writel(gstatus4, S3C2410_GSTATUS4);
@@ -33135,10 +32699,8 @@ Index: linux-2.6.28/arch/arm/plat-s3c24xx/pm-simtec.c
}
arch_initcall(pm_simtec_init);
-Index: linux-2.6.28/arch/arm/plat-s3c24xx/pwm-clock.c
-===================================================================
---- linux-2.6.28.orig/arch/arm/plat-s3c24xx/pwm-clock.c 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.28/arch/arm/plat-s3c24xx/pwm-clock.c 2009-01-02 00:01:56.000000000 +0100
+--- a/arch/arm/plat-s3c24xx/pwm-clock.c
++++ b/arch/arm/plat-s3c24xx/pwm-clock.c
@@ -24,10 +24,10 @@
#include <mach/regs-clock.h>
#include <mach/regs-gpio.h>
@@ -33153,10 +32715,8 @@ Index: linux-2.6.28/arch/arm/plat-s3c24xx/pwm-clock.c
/* Each of the timers 0 through 5 go through the following
* clock tree, with the inputs depending on the timers.
-Index: linux-2.6.28/arch/arm/plat-s3c24xx/s3c2410-clock.c
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/arch/arm/plat-s3c24xx/s3c2410-clock.c 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/arch/arm/plat-s3c24xx/s3c2410-clock.c
@@ -0,0 +1,277 @@
+/* linux/arch/arm/mach-s3c2410/clock.c
+ *
@@ -33435,10 +32995,8 @@ Index: linux-2.6.28/arch/arm/plat-s3c24xx/s3c2410-clock.c
+ s3c_pwmclk_init();
+ return 0;
+}
-Index: linux-2.6.28/arch/arm/plat-s3c24xx/s3c244x.c
-===================================================================
---- linux-2.6.28.orig/arch/arm/plat-s3c24xx/s3c244x.c 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.28/arch/arm/plat-s3c24xx/s3c244x.c 2009-01-02 00:01:56.000000000 +0100
+--- a/arch/arm/plat-s3c24xx/s3c244x.c
++++ b/arch/arm/plat-s3c24xx/s3c244x.c
@@ -29,6 +29,8 @@
#include <mach/hardware.h>
#include <asm/irq.h>
@@ -33544,10 +33102,8 @@ Index: linux-2.6.28/arch/arm/plat-s3c24xx/s3c244x.c
return 0;
}
-Index: linux-2.6.28/arch/arm/plat-s3c24xx/s3c244x-clock.c
-===================================================================
---- linux-2.6.28.orig/arch/arm/plat-s3c24xx/s3c244x-clock.c 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.28/arch/arm/plat-s3c24xx/s3c244x-clock.c 2009-01-02 00:01:56.000000000 +0100
+--- a/arch/arm/plat-s3c24xx/s3c244x-clock.c
++++ b/arch/arm/plat-s3c24xx/s3c244x-clock.c
@@ -31,7 +31,6 @@
#include <linux/sysdev.h>
#include <linux/interrupt.h>
@@ -33572,10 +33128,8 @@ Index: linux-2.6.28/arch/arm/plat-s3c24xx/s3c244x-clock.c
}
return 0;
-Index: linux-2.6.28/arch/arm/plat-s3c24xx/s3c244x.h
-===================================================================
---- linux-2.6.28.orig/arch/arm/plat-s3c24xx/s3c244x.h 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.28/arch/arm/plat-s3c24xx/s3c244x.h 2009-01-02 00:01:56.000000000 +0100
+--- a/arch/arm/plat-s3c24xx/s3c244x.h
++++ b/arch/arm/plat-s3c24xx/s3c244x.h
@@ -12,7 +12,7 @@
#if defined(CONFIG_CPU_S3C2440) || defined(CONFIG_CPU_S3C2442)
@@ -33585,10 +33139,8 @@ Index: linux-2.6.28/arch/arm/plat-s3c24xx/s3c244x.h
extern void s3c244x_init_uarts(struct s3c2410_uartcfg *cfg, int no);
-Index: linux-2.6.28/arch/arm/plat-s3c24xx/setup-i2c.c
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/arch/arm/plat-s3c24xx/setup-i2c.c 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/arch/arm/plat-s3c24xx/setup-i2c.c
@@ -0,0 +1,25 @@
+/* linux/arch/arm/plat-s3c24xx/setup-i2c.c
+ *
@@ -33615,10 +33167,8 @@ Index: linux-2.6.28/arch/arm/plat-s3c24xx/setup-i2c.c
+ s3c2410_gpio_cfgpin(S3C2410_GPE15, S3C2410_GPE15_IICSDA);
+ s3c2410_gpio_cfgpin(S3C2410_GPE14, S3C2410_GPE14_IICSCL);
+}
-Index: linux-2.6.28/arch/arm/plat-s3c24xx/sleep.S
-===================================================================
---- linux-2.6.28.orig/arch/arm/plat-s3c24xx/sleep.S 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.28/arch/arm/plat-s3c24xx/sleep.S 2009-01-02 00:01:56.000000000 +0100
+--- a/arch/arm/plat-s3c24xx/sleep.S
++++ b/arch/arm/plat-s3c24xx/sleep.S
@@ -41,7 +41,7 @@
.text
@@ -33688,10 +33238,8 @@ Index: linux-2.6.28/arch/arm/plat-s3c24xx/sleep.S
ldmia r0, { r4 - r13 }
mcr p15, 0, r4, c13, c0, 0 @ PID
-Index: linux-2.6.28/arch/arm/plat-s3c24xx/spi-bus0-gpe11_12_13.c
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/arch/arm/plat-s3c24xx/spi-bus0-gpe11_12_13.c 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/arch/arm/plat-s3c24xx/spi-bus0-gpe11_12_13.c
@@ -0,0 +1,37 @@
+/* linux/arch/arm/plat-s3c24xx/spi-bus0-gpe11_12_13.c
+ *
@@ -33730,10 +33278,8 @@ Index: linux-2.6.28/arch/arm/plat-s3c24xx/spi-bus0-gpe11_12_13.c
+ s3c2410_gpio_pullup(S3C2410_GPE13, 1);
+ }
+}
-Index: linux-2.6.28/arch/arm/plat-s3c24xx/spi-bus1-gpg5_6_7.c
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/arch/arm/plat-s3c24xx/spi-bus1-gpg5_6_7.c 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/arch/arm/plat-s3c24xx/spi-bus1-gpg5_6_7.c
@@ -0,0 +1,37 @@
+/* linux/arch/arm/plat-s3c24xx/spi-bus0-gpg5_6_7.c
+ *
@@ -33772,10 +33318,8 @@ Index: linux-2.6.28/arch/arm/plat-s3c24xx/spi-bus1-gpg5_6_7.c
+ s3c2410_gpio_pullup(S3C2410_GPG7, 1);
+ }
+}
-Index: linux-2.6.28/arch/arm/plat-s3c24xx/time.c
-===================================================================
---- linux-2.6.28.orig/arch/arm/plat-s3c24xx/time.c 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.28/arch/arm/plat-s3c24xx/time.c 2009-01-02 00:01:56.000000000 +0100
+--- a/arch/arm/plat-s3c24xx/time.c
++++ b/arch/arm/plat-s3c24xx/time.c
@@ -3,6 +3,8 @@
* Copyright (C) 2003-2005 Simtec Electronics
* Ben Dooks, <ben@simtec.co.uk>
@@ -34097,10 +33641,8 @@ Index: linux-2.6.28/arch/arm/plat-s3c24xx/time.c
+ .dyn_tick = &s3c24xx_dyn_tick_timer,
+#endif
};
-Index: linux-2.6.28/arch/arm/plat-s3c64xx/clock.c
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/arch/arm/plat-s3c64xx/clock.c 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/arch/arm/plat-s3c64xx/clock.c
@@ -0,0 +1,282 @@
+/* linux/arch/arm/plat-s3c64xx/clock.c
+ *
@@ -34384,10 +33926,8 @@ Index: linux-2.6.28/arch/arm/plat-s3c64xx/clock.c
+
+ s3c_pwmclk_init();
+}
-Index: linux-2.6.28/arch/arm/plat-s3c64xx/cpu.c
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/arch/arm/plat-s3c64xx/cpu.c 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/arch/arm/plat-s3c64xx/cpu.c
@@ -0,0 +1,139 @@
+/* linux/arch/arm/plat-s3c64xx/cpu.c
+ *
@@ -34528,10 +34068,8 @@ Index: linux-2.6.28/arch/arm/plat-s3c64xx/cpu.c
+}
+
+core_initcall(s3c64xx_sysdev_init);
-Index: linux-2.6.28/arch/arm/plat-s3c64xx/dev-uart.c
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/arch/arm/plat-s3c64xx/dev-uart.c 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/arch/arm/plat-s3c64xx/dev-uart.c
@@ -0,0 +1,176 @@
+/* linux/arch/arm/plat-s3c64xx/dev-uart.c
+ *
@@ -34709,10 +34247,8 @@ Index: linux-2.6.28/arch/arm/plat-s3c64xx/dev-uart.c
+struct platform_device *s3c24xx_uart_devs[4] = {
+};
+
-Index: linux-2.6.28/arch/arm/plat-s3c64xx/gpiolib.c
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/arch/arm/plat-s3c64xx/gpiolib.c 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/arch/arm/plat-s3c64xx/gpiolib.c
@@ -0,0 +1,428 @@
+/* arch/arm/plat-s3c64xx/gpiolib.c
+ *
@@ -35142,10 +34678,8 @@ Index: linux-2.6.28/arch/arm/plat-s3c64xx/gpiolib.c
+}
+
+arch_initcall(s3c64xx_gpiolib_init);
-Index: linux-2.6.28/arch/arm/plat-s3c64xx/include/plat/gpio-bank-a.h
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/arch/arm/plat-s3c64xx/include/plat/gpio-bank-a.h 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/arch/arm/plat-s3c64xx/include/plat/gpio-bank-a.h
@@ -0,0 +1,48 @@
+/* linux/arch/arm/plat-s3c64xx/include/plat/gpio-bank-a.h
+ *
@@ -35195,10 +34729,8 @@ Index: linux-2.6.28/arch/arm/plat-s3c64xx/include/plat/gpio-bank-a.h
+#define S3C64XX_GPA7_UART_nRTS1 (0x02 << 28)
+#define S3C64XX_GPA7_EINT_G1_7 (0x07 << 28)
+
-Index: linux-2.6.28/arch/arm/plat-s3c64xx/include/plat/gpio-bank-b.h
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/arch/arm/plat-s3c64xx/include/plat/gpio-bank-b.h 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/arch/arm/plat-s3c64xx/include/plat/gpio-bank-b.h
@@ -0,0 +1,60 @@
+/* linux/arch/arm/plat-s3c64xx/include/plat/gpio-bank-b.h
+ *
@@ -35260,10 +34792,8 @@ Index: linux-2.6.28/arch/arm/plat-s3c64xx/include/plat/gpio-bank-b.h
+#define S3C64XX_GPB6_I2C_SDA0 (0x02 << 24)
+#define S3C64XX_GPB6_EINT_G1_14 (0x07 << 24)
+
-Index: linux-2.6.28/arch/arm/plat-s3c64xx/include/plat/gpio-bank-c.h
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/arch/arm/plat-s3c64xx/include/plat/gpio-bank-c.h 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/arch/arm/plat-s3c64xx/include/plat/gpio-bank-c.h
@@ -0,0 +1,53 @@
+/* linux/arch/arm/plat-s3c64xx/include/plat/gpio-bank-c.h
+ *
@@ -35318,10 +34848,8 @@ Index: linux-2.6.28/arch/arm/plat-s3c64xx/include/plat/gpio-bank-c.h
+#define S3C64XX_GPC7_I2S2_V40_DO (0x05 << 28)
+#define S3C64XX_GPC7_EINT_G2_7 (0x07 << 28)
+
-Index: linux-2.6.28/arch/arm/plat-s3c64xx/include/plat/gpio-bank-d.h
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/arch/arm/plat-s3c64xx/include/plat/gpio-bank-d.h 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/arch/arm/plat-s3c64xx/include/plat/gpio-bank-d.h
@@ -0,0 +1,49 @@
+/* linux/arch/arm/plat-s3c64xx/include/plat/gpio-bank-d.h
+ *
@@ -35372,10 +34900,8 @@ Index: linux-2.6.28/arch/arm/plat-s3c64xx/include/plat/gpio-bank-d.h
+#define S3C64XX_GPD4_AC97_SDO (0x04 << 16)
+#define S3C64XX_GPD4_EINT_G3_4 (0x07 << 16)
+
-Index: linux-2.6.28/arch/arm/plat-s3c64xx/include/plat/gpio-bank-e.h
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/arch/arm/plat-s3c64xx/include/plat/gpio-bank-e.h 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/arch/arm/plat-s3c64xx/include/plat/gpio-bank-e.h
@@ -0,0 +1,44 @@
+/* linux/arch/arm/plat-s3c64xx/include/plat/gpio-bank-e.h
+ *
@@ -35421,10 +34947,8 @@ Index: linux-2.6.28/arch/arm/plat-s3c64xx/include/plat/gpio-bank-e.h
+#define S3C64XX_GPE4_I2S1_D0 (0x03 << 16)
+#define S3C64XX_GPE4_AC97_SDO (0x04 << 16)
+
-Index: linux-2.6.28/arch/arm/plat-s3c64xx/include/plat/gpio-bank-f.h
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/arch/arm/plat-s3c64xx/include/plat/gpio-bank-f.h 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/arch/arm/plat-s3c64xx/include/plat/gpio-bank-f.h
@@ -0,0 +1,71 @@
+/* linux/arch/arm/plat-s3c64xx/include/plat/gpio-bank-f.h
+ *
@@ -35497,10 +35021,8 @@ Index: linux-2.6.28/arch/arm/plat-s3c64xx/include/plat/gpio-bank-f.h
+
+#define S3C64XX_GPF15_PWM_TOUT1 (0x02 << 30)
+
-Index: linux-2.6.28/arch/arm/plat-s3c64xx/include/plat/gpio-bank-g.h
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/arch/arm/plat-s3c64xx/include/plat/gpio-bank-g.h 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/arch/arm/plat-s3c64xx/include/plat/gpio-bank-g.h
@@ -0,0 +1,42 @@
+/* linux/arch/arm/plat-s3c64xx/include/plat/gpio-bank-g.h
+ *
@@ -35544,10 +35066,8 @@ Index: linux-2.6.28/arch/arm/plat-s3c64xx/include/plat/gpio-bank-g.h
+#define S3C64XX_GPG5_MMC0_DATA3 (0x02 << 20)
+#define S3C64XX_GPG5_EINT_G5_5 (0x07 << 20)
+
-Index: linux-2.6.28/arch/arm/plat-s3c64xx/include/plat/gpio-bank-h.h
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/arch/arm/plat-s3c64xx/include/plat/gpio-bank-h.h 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/arch/arm/plat-s3c64xx/include/plat/gpio-bank-h.h
@@ -0,0 +1,74 @@
+/* linux/arch/arm/plat-s3c64xx/include/plat/gpio-bank-h.h
+ *
@@ -35623,10 +35143,8 @@ Index: linux-2.6.28/arch/arm/plat-s3c64xx/include/plat/gpio-bank-h.h
+#define S3C64XX_GPH9_I2S_V40_DI (0x05 << 36)
+#define S3C64XX_GPH9_EINT_G6_9 (0x07 << 36)
+
-Index: linux-2.6.28/arch/arm/plat-s3c64xx/include/plat/gpio-bank-i.h
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/arch/arm/plat-s3c64xx/include/plat/gpio-bank-i.h 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/arch/arm/plat-s3c64xx/include/plat/gpio-bank-i.h
@@ -0,0 +1,40 @@
+/* linux/arch/arm/plat-s3c64xx/include/plat/gpio-bank-i.h
+ *
@@ -35668,10 +35186,8 @@ Index: linux-2.6.28/arch/arm/plat-s3c64xx/include/plat/gpio-bank-i.h
+#define S3C64XX_GPI13_VD13 (0x02 << 26)
+#define S3C64XX_GPI14_VD14 (0x02 << 28)
+#define S3C64XX_GPI15_VD15 (0x02 << 30)
-Index: linux-2.6.28/arch/arm/plat-s3c64xx/include/plat/gpio-bank-j.h
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/arch/arm/plat-s3c64xx/include/plat/gpio-bank-j.h 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/arch/arm/plat-s3c64xx/include/plat/gpio-bank-j.h
@@ -0,0 +1,36 @@
+/* linux/arch/arm/plat-s3c64xx/include/plat/gpio-bank-j.h
+ *
@@ -35709,10 +35225,8 @@ Index: linux-2.6.28/arch/arm/plat-s3c64xx/include/plat/gpio-bank-j.h
+#define S3C64XX_GPJ9_LCD_VSYNC (0x02 << 18)
+#define S3C64XX_GPJ10_LCD_VDEN (0x02 << 20)
+#define S3C64XX_GPJ11_LCD_VCLK (0x02 << 22)
-Index: linux-2.6.28/arch/arm/plat-s3c64xx/include/plat/gpio-bank-n.h
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/arch/arm/plat-s3c64xx/include/plat/gpio-bank-n.h 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/arch/arm/plat-s3c64xx/include/plat/gpio-bank-n.h
@@ -0,0 +1,54 @@
+/* linux/arch/arm/plat-s3c64xx/include/plat/gpio-bank-n.h
+ *
@@ -35768,10 +35282,8 @@ Index: linux-2.6.28/arch/arm/plat-s3c64xx/include/plat/gpio-bank-n.h
+#define S3C64XX_GPN13_EINT13 (0x02 << 26)
+#define S3C64XX_GPN14_EINT14 (0x02 << 28)
+#define S3C64XX_GPN15_EINT15 (0x02 << 30)
-Index: linux-2.6.28/arch/arm/plat-s3c64xx/include/plat/gpio-bank-o.h
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/arch/arm/plat-s3c64xx/include/plat/gpio-bank-o.h 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/arch/arm/plat-s3c64xx/include/plat/gpio-bank-o.h
@@ -0,0 +1,70 @@
+/* linux/arch/arm/plat-s3c64xx/include/plat/gpio-bank-o.h
+ *
@@ -35843,10 +35355,8 @@ Index: linux-2.6.28/arch/arm/plat-s3c64xx/include/plat/gpio-bank-o.h
+#define S3C64XX_GPO15_MEM0_ADDR15 (0x02 << 30)
+#define S3C64XX_GPO15_EINT_G7_15 (0x03 << 30)
+
-Index: linux-2.6.28/arch/arm/plat-s3c64xx/include/plat/gpio-bank-p.h
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/arch/arm/plat-s3c64xx/include/plat/gpio-bank-p.h 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/arch/arm/plat-s3c64xx/include/plat/gpio-bank-p.h
@@ -0,0 +1,69 @@
+/* linux/arch/arm/plat-s3c64xx/include/plat/gpio-bank-p.h
+ *
@@ -35917,10 +35427,8 @@ Index: linux-2.6.28/arch/arm/plat-s3c64xx/include/plat/gpio-bank-p.h
+#define S3C64XX_GPP14_MEM0_ATA_CD (0x02 << 28)
+#define S3C64XX_GPP14_EINT_G8_14 (0x03 << 28)
+
-Index: linux-2.6.28/arch/arm/plat-s3c64xx/include/plat/gpio-bank-q.h
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/arch/arm/plat-s3c64xx/include/plat/gpio-bank-q.h 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/arch/arm/plat-s3c64xx/include/plat/gpio-bank-q.h
@@ -0,0 +1,46 @@
+/* linux/arch/arm/plat-s3c64xx/include/plat/gpio-bank-q.h
+ *
@@ -35968,10 +35476,8 @@ Index: linux-2.6.28/arch/arm/plat-s3c64xx/include/plat/gpio-bank-q.h
+#define S3C64XX_GPQ8_MEM0_ADDR16_APDMC (0x02 << 16)
+#define S3C64XX_GPQ8_EINT_G9_8 (0x03 << 16)
+
-Index: linux-2.6.28/arch/arm/plat-s3c64xx/include/plat/irqs.h
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/arch/arm/plat-s3c64xx/include/plat/irqs.h 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/arch/arm/plat-s3c64xx/include/plat/irqs.h
@@ -0,0 +1,202 @@
+/* linux/arch/arm/plat-s3c64xx/include/mach/irqs.h
+ *
@@ -36175,10 +35681,8 @@ Index: linux-2.6.28/arch/arm/plat-s3c64xx/include/plat/irqs.h
+
+#endif /* __ASM_PLAT_S3C64XX_IRQS_H */
+
-Index: linux-2.6.28/arch/arm/plat-s3c64xx/include/plat/pll.h
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/arch/arm/plat-s3c64xx/include/plat/pll.h 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/arch/arm/plat-s3c64xx/include/plat/pll.h
@@ -0,0 +1,74 @@
+/* arch/arm/plat-s3c64xx/include/plat/pll.h
+ *
@@ -36254,10 +35758,8 @@ Index: linux-2.6.28/arch/arm/plat-s3c64xx/include/plat/pll.h
+
+ return result;
+}
-Index: linux-2.6.28/arch/arm/plat-s3c64xx/include/plat/pm-core.h
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/arch/arm/plat-s3c64xx/include/plat/pm-core.h 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/arch/arm/plat-s3c64xx/include/plat/pm-core.h
@@ -0,0 +1,106 @@
+/* linux/arch/arm/plat-s3c64xx/include/plat/pm-core.h
+ *
@@ -36365,10 +35867,8 @@ Index: linux-2.6.28/arch/arm/plat-s3c64xx/include/plat/pm-core.h
+ save->ucon = new_ucon;
+ }
+}
-Index: linux-2.6.28/arch/arm/plat-s3c64xx/include/plat/regs-clock.h
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/arch/arm/plat-s3c64xx/include/plat/regs-clock.h 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/arch/arm/plat-s3c64xx/include/plat/regs-clock.h
@@ -0,0 +1,225 @@
+/* arch/arm/plat-s3c64xx/include/plat/regs-clock.h
+ *
@@ -36595,10 +36095,8 @@ Index: linux-2.6.28/arch/arm/plat-s3c64xx/include/plat/regs-clock.h
+
+
+#endif /* _PLAT_REGS_CLOCK_H */
-Index: linux-2.6.28/arch/arm/plat-s3c64xx/include/plat/regs-gpio.h
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/arch/arm/plat-s3c64xx/include/plat/regs-gpio.h 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/arch/arm/plat-s3c64xx/include/plat/regs-gpio.h
@@ -0,0 +1,187 @@
+/* linux/arch/arm/plat-s3c64xx/include/mach/regs-gpio.h
+ *
@@ -36787,10 +36285,8 @@ Index: linux-2.6.28/arch/arm/plat-s3c64xx/include/plat/regs-gpio.h
+
+#endif /* __ASM_PLAT_S3C64XX_REGS_GPIO_H */
+
-Index: linux-2.6.28/arch/arm/plat-s3c64xx/include/plat/regs-gpio-memport.h
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/arch/arm/plat-s3c64xx/include/plat/regs-gpio-memport.h 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/arch/arm/plat-s3c64xx/include/plat/regs-gpio-memport.h
@@ -0,0 +1,25 @@
+/* linux/arch/arm/plat-s3c64xx/include/mach/regs-gpio-memport.h
+ *
@@ -36817,10 +36313,8 @@ Index: linux-2.6.28/arch/arm/plat-s3c64xx/include/plat/regs-gpio-memport.h
+
+#endif /* __ASM_PLAT_S3C64XX_REGS_GPIO_MEMPORT_H */
+
-Index: linux-2.6.28/arch/arm/plat-s3c64xx/include/plat/regs-modem.h
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/arch/arm/plat-s3c64xx/include/plat/regs-modem.h 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/arch/arm/plat-s3c64xx/include/plat/regs-modem.h
@@ -0,0 +1,31 @@
+/* arch/arm/plat-s3c64xx/include/plat/regs-modem.h
+ *
@@ -36853,10 +36347,8 @@ Index: linux-2.6.28/arch/arm/plat-s3c64xx/include/plat/regs-modem.h
+#define MIFPCON_LCD_BYPASS (1 << 3)
+
+#endif /* __PLAT_S3C64XX_REGS_MODEM_H */
-Index: linux-2.6.28/arch/arm/plat-s3c64xx/include/plat/regs-syscon-power.h
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/arch/arm/plat-s3c64xx/include/plat/regs-syscon-power.h 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/arch/arm/plat-s3c64xx/include/plat/regs-syscon-power.h
@@ -0,0 +1,116 @@
+/* arch/arm/plat-s3c64xx/include/plat/regs-syscon-power.h
+ *
@@ -36974,10 +36466,8 @@ Index: linux-2.6.28/arch/arm/plat-s3c64xx/include/plat/regs-syscon-power.h
+#define S3C64XX_INFORM3 S3C_SYSREG(0xA0C)
+
+#endif /* __PLAT_S3C64XX_REGS_SYSCON_POWER_H */
-Index: linux-2.6.28/arch/arm/plat-s3c64xx/include/plat/regs-sys.h
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/arch/arm/plat-s3c64xx/include/plat/regs-sys.h 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/arch/arm/plat-s3c64xx/include/plat/regs-sys.h
@@ -0,0 +1,28 @@
+/* arch/arm/plat-s3c64xx/include/plat/regs-sys.h
+ *
@@ -37007,10 +36497,8 @@ Index: linux-2.6.28/arch/arm/plat-s3c64xx/include/plat/regs-sys.h
+#define S3C64XX_OTHERS_USBMASK (1 << 16)
+
+#endif /* _PLAT_REGS_SYS_H */
-Index: linux-2.6.28/arch/arm/plat-s3c64xx/include/plat/s3c6400.h
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/arch/arm/plat-s3c64xx/include/plat/s3c6400.h 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/arch/arm/plat-s3c64xx/include/plat/s3c6400.h
@@ -0,0 +1,35 @@
+/* arch/arm/plat-s3c64xx/include/plat/s3c6400.h
+ *
@@ -37047,10 +36535,8 @@ Index: linux-2.6.28/arch/arm/plat-s3c64xx/include/plat/s3c6400.h
+#define s3c6400_init NULL
+#endif
+
-Index: linux-2.6.28/arch/arm/plat-s3c64xx/include/plat/s3c6410.h
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/arch/arm/plat-s3c64xx/include/plat/s3c6410.h 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/arch/arm/plat-s3c64xx/include/plat/s3c6410.h
@@ -0,0 +1,29 @@
+/* arch/arm/plat-s3c64xx/include/plat/s3c6410.h
+ *
@@ -37081,10 +36567,8 @@ Index: linux-2.6.28/arch/arm/plat-s3c64xx/include/plat/s3c6410.h
+#define s3c6410_map_io NULL
+#define s3c6410_init NULL
+#endif
-Index: linux-2.6.28/arch/arm/plat-s3c64xx/irq.c
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/arch/arm/plat-s3c64xx/irq.c 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/arch/arm/plat-s3c64xx/irq.c
@@ -0,0 +1,256 @@
+/* arch/arm/plat-s3c64xx/irq.c
+ *
@@ -37342,10 +36826,8 @@ Index: linux-2.6.28/arch/arm/plat-s3c64xx/irq.c
+}
+
+
-Index: linux-2.6.28/arch/arm/plat-s3c64xx/irq-eint.c
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/arch/arm/plat-s3c64xx/irq-eint.c 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/arch/arm/plat-s3c64xx/irq-eint.c
@@ -0,0 +1,204 @@
+/* arch/arm/plat-s3c64xx/irq-eint.c
+ *
@@ -37551,10 +37033,8 @@ Index: linux-2.6.28/arch/arm/plat-s3c64xx/irq-eint.c
+}
+
+arch_initcall(s3c64xx_init_irq_eint);
-Index: linux-2.6.28/arch/arm/plat-s3c64xx/irq-pm.c
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/arch/arm/plat-s3c64xx/irq-pm.c 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/arch/arm/plat-s3c64xx/irq-pm.c
@@ -0,0 +1,173 @@
+/* arch/arm/plat-s3c64xx/irq-pm.c
+ *
@@ -37729,10 +37209,8 @@ Index: linux-2.6.28/arch/arm/plat-s3c64xx/irq-pm.c
+
+arch_initcall(s3c64xx_irq_pm_init);
+
-Index: linux-2.6.28/arch/arm/plat-s3c64xx/Kconfig
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/arch/arm/plat-s3c64xx/Kconfig 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/arch/arm/plat-s3c64xx/Kconfig
@@ -0,0 +1,61 @@
+# arch/arm/plat-s3c64xx/Kconfig
+#
@@ -37795,10 +37273,8 @@ Index: linux-2.6.28/arch/arm/plat-s3c64xx/Kconfig
+ Common setup code for S3C64XX with an 24bpp RGB display helper.
+
+endif
-Index: linux-2.6.28/arch/arm/plat-s3c64xx/Makefile
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/arch/arm/plat-s3c64xx/Makefile 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/arch/arm/plat-s3c64xx/Makefile
@@ -0,0 +1,37 @@
+# arch/arm/plat-s3c64xx/Makefile
+#
@@ -37837,10 +37313,8 @@ Index: linux-2.6.28/arch/arm/plat-s3c64xx/Makefile
+obj-$(CONFIG_S3C64XX_SETUP_I2C0) += setup-i2c0.o
+obj-$(CONFIG_S3C64XX_SETUP_I2C1) += setup-i2c1.o
+obj-$(CONFIG_S3C64XX_SETUP_FB_24BPP) += setup-fb-24bpp.o
-Index: linux-2.6.28/arch/arm/plat-s3c64xx/pm.c
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/arch/arm/plat-s3c64xx/pm.c 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/arch/arm/plat-s3c64xx/pm.c
@@ -0,0 +1,177 @@
+/* linux/arch/arm/plat-s3c64xx/pm.c
+ *
@@ -38019,10 +37493,8 @@ Index: linux-2.6.28/arch/arm/plat-s3c64xx/pm.c
+}
+
+arch_initcall(s3c64xx_pm_init);
-Index: linux-2.6.28/arch/arm/plat-s3c64xx/s3c6400-clock.c
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/arch/arm/plat-s3c64xx/s3c6400-clock.c 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/arch/arm/plat-s3c64xx/s3c6400-clock.c
@@ -0,0 +1,654 @@
+/* linux/arch/arm/plat-s3c64xx/s3c6400-clock.c
+ *
@@ -38678,10 +38150,8 @@ Index: linux-2.6.28/arch/arm/plat-s3c64xx/s3c6400-clock.c
+
+ clk_epll.parent = &clk_mout_epll.clk;
+}
-Index: linux-2.6.28/arch/arm/plat-s3c64xx/s3c6400-init.c
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/arch/arm/plat-s3c64xx/s3c6400-init.c 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/arch/arm/plat-s3c64xx/s3c6400-init.c
@@ -0,0 +1,29 @@
+/* linux/arch/arm/plat-s3c64xx/s3c6400-init.c
+ *
@@ -38712,10 +38182,8 @@ Index: linux-2.6.28/arch/arm/plat-s3c64xx/s3c6400-init.c
+{
+ s3c24xx_init_uartdevs("s3c6400-uart", s3c64xx_uart_resources, cfg, no);
+}
-Index: linux-2.6.28/arch/arm/plat-s3c64xx/setup-fb-24bpp.c
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/arch/arm/plat-s3c64xx/setup-fb-24bpp.c 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/arch/arm/plat-s3c64xx/setup-fb-24bpp.c
@@ -0,0 +1,37 @@
+/* linux/arch/arm/plat-s3c64xx/setup-fb-24bpp.c
+ *
@@ -38754,10 +38222,8 @@ Index: linux-2.6.28/arch/arm/plat-s3c64xx/setup-fb-24bpp.c
+ s3c_gpio_setpull(gpio, S3C_GPIO_PULL_NONE);
+ }
+}
-Index: linux-2.6.28/arch/arm/plat-s3c64xx/setup-i2c0.c
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/arch/arm/plat-s3c64xx/setup-i2c0.c 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/arch/arm/plat-s3c64xx/setup-i2c0.c
@@ -0,0 +1,31 @@
+/* linux/arch/arm/plat-s3c64xx/setup-i2c0.c
+ *
@@ -38790,10 +38256,8 @@ Index: linux-2.6.28/arch/arm/plat-s3c64xx/setup-i2c0.c
+ s3c_gpio_setpull(S3C64XX_GPB(5), S3C_GPIO_PULL_UP);
+ s3c_gpio_setpull(S3C64XX_GPB(6), S3C_GPIO_PULL_UP);
+}
-Index: linux-2.6.28/arch/arm/plat-s3c64xx/setup-i2c1.c
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/arch/arm/plat-s3c64xx/setup-i2c1.c 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/arch/arm/plat-s3c64xx/setup-i2c1.c
@@ -0,0 +1,31 @@
+/* linux/arch/arm/plat-s3c64xx/setup-i2c1.c
+ *
@@ -38826,10 +38290,8 @@ Index: linux-2.6.28/arch/arm/plat-s3c64xx/setup-i2c1.c
+ s3c_gpio_setpull(S3C64XX_GPB(2), S3C_GPIO_PULL_UP);
+ s3c_gpio_setpull(S3C64XX_GPB(3), S3C_GPIO_PULL_UP);
+}
-Index: linux-2.6.28/arch/arm/plat-s3c64xx/sleep.S
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/arch/arm/plat-s3c64xx/sleep.S 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/arch/arm/plat-s3c64xx/sleep.S
@@ -0,0 +1,143 @@
+/* linux/0arch/arm/plat-s3c64xx/sleep.S
+ *
@@ -38974,10 +38436,8 @@ Index: linux-2.6.28/arch/arm/plat-s3c64xx/sleep.S
+ mov pc, r2 /* jump back */
+
+ .end
-Index: linux-2.6.28/dfu-kern
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/dfu-kern 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/dfu-kern
@@ -0,0 +1,14 @@
+#!/bin/bash
+
@@ -38993,10 +38453,8 @@ Index: linux-2.6.28/dfu-kern
+fi
+
+
-Index: linux-2.6.28/Documentation/arm/Samsung-S3C24XX/Suspend.txt
-===================================================================
---- linux-2.6.28.orig/Documentation/arm/Samsung-S3C24XX/Suspend.txt 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.28/Documentation/arm/Samsung-S3C24XX/Suspend.txt 2009-01-02 00:01:56.000000000 +0100
+--- a/Documentation/arm/Samsung-S3C24XX/Suspend.txt
++++ b/Documentation/arm/Samsung-S3C24XX/Suspend.txt
@@ -40,13 +40,13 @@ Resuming
Machine Support
---------------
@@ -39023,10 +38481,8 @@ Index: linux-2.6.28/Documentation/arm/Samsung-S3C24XX/Suspend.txt
}
-Index: linux-2.6.28/drivers/android/alarm.c
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/drivers/android/alarm.c 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/drivers/android/alarm.c
@@ -0,0 +1,542 @@
+/* drivers/android/alarm.c
+ *
@@ -39570,10 +39026,8 @@ Index: linux-2.6.28/drivers/android/alarm.c
+module_init(alarm_init);
+module_exit(alarm_exit);
+
-Index: linux-2.6.28/drivers/android/binder.c
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/drivers/android/binder.c 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/drivers/android/binder.c
@@ -0,0 +1,3495 @@
+/* drivers/android/binder.c
+ *
@@ -43070,10 +42524,8 @@ Index: linux-2.6.28/drivers/android/binder.c
+
+device_initcall(binder_init);
+
-Index: linux-2.6.28/drivers/android/Kconfig
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/drivers/android/Kconfig 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/drivers/android/Kconfig
@@ -0,0 +1,93 @@
+menu "Android"
+
@@ -43168,10 +42620,8 @@ Index: linux-2.6.28/drivers/android/Kconfig
+ default y
+
+endmenu
-Index: linux-2.6.28/drivers/android/logger.c
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/drivers/android/logger.c 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/drivers/android/logger.c
@@ -0,0 +1,607 @@
+/*
+ * drivers/android/logger.c
@@ -43780,10 +43230,8 @@ Index: linux-2.6.28/drivers/android/logger.c
+ return ret;
+}
+device_initcall(logger_init);
-Index: linux-2.6.28/drivers/android/Makefile
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/drivers/android/Makefile 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/drivers/android/Makefile
@@ -0,0 +1,6 @@
+obj-$(CONFIG_ANDROID_BINDER_IPC) += binder.o
+obj-$(CONFIG_ANDROID_POWER) += power.o
@@ -43791,10 +43239,8 @@ Index: linux-2.6.28/drivers/android/Makefile
+obj-$(CONFIG_ANDROID_LOGGER) += logger.o
+obj-$(CONFIG_ANDROID_RAM_CONSOLE) += ram_console.o
+obj-$(CONFIG_ANDROID_TIMED_GPIO) += timed_gpio.o
-Index: linux-2.6.28/drivers/android/power.c
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/drivers/android/power.c 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/drivers/android/power.c
@@ -0,0 +1,1336 @@
+/* drivers/android/power.c
+ *
@@ -45132,10 +44578,8 @@ Index: linux-2.6.28/drivers/android/power.c
+EXPORT_SYMBOL(android_unregister_early_suspend);
+
+
-Index: linux-2.6.28/drivers/android/ram_console.c
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/drivers/android/ram_console.c 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/drivers/android/ram_console.c
@@ -0,0 +1,395 @@
+/* drivers/android/ram_console.c
+ *
@@ -45532,10 +44976,8 @@ Index: linux-2.6.28/drivers/android/ram_console.c
+#endif
+late_initcall(ram_console_late_init);
+
-Index: linux-2.6.28/drivers/android/timed_gpio.c
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/drivers/android/timed_gpio.c 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/drivers/android/timed_gpio.c
@@ -0,0 +1,177 @@
+/* drivers/android/timed_gpio.c
+ *
@@ -45714,10 +45156,8 @@ Index: linux-2.6.28/drivers/android/timed_gpio.c
+MODULE_AUTHOR("Mike Lockwood <lockwood@android.com>");
+MODULE_DESCRIPTION("Android timed gpio driver");
+MODULE_LICENSE("GPL");
-Index: linux-2.6.28/drivers/ar6000/ar6000/ar6000_drv.c
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/drivers/ar6000/ar6000/ar6000_drv.c 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/drivers/ar6000/ar6000/ar6000_drv.c
@@ -0,0 +1,3124 @@
+/*
+ *
@@ -48843,10 +48283,8 @@ Index: linux-2.6.28/drivers/ar6000/ar6000/ar6000_drv.c
+ A_UINT32 targReplyArg)
+{
+}
-Index: linux-2.6.28/drivers/ar6000/ar6000/ar6000_drv.h
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/drivers/ar6000/ar6000/ar6000_drv.h 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/drivers/ar6000/ar6000/ar6000_drv.h
@@ -0,0 +1,361 @@
+/*
+ *
@@ -49209,10 +48647,8 @@ Index: linux-2.6.28/drivers/ar6000/ar6000/ar6000_drv.h
+#endif
+
+#endif /* _AR6000_H_ */
-Index: linux-2.6.28/drivers/ar6000/ar6000/ar6000_raw_if.c
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/drivers/ar6000/ar6000/ar6000_raw_if.c 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/drivers/ar6000/ar6000/ar6000_raw_if.c
@@ -0,0 +1,439 @@
+/*
+ *
@@ -49653,10 +49089,8 @@ Index: linux-2.6.28/drivers/ar6000/ar6000/ar6000_raw_if.c
+ return length;
+}
+#endif /* HTC_RAW_INTERFACE */
-Index: linux-2.6.28/drivers/ar6000/ar6000/ar6xapi_linux.h
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/drivers/ar6000/ar6000/ar6xapi_linux.h 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/drivers/ar6000/ar6000/ar6xapi_linux.h
@@ -0,0 +1,128 @@
+#ifndef _AR6XAPI_LINUX_H
+#define _AR6XAPI_LINUX_H
@@ -49786,10 +49220,8 @@ Index: linux-2.6.28/drivers/ar6000/ar6000/ar6xapi_linux.h
+#endif
+
+#endif
-Index: linux-2.6.28/drivers/ar6000/ar6000/athdrv_linux.h
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/drivers/ar6000/ar6000/athdrv_linux.h 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/drivers/ar6000/ar6000/athdrv_linux.h
@@ -0,0 +1,993 @@
+/*
+ * Copyright (c) 2004-2006 Atheros Communications Inc.
@@ -50784,10 +50216,8 @@ Index: linux-2.6.28/drivers/ar6000/ar6000/athdrv_linux.h
+}
+#endif
+#endif
-Index: linux-2.6.28/drivers/ar6000/ar6000/athtypes_linux.h
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/drivers/ar6000/ar6000/athtypes_linux.h 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/drivers/ar6000/ar6000/athtypes_linux.h
@@ -0,0 +1,47 @@
+/*
+ * $Id: //depot/sw/releases/olca2.0-GPL/host/os/linux/include/athtypes_linux.h#1 $
@@ -50836,10 +50266,8 @@ Index: linux-2.6.28/drivers/ar6000/ar6000/athtypes_linux.h
+
+
+#endif /* _ATHTYPES_LINUX_H_ */
-Index: linux-2.6.28/drivers/ar6000/ar6000/config_linux.h
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/drivers/ar6000/ar6000/config_linux.h 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/drivers/ar6000/ar6000/config_linux.h
@@ -0,0 +1,44 @@
+/*
+ * Copyright (c) 2004-2007 Atheros Communications Inc.
@@ -50885,10 +50313,8 @@ Index: linux-2.6.28/drivers/ar6000/ar6000/config_linux.h
+#endif
+
+#endif
-Index: linux-2.6.28/drivers/ar6000/ar6000/debug_linux.h
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/drivers/ar6000/ar6000/debug_linux.h 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/drivers/ar6000/ar6000/debug_linux.h
@@ -0,0 +1,86 @@
+/*
+ * Copyright (c) 2004-2006 Atheros Communications Inc.
@@ -50976,10 +50402,8 @@ Index: linux-2.6.28/drivers/ar6000/ar6000/debug_linux.h
+#endif
+
+#endif /* _DEBUG_LINUX_H_ */
-Index: linux-2.6.28/drivers/ar6000/ar6000/ioctl.c
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/drivers/ar6000/ar6000/ioctl.c 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/drivers/ar6000/ar6000/ioctl.c
@@ -0,0 +1,2540 @@
+/*
+ *
@@ -53521,10 +52945,8 @@ Index: linux-2.6.28/drivers/ar6000/ar6000/ioctl.c
+ return ret;
+}
+
-Index: linux-2.6.28/drivers/ar6000/ar6000/netbuf.c
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/drivers/ar6000/ar6000/netbuf.c 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/drivers/ar6000/ar6000/netbuf.c
@@ -0,0 +1,225 @@
+
+/*
@@ -53751,10 +53173,8 @@ Index: linux-2.6.28/drivers/ar6000/ar6000/netbuf.c
+ return A_OK;
+}
+
-Index: linux-2.6.28/drivers/ar6000/ar6000/osapi_linux.h
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/drivers/ar6000/ar6000/osapi_linux.h 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/drivers/ar6000/ar6000/osapi_linux.h
@@ -0,0 +1,319 @@
+/*
+ * $Id: //depot/sw/releases/olca2.0-GPL/host/os/linux/include/osapi_linux.h#1 $
@@ -54075,10 +53495,8 @@ Index: linux-2.6.28/drivers/ar6000/ar6000/osapi_linux.h
+#endif /* __KERNEL__ */
+
+#endif /* _OSAPI_LINUX_H_ */
-Index: linux-2.6.28/drivers/ar6000/ar6000/wireless_ext.c
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/drivers/ar6000/ar6000/wireless_ext.c 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/drivers/ar6000/ar6000/wireless_ext.c
@@ -0,0 +1,1972 @@
+/*
+ *
@@ -56052,10 +55470,8 @@ Index: linux-2.6.28/drivers/ar6000/ar6000/wireless_ext.c
+};
+
+
-Index: linux-2.6.28/drivers/ar6000/bmi/bmi.c
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/drivers/ar6000/bmi/bmi.c 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/drivers/ar6000/bmi/bmi.c
@@ -0,0 +1,657 @@
+/*
+ * Copyright (c) 2004-2007 Atheros Communications Inc.
@@ -56714,10 +56130,8 @@ Index: linux-2.6.28/drivers/ar6000/bmi/bmi.c
+
+ return status;
+}
-Index: linux-2.6.28/drivers/ar6000/bmi/bmi_internal.h
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/drivers/ar6000/bmi/bmi_internal.h 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/drivers/ar6000/bmi/bmi_internal.h
@@ -0,0 +1,45 @@
+#ifndef BMI_INTERNAL_H
+#define BMI_INTERNAL_H
@@ -56764,10 +56178,8 @@ Index: linux-2.6.28/drivers/ar6000/bmi/bmi_internal.h
+ A_UINT32 length);
+
+#endif
-Index: linux-2.6.28/drivers/ar6000/hif/hif2.c
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/drivers/ar6000/hif/hif2.c 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/drivers/ar6000/hif/hif2.c
@@ -0,0 +1,646 @@
+/*
+ * hif2.c - HIF layer re-implementation for the Linux SDIO stack
@@ -57415,10 +56827,8 @@ Index: linux-2.6.28/drivers/ar6000/hif/hif2.c
+ mutex_unlock(&shutdown_lock);
+ }
+}
-Index: linux-2.6.28/drivers/ar6000/hif/hif.c
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/drivers/ar6000/hif/hif.c 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/drivers/ar6000/hif/hif.c
@@ -0,0 +1,824 @@
+/*
+ * @file: hif.c
@@ -58244,10 +57654,8 @@ Index: linux-2.6.28/drivers/ar6000/hif/hif.c
+
+ return;
+}
-Index: linux-2.6.28/drivers/ar6000/hif/hif_internal.h
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/drivers/ar6000/hif/hif_internal.h 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/drivers/ar6000/hif/hif_internal.h
@@ -0,0 +1,102 @@
+/*
+ * @file: hif_internal.h
@@ -58351,10 +57759,8 @@ Index: linux-2.6.28/drivers/ar6000/hif/hif_internal.h
+
+void
+delHifDevice(SDDEVICE *handle);
-Index: linux-2.6.28/drivers/ar6000/htc/ar6k.c
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/drivers/ar6000/htc/ar6k.c 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/drivers/ar6000/htc/ar6k.c
@@ -0,0 +1,991 @@
+/*
+ * AR6K device layer that handles register level I/O
@@ -59347,10 +58753,8 @@ Index: linux-2.6.28/drivers/ar6000/htc/ar6k.c
+
+
+
-Index: linux-2.6.28/drivers/ar6000/htc/ar6k_events.c
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/drivers/ar6000/htc/ar6k_events.c 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/drivers/ar6000/htc/ar6k_events.c
@@ -0,0 +1,638 @@
+/*
+ * AR6K Driver layer event handling (i.e. interrupts, message polling)
@@ -59990,10 +59394,8 @@ Index: linux-2.6.28/drivers/ar6000/htc/ar6k_events.c
+}
+
+
-Index: linux-2.6.28/drivers/ar6000/htc/ar6k.h
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/drivers/ar6000/htc/ar6k.h 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/drivers/ar6000/htc/ar6k.h
@@ -0,0 +1,191 @@
+/*
+ *
@@ -60186,10 +59588,8 @@ Index: linux-2.6.28/drivers/ar6000/htc/ar6k.h
+#endif
+
+#endif /*AR6K_H_*/
-Index: linux-2.6.28/drivers/ar6000/htc/htc.c
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/drivers/ar6000/htc/htc.c 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/drivers/ar6000/htc/htc.c
@@ -0,0 +1,507 @@
+/*
+ *
@@ -60698,10 +60098,8 @@ Index: linux-2.6.28/drivers/ar6000/htc/htc.c
+ return FALSE;
+#endif
+}
-Index: linux-2.6.28/drivers/ar6000/htc/htc_debug.h
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/drivers/ar6000/htc/htc_debug.h 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/drivers/ar6000/htc/htc_debug.h
@@ -0,0 +1,65 @@
+#ifndef HTC_DEBUG_H_
+#define HTC_DEBUG_H_
@@ -60768,10 +60166,8 @@ Index: linux-2.6.28/drivers/ar6000/htc/htc_debug.h
+void DebugDumpBytes(A_UCHAR *buffer, A_UINT16 length, char *pDescription);
+
+#endif /*HTC_DEBUG_H_*/
-Index: linux-2.6.28/drivers/ar6000/htc/htc_internal.h
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/drivers/ar6000/htc/htc_internal.h 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/drivers/ar6000/htc/htc_internal.h
@@ -0,0 +1,168 @@
+/*
+ *
@@ -60941,10 +60337,8 @@ Index: linux-2.6.28/drivers/ar6000/htc/htc_internal.h
+#endif
+
+#endif /* _HTC_INTERNAL_H_ */
-Index: linux-2.6.28/drivers/ar6000/htc/htc_recv.c
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/drivers/ar6000/htc/htc_recv.c 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/drivers/ar6000/htc/htc_recv.c
@@ -0,0 +1,703 @@
+/*
+ *
@@ -61649,10 +61043,8 @@ Index: linux-2.6.28/drivers/ar6000/htc/htc_recv.c
+}
+
+
-Index: linux-2.6.28/drivers/ar6000/htc/htc_send.c
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/drivers/ar6000/htc/htc_send.c 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/drivers/ar6000/htc/htc_send.c
@@ -0,0 +1,543 @@
+/*
+ *
@@ -62197,10 +61589,8 @@ Index: linux-2.6.28/drivers/ar6000/htc/htc_send.c
+ UNLOCK_HTC_TX(target);
+
+}
-Index: linux-2.6.28/drivers/ar6000/htc/htc_services.c
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/drivers/ar6000/htc/htc_services.c 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/drivers/ar6000/htc/htc_services.c
@@ -0,0 +1,403 @@
+/*
+ *
@@ -62605,10 +61995,8 @@ Index: linux-2.6.28/drivers/ar6000/htc/htc_services.c
+ }
+
+}
-Index: linux-2.6.28/drivers/ar6000/include/a_config.h
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/drivers/ar6000/include/a_config.h 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/drivers/ar6000/include/a_config.h
@@ -0,0 +1,27 @@
+#ifndef _A_CONFIG_H_
+#define _A_CONFIG_H_
@@ -62637,10 +62025,8 @@ Index: linux-2.6.28/drivers/ar6000/include/a_config.h
+#include "../ar6000/config_linux.h"
+
+#endif
-Index: linux-2.6.28/drivers/ar6000/include/a_debug.h
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/drivers/ar6000/include/a_debug.h 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/drivers/ar6000/include/a_debug.h
@@ -0,0 +1,41 @@
+#ifndef _A_DEBUG_H_
+#define _A_DEBUG_H_
@@ -62683,10 +62069,8 @@ Index: linux-2.6.28/drivers/ar6000/include/a_debug.h
+#include "../ar6000/debug_linux.h"
+
+#endif
-Index: linux-2.6.28/drivers/ar6000/include/a_drv_api.h
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/drivers/ar6000/include/a_drv_api.h 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/drivers/ar6000/include/a_drv_api.h
@@ -0,0 +1,185 @@
+#ifndef _A_DRV_API_H_
+#define _A_DRV_API_H_
@@ -62873,10 +62257,8 @@ Index: linux-2.6.28/drivers/ar6000/include/a_drv_api.h
+#endif
+
+#endif
-Index: linux-2.6.28/drivers/ar6000/include/a_drv.h
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/drivers/ar6000/include/a_drv.h 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/drivers/ar6000/include/a_drv.h
@@ -0,0 +1,28 @@
+#ifndef _A_DRV_H_
+#define _A_DRV_H_
@@ -62906,10 +62288,8 @@ Index: linux-2.6.28/drivers/ar6000/include/a_drv.h
+#include "../ar6000/athdrv_linux.h"
+
+#endif /* _ADRV_H_ */
-Index: linux-2.6.28/drivers/ar6000/include/a_osapi.h
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/drivers/ar6000/include/a_osapi.h 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/drivers/ar6000/include/a_osapi.h
@@ -0,0 +1,28 @@
+#ifndef _A_OSAPI_H_
+#define _A_OSAPI_H_
@@ -62939,10 +62319,8 @@ Index: linux-2.6.28/drivers/ar6000/include/a_osapi.h
+#include "../ar6000/osapi_linux.h"
+
+#endif /* _OSAPI_H_ */
-Index: linux-2.6.28/drivers/ar6000/include/ar6000_api.h
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/drivers/ar6000/include/ar6000_api.h 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/drivers/ar6000/include/ar6000_api.h
@@ -0,0 +1,29 @@
+#ifndef _AR6000_API_H_
+#define _AR6000_API_H_
@@ -62973,10 +62351,8 @@ Index: linux-2.6.28/drivers/ar6000/include/ar6000_api.h
+
+#endif /* _AR6000_API_H */
+
-Index: linux-2.6.28/drivers/ar6000/include/ar6000_diag.h
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/drivers/ar6000/include/ar6000_diag.h 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/drivers/ar6000/include/ar6000_diag.h
@@ -0,0 +1,38 @@
+/*
+ *
@@ -63016,10 +62392,8 @@ Index: linux-2.6.28/drivers/ar6000/include/ar6000_diag.h
+ A_UCHAR *data, A_UINT32 length);
+
+#endif /*AR6000_DIAG_H_*/
-Index: linux-2.6.28/drivers/ar6000/include/AR6001_regdump.h
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/drivers/ar6000/include/AR6001_regdump.h 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/drivers/ar6000/include/AR6001_regdump.h
@@ -0,0 +1,100 @@
+/*
+ * Copyright (c) 2006 Atheros Communications Inc.
@@ -63121,10 +62495,8 @@ Index: linux-2.6.28/drivers/ar6000/include/AR6001_regdump.h
+#define RD_SIZE (34*4) /* Space for this number of words */
+
+#endif /* __AR6000_REGDUMP_H__ */
-Index: linux-2.6.28/drivers/ar6000/include/AR6Khwreg.h
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/drivers/ar6000/include/AR6Khwreg.h 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/drivers/ar6000/include/AR6Khwreg.h
@@ -0,0 +1,147 @@
+/*
+ * Copyright (c) 2004-2007 Atheros Communications Inc.
@@ -63273,10 +62645,8 @@ Index: linux-2.6.28/drivers/ar6000/include/AR6Khwreg.h
+#endif
+
+#endif /* __AR6KHWREG_H__ */
-Index: linux-2.6.28/drivers/ar6000/include/AR6K_version.h
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/drivers/ar6000/include/AR6K_version.h 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/drivers/ar6000/include/AR6K_version.h
@@ -0,0 +1,36 @@
+#define __VER_MAJOR_ 2
+#define __VER_MINOR_ 0
@@ -63314,10 +62684,8 @@ Index: linux-2.6.28/drivers/ar6000/include/AR6K_version.h
+#define AR6K_SW_VERSION ( ( __VER_MAJOR_ << VER_MAJOR_BIT_OFFSET ) + ( __VER_MINOR_ << VER_MINOR_BIT_OFFSET ) + ( __VER_PATCH_ << VER_PATCH_BIT_OFFSET ) + ( __BUILD_NUMBER_ << VER_BUILD_NUM_BIT_OFFSET ) )
+
+
-Index: linux-2.6.28/drivers/ar6000/include/AR6K_version.h.NEW
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/drivers/ar6000/include/AR6K_version.h.NEW 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/drivers/ar6000/include/AR6K_version.h.NEW
@@ -0,0 +1,36 @@
+#define __VER_MAJOR_ 2
+#define __VER_MINOR_ 0
@@ -63355,10 +62723,8 @@ Index: linux-2.6.28/drivers/ar6000/include/AR6K_version.h.NEW
+#define AR6K_SW_VERSION ( ( __VER_MAJOR_ << VER_MAJOR_BIT_OFFSET ) + ( __VER_MINOR_ << VER_MINOR_BIT_OFFSET ) + ( __VER_PATCH_ << VER_PATCH_BIT_OFFSET ) + ( __BUILD_NUMBER_ << VER_BUILD_NUM_BIT_OFFSET ) )
+
+
-Index: linux-2.6.28/drivers/ar6000/include/athdefs.h
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/drivers/ar6000/include/athdefs.h 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/drivers/ar6000/include/athdefs.h
@@ -0,0 +1,85 @@
+#ifndef __ATHDEFS_H__
+#define __ATHDEFS_H__
@@ -63445,10 +62811,8 @@ Index: linux-2.6.28/drivers/ar6000/include/athdefs.h
+}WLAN_CAPABILITY;
+
+#endif /* __ATHDEFS_H__ */
-Index: linux-2.6.28/drivers/ar6000/include/athdrv.h
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/drivers/ar6000/include/athdrv.h 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/drivers/ar6000/include/athdrv.h
@@ -0,0 +1,32 @@
+/*
+ * Copyright (c) 2004-2006 Atheros Communications Inc.
@@ -63482,10 +62846,8 @@ Index: linux-2.6.28/drivers/ar6000/include/athdrv.h
+#endif
+
+#endif /* _ATHDRV_H_ */
-Index: linux-2.6.28/drivers/ar6000/include/athendpack.h
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/drivers/ar6000/include/athendpack.h 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/drivers/ar6000/include/athendpack.h
@@ -0,0 +1,41 @@
+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ * @file: athendpack.h
@@ -63528,10 +62890,8 @@ Index: linux-2.6.28/drivers/ar6000/include/athendpack.h
+#include "../os/wince/include/athendpack_wince.h"
+#endif /* WINCE */
+
-Index: linux-2.6.28/drivers/ar6000/include/athstartpack.h
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/drivers/ar6000/include/athstartpack.h 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/drivers/ar6000/include/athstartpack.h
@@ -0,0 +1,42 @@
+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ * @file: athstartpack.h
@@ -63575,10 +62935,8 @@ Index: linux-2.6.28/drivers/ar6000/include/athstartpack.h
+#include "../os/wince/include/athstartpack_wince.h"
+#endif /* WINCE */
+
-Index: linux-2.6.28/drivers/ar6000/include/a_types.h
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/drivers/ar6000/include/a_types.h 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/drivers/ar6000/include/a_types.h
@@ -0,0 +1,28 @@
+#ifndef _A_TYPES_H_
+#define _A_TYPES_H_
@@ -63608,10 +62966,8 @@ Index: linux-2.6.28/drivers/ar6000/include/a_types.h
+#include "../ar6000/athtypes_linux.h"
+
+#endif /* _ATHTYPES_H_ */
-Index: linux-2.6.28/drivers/ar6000/include/bmi.h
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/drivers/ar6000/include/bmi.h 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/drivers/ar6000/include/bmi.h
@@ -0,0 +1,100 @@
+#ifndef _BMI_H_
+#define _BMI_H_
@@ -63713,10 +63069,8 @@ Index: linux-2.6.28/drivers/ar6000/include/bmi.h
+#endif
+
+#endif /* _BMI_H_ */
-Index: linux-2.6.28/drivers/ar6000/include/bmi_msg.h
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/drivers/ar6000/include/bmi_msg.h 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/drivers/ar6000/include/bmi_msg.h
@@ -0,0 +1,199 @@
+#ifndef __BMI_MSG_H__
+#define __BMI_MSG_H__
@@ -63917,10 +63271,8 @@ Index: linux-2.6.28/drivers/ar6000/include/bmi_msg.h
+
+
+#endif /* __BMI_MSG_H__ */
-Index: linux-2.6.28/drivers/ar6000/include/common_drv.h
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/drivers/ar6000/include/common_drv.h 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/drivers/ar6000/include/common_drv.h
@@ -0,0 +1,61 @@
+/*
+ *
@@ -63983,10 +63335,8 @@ Index: linux-2.6.28/drivers/ar6000/include/common_drv.h
+#endif
+
+#endif /*COMMON_DRV_H_*/
-Index: linux-2.6.28/drivers/ar6000/include/dbglog_api.h
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/drivers/ar6000/include/dbglog_api.h 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/drivers/ar6000/include/dbglog_api.h
@@ -0,0 +1,46 @@
+#ifndef _DBGLOG_API_H_
+#define _DBGLOG_API_H_
@@ -64034,10 +63384,8 @@ Index: linux-2.6.28/drivers/ar6000/include/dbglog_api.h
+#endif
+
+#endif /* _DBGLOG_API_H_ */
-Index: linux-2.6.28/drivers/ar6000/include/dbglog.h
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/drivers/ar6000/include/dbglog.h 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/drivers/ar6000/include/dbglog.h
@@ -0,0 +1,107 @@
+/*
+ * Copyright (c) 2004-2007 Atheros Communications Inc.
@@ -64146,10 +63494,8 @@ Index: linux-2.6.28/drivers/ar6000/include/dbglog.h
+#endif
+
+#endif /* _DBGLOG_H_ */
-Index: linux-2.6.28/drivers/ar6000/include/dbglog_id.h
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/drivers/ar6000/include/dbglog_id.h 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/drivers/ar6000/include/dbglog_id.h
@@ -0,0 +1,307 @@
+/*
+ *
@@ -64458,10 +63804,8 @@ Index: linux-2.6.28/drivers/ar6000/include/dbglog_id.h
+#endif
+
+#endif /* _DBGLOG_ID_H_ */
-Index: linux-2.6.28/drivers/ar6000/include/dl_list.h
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/drivers/ar6000/include/dl_list.h 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/drivers/ar6000/include/dl_list.h
@@ -0,0 +1,114 @@
+/*
+ *
@@ -64577,10 +63921,8 @@ Index: linux-2.6.28/drivers/ar6000/include/dl_list.h
+}
+
+#endif /* __DL_LIST_H___ */
-Index: linux-2.6.28/drivers/ar6000/include/dset_api.h
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/drivers/ar6000/include/dset_api.h 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/drivers/ar6000/include/dset_api.h
@@ -0,0 +1,63 @@
+/*
+ * Copyright (c) 2004-2006 Atheros Communications Inc.
@@ -64645,10 +63987,8 @@ Index: linux-2.6.28/drivers/ar6000/include/dset_api.h
+
+
+#endif /* _DSET_API_H_ */
-Index: linux-2.6.28/drivers/ar6000/include/dsetid.h
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/drivers/ar6000/include/dsetid.h 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/drivers/ar6000/include/dsetid.h
@@ -0,0 +1,110 @@
+/*
+ * Copyright (c) 2004-2007 Atheros Communications Inc.
@@ -64760,10 +64100,8 @@ Index: linux-2.6.28/drivers/ar6000/include/dsetid.h
+#define DSETID_BPATCH_FLAG 0x80000000
+
+#endif /* __DSETID_H__ */
-Index: linux-2.6.28/drivers/ar6000/include/dset_internal.h
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/drivers/ar6000/include/dset_internal.h 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/drivers/ar6000/include/dset_internal.h
@@ -0,0 +1,39 @@
+/*
+ * Copyright (c) 2007 Atheros Communications Inc.
@@ -64804,10 +64142,8 @@ Index: linux-2.6.28/drivers/ar6000/include/dset_internal.h
+} dset_descriptor_t;
+
+#endif /* __DSET_INTERNAL_H__ */
-Index: linux-2.6.28/drivers/ar6000/include/gpio_api.h
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/drivers/ar6000/include/gpio_api.h 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/drivers/ar6000/include/gpio_api.h
@@ -0,0 +1,57 @@
+#ifndef _GPIO_API_H_
+#define _GPIO_API_H_
@@ -64866,10 +64202,8 @@ Index: linux-2.6.28/drivers/ar6000/include/gpio_api.h
+A_STATUS wmi_gpio_intr_ack(struct wmi_t *wmip, A_UINT32 ack_mask);
+
+#endif /* _GPIO_API_H_ */
-Index: linux-2.6.28/drivers/ar6000/include/gpio.h
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/drivers/ar6000/include/gpio.h 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/drivers/ar6000/include/gpio.h
@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) 2005 Atheros Communications Inc.
@@ -64905,10 +64239,8 @@ Index: linux-2.6.28/drivers/ar6000/include/gpio.h
+
+#define GPIO_LAST_REGISTER_ID GPIO_ID_PIN(17)
+#define GPIO_ID_NONE 0xffffffff
-Index: linux-2.6.28/drivers/ar6000/include/hif.h
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/drivers/ar6000/include/hif.h 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/drivers/ar6000/include/hif.h
@@ -0,0 +1,296 @@
+/*
+ * Copyright (c) 2004-2007 Atheros Communications Inc.
@@ -65206,10 +64538,8 @@ Index: linux-2.6.28/drivers/ar6000/include/hif.h
+#endif
+
+#endif /* _HIF_H_ */
-Index: linux-2.6.28/drivers/ar6000/include/host_version.h
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/drivers/ar6000/include/host_version.h 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/drivers/ar6000/include/host_version.h
@@ -0,0 +1,49 @@
+#ifndef _HOST_VERSION_H_
+#define _HOST_VERSION_H_
@@ -65260,10 +64590,8 @@ Index: linux-2.6.28/drivers/ar6000/include/host_version.h
+#endif
+
+#endif /* _HOST_VERSION_H_ */
-Index: linux-2.6.28/drivers/ar6000/include/htc_api.h
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/drivers/ar6000/include/htc_api.h 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/drivers/ar6000/include/htc_api.h
@@ -0,0 +1,436 @@
+/*
+ *
@@ -65701,10 +65029,8 @@ Index: linux-2.6.28/drivers/ar6000/include/htc_api.h
+#endif
+
+#endif /* _HTC_API_H_ */
-Index: linux-2.6.28/drivers/ar6000/include/htc.h
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/drivers/ar6000/include/htc.h 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/drivers/ar6000/include/htc.h
@@ -0,0 +1,190 @@
+/*
+ * Copyright (c) 2007 Atheros Communications Inc.
@@ -65896,10 +65222,8 @@ Index: linux-2.6.28/drivers/ar6000/include/htc.h
+
+#endif /* __HTC_H__ */
+
-Index: linux-2.6.28/drivers/ar6000/include/htc_packet.h
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/drivers/ar6000/include/htc_packet.h 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/drivers/ar6000/include/htc_packet.h
@@ -0,0 +1,138 @@
+/*
+ *
@@ -66039,10 +65363,8 @@ Index: linux-2.6.28/drivers/ar6000/include/htc_packet.h
+}
+
+#endif /*HTC_PACKET_H_*/
-Index: linux-2.6.28/drivers/ar6000/include/htc_services.h
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/drivers/ar6000/include/htc_services.h 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/drivers/ar6000/include/htc_services.h
@@ -0,0 +1,37 @@
+/*
+ * Copyright (c) 2007 Atheros Communications Inc.
@@ -66081,10 +65403,8 @@ Index: linux-2.6.28/drivers/ar6000/include/htc_services.h
+#define HTC_RAW_STREAMS_SVC MAKE_SERVICE_ID(HTC_TEST_GROUP,0)
+
+#endif /*HTC_SERVICES_H_*/
-Index: linux-2.6.28/drivers/ar6000/include/ieee80211.h
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/drivers/ar6000/include/ieee80211.h 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/drivers/ar6000/include/ieee80211.h
@@ -0,0 +1,342 @@
+/*-
+ * Copyright (c) 2001 Atsushi Onoe
@@ -66428,10 +65748,8 @@ Index: linux-2.6.28/drivers/ar6000/include/ieee80211.h
+#include "athendpack.h"
+
+#endif /* _NET80211_IEEE80211_H_ */
-Index: linux-2.6.28/drivers/ar6000/include/ieee80211_ioctl.h
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/drivers/ar6000/include/ieee80211_ioctl.h 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/drivers/ar6000/include/ieee80211_ioctl.h
@@ -0,0 +1,163 @@
+/*
+ * Copyright (c) 2004-2005 Atheros Communications Inc.
@@ -66596,10 +65914,8 @@ Index: linux-2.6.28/drivers/ar6000/include/ieee80211_ioctl.h
+#endif
+
+#endif /* _IEEE80211_IOCTL_H_ */
-Index: linux-2.6.28/drivers/ar6000/include/ieee80211_node.h
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/drivers/ar6000/include/ieee80211_node.h 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/drivers/ar6000/include/ieee80211_node.h
@@ -0,0 +1,77 @@
+/*-
+ * Copyright (c) 2001 Atsushi Onoe
@@ -66678,10 +65994,8 @@ Index: linux-2.6.28/drivers/ar6000/include/ieee80211_node.h
+#define WLAN_NODE_INACT_TIMEOUT_MSEC 10000
+
+#endif /* _IEEE80211_NODE_H_ */
-Index: linux-2.6.28/drivers/ar6000/include/ini_dset.h
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/drivers/ar6000/include/ini_dset.h 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/drivers/ar6000/include/ini_dset.h
@@ -0,0 +1,40 @@
+/*
+ * Copyright (c) 2004-2007 Atheros Communications Inc.
@@ -66723,10 +66037,8 @@ Index: linux-2.6.28/drivers/ar6000/include/ini_dset.h
+} POSTPACK INI_DSET_REG_OVERRIDE;
+
+#endif
-Index: linux-2.6.28/drivers/ar6000/include/regDb.h
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/drivers/ar6000/include/regDb.h 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/drivers/ar6000/include/regDb.h
@@ -0,0 +1,19 @@
+/*
+ * Copyright (c) 2005 Atheros Communications, Inc.
@@ -66747,10 +66059,8 @@ Index: linux-2.6.28/drivers/ar6000/include/regDb.h
+#include "./regulatory/reg_dbvalues.h"
+
+#endif /* __REG_DB_H__ */
-Index: linux-2.6.28/drivers/ar6000/include/regdump.h
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/drivers/ar6000/include/regdump.h 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/drivers/ar6000/include/regdump.h
@@ -0,0 +1,33 @@
+#ifndef __REGDUMP_H__
+#define __REGDUMP_H__
@@ -66785,10 +66095,8 @@ Index: linux-2.6.28/drivers/ar6000/include/regdump.h
+};
+#endif /* __ASSEMBLER__ */
+#endif /* __REGDUMP_H__ */
-Index: linux-2.6.28/drivers/ar6000/include/targaddrs.h
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/drivers/ar6000/include/targaddrs.h 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/drivers/ar6000/include/targaddrs.h
@@ -0,0 +1,158 @@
+/*
+ * Copyright (c) 2004-2007 Atheros Communications Inc.
@@ -66948,10 +66256,8 @@ Index: linux-2.6.28/drivers/ar6000/include/targaddrs.h
+#endif /* !__ASSEMBLER__ */
+
+#endif /* __TARGADDRS_H__ */
-Index: linux-2.6.28/drivers/ar6000/include/testcmd.h
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/drivers/ar6000/include/testcmd.h 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/drivers/ar6000/include/testcmd.h
@@ -0,0 +1,144 @@
+/*
+ * Copyright (c) 2004-2005 Atheros Communications Inc.
@@ -67097,10 +66403,8 @@ Index: linux-2.6.28/drivers/ar6000/include/testcmd.h
+#endif
+
+#endif /* TESTCMD_H_ */
-Index: linux-2.6.28/drivers/ar6000/include/wlan_api.h
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/drivers/ar6000/include/wlan_api.h 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/drivers/ar6000/include/wlan_api.h
@@ -0,0 +1,101 @@
+#ifndef _HOST_WLAN_API_H_
+#define _HOST_WLAN_API_H_
@@ -67203,10 +66507,8 @@ Index: linux-2.6.28/drivers/ar6000/include/wlan_api.h
+#endif
+
+#endif /* _HOST_WLAN_API_H_ */
-Index: linux-2.6.28/drivers/ar6000/include/wlan_dset.h
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/drivers/ar6000/include/wlan_dset.h 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/drivers/ar6000/include/wlan_dset.h
@@ -0,0 +1,20 @@
+/*
+ * Copyright (c) 2007 Atheros Communications, Inc.
@@ -67228,10 +66530,8 @@ Index: linux-2.6.28/drivers/ar6000/include/wlan_dset.h
+} POSTPACK WOW_CONFIG_DSET;
+
+#endif
-Index: linux-2.6.28/drivers/ar6000/include/wmi_api.h
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/drivers/ar6000/include/wmi_api.h 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/drivers/ar6000/include/wmi_api.h
@@ -0,0 +1,260 @@
+#ifndef _WMI_API_H_
+#define _WMI_API_H_
@@ -67493,10 +66793,8 @@ Index: linux-2.6.28/drivers/ar6000/include/wmi_api.h
+#endif
+
+#endif /* _WMI_API_H_ */
-Index: linux-2.6.28/drivers/ar6000/include/wmi.h
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/drivers/ar6000/include/wmi.h 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/drivers/ar6000/include/wmi.h
@@ -0,0 +1,1743 @@
+/*
+ * Copyright (c) 2004-2006 Atheros Communications Inc.
@@ -69241,10 +68539,8 @@ Index: linux-2.6.28/drivers/ar6000/include/wmi.h
+#endif
+
+#endif /* _WMI_H_ */
-Index: linux-2.6.28/drivers/ar6000/include/wmix.h
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/drivers/ar6000/include/wmix.h 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/drivers/ar6000/include/wmix.h
@@ -0,0 +1,233 @@
+/*
+ * Copyright (c) 2004-2005 Atheros Communications Inc.
@@ -69479,10 +68775,8 @@ Index: linux-2.6.28/drivers/ar6000/include/wmix.h
+#endif
+
+#endif /* _WMIX_H_ */
-Index: linux-2.6.28/drivers/ar6000/Kconfig
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/drivers/ar6000/Kconfig 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/drivers/ar6000/Kconfig
@@ -0,0 +1,7 @@
+config AR6000_WLAN
+ tristate "AR6000 wireless networking over SDIO"
@@ -69491,10 +68785,8 @@ Index: linux-2.6.28/drivers/ar6000/Kconfig
+ default m
+ help
+ good luck.
-Index: linux-2.6.28/drivers/ar6000/Makefile
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/drivers/ar6000/Makefile 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/drivers/ar6000/Makefile
@@ -0,0 +1,38 @@
+REV ?= 2
+
@@ -69534,10 +68826,8 @@ Index: linux-2.6.28/drivers/ar6000/Makefile
+ wlan/wlan_utils.o
+
+
-Index: linux-2.6.28/drivers/ar6000/miscdrv/common_drv.c
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/drivers/ar6000/miscdrv/common_drv.c 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/drivers/ar6000/miscdrv/common_drv.c
@@ -0,0 +1,467 @@
+
+/*
@@ -70006,10 +69296,8 @@ Index: linux-2.6.28/drivers/ar6000/miscdrv/common_drv.c
+
+}
+
-Index: linux-2.6.28/drivers/ar6000/miscdrv/credit_dist.c
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/drivers/ar6000/miscdrv/credit_dist.c 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/drivers/ar6000/miscdrv/credit_dist.c
@@ -0,0 +1,346 @@
+
+/*
@@ -70357,10 +69645,8 @@ Index: linux-2.6.28/drivers/ar6000/miscdrv/credit_dist.c
+ return A_OK;
+}
+
-Index: linux-2.6.28/drivers/ar6000/wlan/wlan_node.c
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/drivers/ar6000/wlan/wlan_node.c 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/drivers/ar6000/wlan/wlan_node.c
@@ -0,0 +1,371 @@
+/*-
+ * Copyright (c) 2001 Atsushi Onoe
@@ -70733,10 +70019,8 @@ Index: linux-2.6.28/drivers/ar6000/wlan/wlan_node.c
+ wlan_node_dec_free (ni);
+ IEEE80211_NODE_UNLOCK (nt);
+}
-Index: linux-2.6.28/drivers/ar6000/wlan/wlan_recv_beacon.c
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/drivers/ar6000/wlan/wlan_recv_beacon.c 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/drivers/ar6000/wlan/wlan_recv_beacon.c
@@ -0,0 +1,192 @@
+/*-
+ * Copyright (c) 2001 Atsushi Onoe
@@ -70930,10 +70214,8 @@ Index: linux-2.6.28/drivers/ar6000/wlan/wlan_recv_beacon.c
+
+ return A_OK;
+}
-Index: linux-2.6.28/drivers/ar6000/wlan/wlan_utils.c
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/drivers/ar6000/wlan/wlan_utils.c 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/drivers/ar6000/wlan/wlan_utils.c
@@ -0,0 +1,59 @@
+/*
+ * Copyright (c) 2004-2005 Atheros Communications Inc.
@@ -70994,10 +70276,8 @@ Index: linux-2.6.28/drivers/ar6000/wlan/wlan_utils.c
+ return 15 + ((freq - 2512) / 20);
+ return (freq - 5000) / 5;
+}
-Index: linux-2.6.28/drivers/ar6000/wmi/wmi.c
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/drivers/ar6000/wmi/wmi.c 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/drivers/ar6000/wmi/wmi.c
@@ -0,0 +1,3954 @@
+/*
+ * Copyright (c) 2004-2007 Atheros Communications Inc.
@@ -74953,10 +74233,8 @@ Index: linux-2.6.28/drivers/ar6000/wmi/wmi.c
+ NO_SYNC_WMIFLAG));
+}
+
-Index: linux-2.6.28/drivers/ar6000/wmi/wmi_doc.h
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/drivers/ar6000/wmi/wmi_doc.h 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/drivers/ar6000/wmi/wmi_doc.h
@@ -0,0 +1,4421 @@
+/*
+ *
@@ -79379,10 +78657,8 @@ Index: linux-2.6.28/drivers/ar6000/wmi/wmi_doc.h
+
+=====================================================================
+#endif
-Index: linux-2.6.28/drivers/ar6000/wmi/wmi_host.h
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/drivers/ar6000/wmi/wmi_host.h 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/drivers/ar6000/wmi/wmi_host.h
@@ -0,0 +1,71 @@
+#ifndef _WMI_HOST_H_
+#define _WMI_HOST_H_
@@ -79455,10 +78731,8 @@ Index: linux-2.6.28/drivers/ar6000/wmi/wmi_host.h
+#endif
+
+#endif /* _WMI_HOST_H_ */
-Index: linux-2.6.28/drivers/base/bus.c
-===================================================================
---- linux-2.6.28.orig/drivers/base/bus.c 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.28/drivers/base/bus.c 2009-01-02 00:01:56.000000000 +0100
+--- a/drivers/base/bus.c
++++ b/drivers/base/bus.c
@@ -141,6 +141,29 @@ void bus_remove_file(struct bus_type *bu
}
EXPORT_SYMBOL_GPL(bus_remove_file);
@@ -79489,10 +78763,8 @@ Index: linux-2.6.28/drivers/base/bus.c
static struct kobj_type bus_ktype = {
.sysfs_ops = &bus_sysfs_ops,
};
-Index: linux-2.6.28/drivers/base/core.c
-===================================================================
---- linux-2.6.28.orig/drivers/base/core.c 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.28/drivers/base/core.c 2009-01-02 00:01:56.000000000 +0100
+--- a/drivers/base/core.c
++++ b/drivers/base/core.c
@@ -55,6 +55,11 @@ static inline int device_is_not_partitio
*/
const char *dev_driver_string(const struct device *dev)
@@ -79505,10 +78777,8 @@ Index: linux-2.6.28/drivers/base/core.c
return dev->driver ? dev->driver->name :
(dev->bus ? dev->bus->name :
(dev->class ? dev->class->name : ""));
-Index: linux-2.6.28/drivers/base/power/main.c
-===================================================================
---- linux-2.6.28.orig/drivers/base/power/main.c 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.28/drivers/base/power/main.c 2009-01-02 00:01:56.000000000 +0100
+--- a/drivers/base/power/main.c
++++ b/drivers/base/power/main.c
@@ -69,9 +69,9 @@ void device_pm_unlock(void)
*/
void device_pm_add(struct device *dev)
@@ -79521,10 +78791,8 @@ Index: linux-2.6.28/drivers/base/power/main.c
mutex_lock(&dpm_list_mtx);
if (dev->parent) {
if (dev->parent->power.status >= DPM_SUSPENDING)
-Index: linux-2.6.28/drivers/char/Kconfig
-===================================================================
---- linux-2.6.28.orig/drivers/char/Kconfig 2009-01-02 00:00:02.000000000 +0100
-+++ linux-2.6.28/drivers/char/Kconfig 2009-01-02 00:01:56.000000000 +0100
+--- a/drivers/char/Kconfig
++++ b/drivers/char/Kconfig
@@ -66,6 +66,18 @@ config VT_CONSOLE
If unsure, say Y.
@@ -79544,10 +78812,8 @@ Index: linux-2.6.28/drivers/char/Kconfig
config HW_CONSOLE
bool
depends on VT && !S390 && !UML
-Index: linux-2.6.28/drivers/gpio/gpiolib.c
-===================================================================
---- linux-2.6.28.orig/drivers/gpio/gpiolib.c 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.28/drivers/gpio/gpiolib.c 2009-01-02 00:01:56.000000000 +0100
+--- a/drivers/gpio/gpiolib.c
++++ b/drivers/gpio/gpiolib.c
@@ -6,8 +6,7 @@
#include <linux/err.h>
#include <linux/debugfs.h>
@@ -79558,10 +78824,8 @@ Index: linux-2.6.28/drivers/gpio/gpiolib.c
/* Optional implementation infrastructure for GPIO interfaces.
*
-Index: linux-2.6.28/drivers/i2c/busses/i2c-s3c2410.c
-===================================================================
---- linux-2.6.28.orig/drivers/i2c/busses/i2c-s3c2410.c 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.28/drivers/i2c/busses/i2c-s3c2410.c 2009-01-02 00:51:37.000000000 +0100
+--- a/drivers/i2c/busses/i2c-s3c2410.c
++++ b/drivers/i2c/busses/i2c-s3c2410.c
@@ -34,14 +34,12 @@
#include <linux/platform_device.h>
#include <linux/clk.h>
@@ -80125,10 +79389,8 @@ Index: linux-2.6.28/drivers/i2c/busses/i2c-s3c2410.c
return 0;
}
-Index: linux-2.6.28/drivers/i2c/busses/Kconfig
-===================================================================
---- linux-2.6.28.orig/drivers/i2c/busses/Kconfig 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.28/drivers/i2c/busses/Kconfig 2009-01-02 00:01:56.000000000 +0100
+--- a/drivers/i2c/busses/Kconfig
++++ b/drivers/i2c/busses/Kconfig
@@ -455,11 +455,12 @@ config I2C_PXA_SLAVE
I2C bus.
@@ -80145,10 +79407,8 @@ Index: linux-2.6.28/drivers/i2c/busses/Kconfig
config I2C_SH7760
tristate "Renesas SH7760 I2C Controller"
-Index: linux-2.6.28/drivers/i2c/chips/Kconfig
-===================================================================
---- linux-2.6.28.orig/drivers/i2c/chips/Kconfig 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.28/drivers/i2c/chips/Kconfig 2009-01-02 00:01:56.000000000 +0100
+--- a/drivers/i2c/chips/Kconfig
++++ b/drivers/i2c/chips/Kconfig
@@ -53,6 +53,26 @@ config SENSORS_EEPROM
This driver can also be built as a module. If so, the module
will be called eeprom.
@@ -80200,10 +79460,8 @@ Index: linux-2.6.28/drivers/i2c/chips/Kconfig
+ This driver can also be built as a module. If so, the module
+ will be called pca9632.
endmenu
-Index: linux-2.6.28/drivers/i2c/chips/Makefile
-===================================================================
---- linux-2.6.28.orig/drivers/i2c/chips/Makefile 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.28/drivers/i2c/chips/Makefile 2009-01-02 00:01:56.000000000 +0100
+--- a/drivers/i2c/chips/Makefile
++++ b/drivers/i2c/chips/Makefile
@@ -15,6 +15,8 @@ obj-$(CONFIG_AT24) += at24.o
obj-$(CONFIG_SENSORS_EEPROM) += eeprom.o
obj-$(CONFIG_SENSORS_MAX6875) += max6875.o
@@ -80222,10 +79480,8 @@ Index: linux-2.6.28/drivers/i2c/chips/Makefile
ifeq ($(CONFIG_I2C_DEBUG_CHIP),y)
EXTRA_CFLAGS += -DDEBUG
-Index: linux-2.6.28/drivers/i2c/chips/pca9632.c
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/drivers/i2c/chips/pca9632.c 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/drivers/i2c/chips/pca9632.c
@@ -0,0 +1,551 @@
+/*
+ * Philips/NXP PCA9632 low power LED driver.
@@ -80778,10 +80034,8 @@ Index: linux-2.6.28/drivers/i2c/chips/pca9632.c
+
+module_init(pca9632_init);
+module_exit(pca9632_exit);
-Index: linux-2.6.28/drivers/i2c/chips/pca9632.h
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/drivers/i2c/chips/pca9632.h 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/drivers/i2c/chips/pca9632.h
@@ -0,0 +1,24 @@
+#ifndef _PCA9632_H
+#define _PCA9632_H
@@ -80807,10 +80061,8 @@ Index: linux-2.6.28/drivers/i2c/chips/pca9632.h
+#define PCA9632_DMBLNK_SHIFT 5
+
+#endif /* _PCA9632_H */
-Index: linux-2.6.28/drivers/i2c/chips/pcf50606.c
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/drivers/i2c/chips/pcf50606.c 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/drivers/i2c/chips/pcf50606.c
@@ -0,0 +1,2193 @@
+/* Philips/NXP PCF50606 Power Management Unit (PMU) driver
+ *
@@ -83005,10 +82257,8 @@ Index: linux-2.6.28/drivers/i2c/chips/pcf50606.c
+
+module_init(pcf50606_init);
+module_exit(pcf50606_exit);
-Index: linux-2.6.28/drivers/i2c/chips/pcf50606.h
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/drivers/i2c/chips/pcf50606.h 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/drivers/i2c/chips/pcf50606.h
@@ -0,0 +1,302 @@
+#ifndef _PCF50606_H
+#define _PCF50606_H
@@ -83312,10 +82562,8 @@ Index: linux-2.6.28/drivers/i2c/chips/pcf50606.h
+
+#endif /* _PCF50606_H */
+
-Index: linux-2.6.28/drivers/i2c/chips/pcf50633.c
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/drivers/i2c/chips/pcf50633.c 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/drivers/i2c/chips/pcf50633.c
@@ -0,0 +1,1883 @@
+/* Philips PCF50633 Power Management Unit (PMU) driver
+ *
@@ -85200,10 +84448,8 @@ Index: linux-2.6.28/drivers/i2c/chips/pcf50633.c
+
+module_init(pcf50633_init);
+module_exit(pcf50633_exit);
-Index: linux-2.6.28/drivers/i2c/i2c-core.c
-===================================================================
---- linux-2.6.28.orig/drivers/i2c/i2c-core.c 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.28/drivers/i2c/i2c-core.c 2009-01-02 00:01:56.000000000 +0100
+--- a/drivers/i2c/i2c-core.c
++++ b/drivers/i2c/i2c-core.c
@@ -1,4 +1,3 @@
-/* i2c-core.c - a device driver for the iic-bus interface */
/* ------------------------------------------------------------------------- */
@@ -85257,10 +84503,8 @@ Index: linux-2.6.28/drivers/i2c/i2c-core.c
/* Skip if already in use */
if (i2c_check_addr(adapter, addr))
-Index: linux-2.6.28/drivers/input/keyboard/gpio_keys.c
-===================================================================
---- linux-2.6.28.orig/drivers/input/keyboard/gpio_keys.c 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.28/drivers/input/keyboard/gpio_keys.c 2009-01-02 00:01:56.000000000 +0100
+--- a/drivers/input/keyboard/gpio_keys.c
++++ b/drivers/input/keyboard/gpio_keys.c
@@ -23,7 +23,7 @@
#include <linux/input.h>
#include <linux/gpio_keys.h>
@@ -85270,10 +84514,8 @@ Index: linux-2.6.28/drivers/input/keyboard/gpio_keys.c
struct gpio_button_data {
struct gpio_keys_button *button;
-Index: linux-2.6.28/drivers/input/keyboard/Kconfig
-===================================================================
---- linux-2.6.28.orig/drivers/input/keyboard/Kconfig 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.28/drivers/input/keyboard/Kconfig 2009-01-02 00:01:56.000000000 +0100
+--- a/drivers/input/keyboard/Kconfig
++++ b/drivers/input/keyboard/Kconfig
@@ -323,4 +323,21 @@ config KEYBOARD_SH_KEYSC
To compile this driver as a module, choose M here: the
@@ -85296,10 +84538,8 @@ Index: linux-2.6.28/drivers/input/keyboard/Kconfig
+
+
endif
-Index: linux-2.6.28/drivers/input/keyboard/Makefile
-===================================================================
---- linux-2.6.28.orig/drivers/input/keyboard/Makefile 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.28/drivers/input/keyboard/Makefile 2009-01-02 00:01:56.000000000 +0100
+--- a/drivers/input/keyboard/Makefile
++++ b/drivers/input/keyboard/Makefile
@@ -14,6 +14,8 @@ obj-$(CONFIG_KEYBOARD_LOCOMO) += locomo
obj-$(CONFIG_KEYBOARD_NEWTON) += newtonkbd.o
obj-$(CONFIG_KEYBOARD_STOWAWAY) += stowaway.o
@@ -85309,10 +84549,8 @@ Index: linux-2.6.28/drivers/input/keyboard/Makefile
obj-$(CONFIG_KEYBOARD_SPITZ) += spitzkbd.o
obj-$(CONFIG_KEYBOARD_TOSA) += tosakbd.o
obj-$(CONFIG_KEYBOARD_HIL) += hil_kbd.o
-Index: linux-2.6.28/drivers/input/keyboard/neo1973kbd.c
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/drivers/input/keyboard/neo1973kbd.c 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/drivers/input/keyboard/neo1973kbd.c
@@ -0,0 +1,465 @@
+/*
+ * Keyboard driver for FIC Neo1973 GSM phone
@@ -85779,10 +85017,8 @@ Index: linux-2.6.28/drivers/input/keyboard/neo1973kbd.c
+MODULE_AUTHOR("Harald Welte <laforge@openmoko.org>");
+MODULE_DESCRIPTION("FIC Neo1973 buttons input driver");
+MODULE_LICENSE("GPL");
-Index: linux-2.6.28/drivers/input/keyboard/qt2410kbd.c
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/drivers/input/keyboard/qt2410kbd.c 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/drivers/input/keyboard/qt2410kbd.c
@@ -0,0 +1,231 @@
+/*
+ * Keyboard driver for Armzone QT2410
@@ -86015,10 +85251,8 @@ Index: linux-2.6.28/drivers/input/keyboard/qt2410kbd.c
+MODULE_AUTHOR("Harald Welte <laforge@openmoko.org>");
+MODULE_DESCRIPTION("Armzone QT2410 Buttons Driver");
+MODULE_LICENSE("GPL");
-Index: linux-2.6.28/drivers/input/misc/Kconfig
-===================================================================
---- linux-2.6.28.orig/drivers/input/misc/Kconfig 2009-01-02 00:00:02.000000000 +0100
-+++ linux-2.6.28/drivers/input/misc/Kconfig 2009-01-02 00:01:56.000000000 +0100
+--- a/drivers/input/misc/Kconfig
++++ b/drivers/input/misc/Kconfig
@@ -236,4 +236,25 @@ config INPUT_GPIO_BUTTONS
To compile this driver as a module, choose M here: the
module will be called gpio-buttons.
@@ -86045,10 +85279,8 @@ Index: linux-2.6.28/drivers/input/misc/Kconfig
+ Say Y to include support for input events on NXP PCF50606.
+
endif
-Index: linux-2.6.28/drivers/input/misc/lis302dl.c
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/drivers/input/misc/lis302dl.c 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/drivers/input/misc/lis302dl.c
@@ -0,0 +1,874 @@
+/* Linux kernel driver for the ST LIS302D 3-axis accelerometer
+ *
@@ -86924,10 +86156,8 @@ Index: linux-2.6.28/drivers/input/misc/lis302dl.c
+
+module_init(lis302dl_init);
+module_exit(lis302dl_exit);
-Index: linux-2.6.28/drivers/input/misc/Makefile
-===================================================================
---- linux-2.6.28.orig/drivers/input/misc/Makefile 2009-01-02 00:00:02.000000000 +0100
-+++ linux-2.6.28/drivers/input/misc/Makefile 2009-01-02 00:05:46.000000000 +0100
+--- a/drivers/input/misc/Makefile
++++ b/drivers/input/misc/Makefile
@@ -22,3 +22,6 @@ obj-$(CONFIG_INPUT_UINPUT) += uinput.o
obj-$(CONFIG_INPUT_APANEL) += apanel.o
obj-$(CONFIG_INPUT_SGI_BTNS) += sgi_btns.o
@@ -86935,10 +86165,8 @@ Index: linux-2.6.28/drivers/input/misc/Makefile
+obj-$(CONFIG_INPUT_LIS302DL) += lis302dl.o
+obj-$(CONFIG_INPUT_PCF50633_PMU) += pcf50633-input.o
+obj-$(CONFIG_INPUT_PCF50606_PMU) += pcf50606-input.o
-Index: linux-2.6.28/drivers/input/misc/pcf50606-input.c
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/drivers/input/misc/pcf50606-input.c 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/drivers/input/misc/pcf50606-input.c
@@ -0,0 +1,123 @@
+/* Philips PCF50606 Input Driver
+ *
@@ -87063,10 +86291,8 @@ Index: linux-2.6.28/drivers/input/misc/pcf50606-input.c
+MODULE_DESCRIPTION("PCF50606 input driver");
+MODULE_LICENSE("GPL");
+MODULE_ALIAS("platform:pcf50606-input");
-Index: linux-2.6.28/drivers/input/misc/pcf50633-input.c
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/drivers/input/misc/pcf50633-input.c 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/drivers/input/misc/pcf50633-input.c
@@ -0,0 +1,123 @@
+/* Philips PCF50633 Input Driver
+ *
@@ -87191,10 +86417,8 @@ Index: linux-2.6.28/drivers/input/misc/pcf50633-input.c
+MODULE_DESCRIPTION("PCF50633 input driver");
+MODULE_LICENSE("GPL");
+MODULE_ALIAS("platform:pcf50633-input");
-Index: linux-2.6.28/drivers/input/mousedev.c
-===================================================================
---- linux-2.6.28.orig/drivers/input/mousedev.c 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.28/drivers/input/mousedev.c 2009-01-02 00:01:56.000000000 +0100
+--- a/drivers/input/mousedev.c
++++ b/drivers/input/mousedev.c
@@ -1016,6 +1016,7 @@ static const struct input_device_id mous
.evbit = { BIT_MASK(EV_KEY) | BIT_MASK(EV_REL) },
.relbit = { BIT_MASK(REL_WHEEL) },
@@ -87211,10 +86435,8 @@ Index: linux-2.6.28/drivers/input/mousedev.c
{
.flags = INPUT_DEVICE_ID_MATCH_EVBIT |
INPUT_DEVICE_ID_MATCH_KEYBIT |
-Index: linux-2.6.28/drivers/input/touchscreen/Kconfig
-===================================================================
---- linux-2.6.28.orig/drivers/input/touchscreen/Kconfig 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.28/drivers/input/touchscreen/Kconfig 2009-01-02 00:01:56.000000000 +0100
+--- a/drivers/input/touchscreen/Kconfig
++++ b/drivers/input/touchscreen/Kconfig
@@ -11,6 +11,50 @@ menuconfig INPUT_TOUCHSCREEN
if INPUT_TOUCHSCREEN
@@ -87308,10 +86530,8 @@ Index: linux-2.6.28/drivers/input/touchscreen/Kconfig
+ module will be called pcap7200.
endif
+
-Index: linux-2.6.28/drivers/input/touchscreen/Makefile
-===================================================================
---- linux-2.6.28.orig/drivers/input/touchscreen/Makefile 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.28/drivers/input/touchscreen/Makefile 2009-01-02 00:01:56.000000000 +0100
+--- a/drivers/input/touchscreen/Makefile
++++ b/drivers/input/touchscreen/Makefile
@@ -31,3 +31,10 @@ wm97xx-ts-$(CONFIG_TOUCHSCREEN_WM9705) +
wm97xx-ts-$(CONFIG_TOUCHSCREEN_WM9712) += wm9712.o
wm97xx-ts-$(CONFIG_TOUCHSCREEN_WM9713) += wm9713.o
@@ -87323,10 +86543,8 @@ Index: linux-2.6.28/drivers/input/touchscreen/Makefile
+obj-$(CONFIG_TOUCHSCREEN_FILTER_MEDIAN) += ts_filter_median.o
+obj-$(CONFIG_TOUCHSCREEN_FILTER_MEAN) += ts_filter_mean.o
+obj-$(CONFIG_TOUCHSCREEN_PCAP7200) += pcap7200_ts.o
-Index: linux-2.6.28/drivers/input/touchscreen/s3c2410_ts.c
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/drivers/input/touchscreen/s3c2410_ts.c 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/drivers/input/touchscreen/s3c2410_ts.c
@@ -0,0 +1,618 @@
+/*
+ * This program is free software; you can redistribute it and/or modify
@@ -87946,10 +87164,8 @@ Index: linux-2.6.28/drivers/input/touchscreen/s3c2410_ts.c
+module_init(s3c2410ts_init);
+module_exit(s3c2410ts_exit);
+
-Index: linux-2.6.28/drivers/input/touchscreen/ts_filter.c
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/drivers/input/touchscreen/ts_filter.c 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/drivers/input/touchscreen/ts_filter.c
@@ -0,0 +1,64 @@
+/*
+ * This program is free software; you can redistribute it and/or modify
@@ -88015,10 +87231,8 @@ Index: linux-2.6.28/drivers/input/touchscreen/ts_filter.c
+ *first = NULL;
+}
+EXPORT_SYMBOL_GPL(ts_filter_destroy_chain);
-Index: linux-2.6.28/drivers/input/touchscreen/ts_filter_group.c
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/drivers/input/touchscreen/ts_filter_group.c 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/drivers/input/touchscreen/ts_filter_group.c
@@ -0,0 +1,219 @@
+/*
+ * This program is free software; you can redistribute it and/or modify
@@ -88239,10 +87453,8 @@ Index: linux-2.6.28/drivers/input/touchscreen/ts_filter_group.c
+ .scale = ts_filter_group_scale,
+};
+
-Index: linux-2.6.28/drivers/input/touchscreen/ts_filter_linear.c
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/drivers/input/touchscreen/ts_filter_linear.c 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/drivers/input/touchscreen/ts_filter_linear.c
@@ -0,0 +1,178 @@
+/*
+ * This program is free software; you can redistribute it and/or modify
@@ -88422,10 +87634,8 @@ Index: linux-2.6.28/drivers/input/touchscreen/ts_filter_linear.c
+ .process = ts_filter_linear_process,
+ .scale = ts_filter_linear_scale,
+};
-Index: linux-2.6.28/drivers/input/touchscreen/ts_filter_mean.c
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/drivers/input/touchscreen/ts_filter_mean.c 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/drivers/input/touchscreen/ts_filter_mean.c
@@ -0,0 +1,172 @@
+/*
+ * This program is free software; you can redistribute it and/or modify
@@ -88599,10 +87809,8 @@ Index: linux-2.6.28/drivers/input/touchscreen/ts_filter_mean.c
+ .process = ts_filter_mean_process,
+ .scale = ts_filter_mean_scale,
+};
-Index: linux-2.6.28/drivers/input/touchscreen/ts_filter_median.c
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/drivers/input/touchscreen/ts_filter_median.c 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/drivers/input/touchscreen/ts_filter_median.c
@@ -0,0 +1,215 @@
+/*
+ * This program is free software; you can redistribute it and/or modify
@@ -88819,10 +88027,8 @@ Index: linux-2.6.28/drivers/input/touchscreen/ts_filter_median.c
+ .process = ts_filter_median_process,
+ .scale = ts_filter_median_scale,
+};
-Index: linux-2.6.28/drivers/Kconfig
-===================================================================
---- linux-2.6.28.orig/drivers/Kconfig 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.28/drivers/Kconfig 2009-01-02 00:01:56.000000000 +0100
+--- a/drivers/Kconfig
++++ b/drivers/Kconfig
@@ -107,4 +107,6 @@ source "drivers/uio/Kconfig"
source "drivers/xen/Kconfig"
@@ -88830,10 +88036,8 @@ Index: linux-2.6.28/drivers/Kconfig
+
+source "drivers/android/Kconfig"
endmenu
-Index: linux-2.6.28/drivers/leds/Kconfig
-===================================================================
---- linux-2.6.28.orig/drivers/leds/Kconfig 2009-01-02 00:00:02.000000000 +0100
-+++ linux-2.6.28/drivers/leds/Kconfig 2009-01-02 00:01:56.000000000 +0100
+--- a/drivers/leds/Kconfig
++++ b/drivers/leds/Kconfig
@@ -33,7 +33,7 @@ config LEDS_LOCOMO
config LEDS_S3C24XX
@@ -88862,10 +88066,8 @@ Index: linux-2.6.28/drivers/leds/Kconfig
comment "LED Triggers"
config LEDS_TRIGGERS
-Index: linux-2.6.28/drivers/leds/led-class.c
-===================================================================
---- linux-2.6.28.orig/drivers/leds/led-class.c 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.28/drivers/leds/led-class.c 2009-01-02 00:01:56.000000000 +0100
+--- a/drivers/leds/led-class.c
++++ b/drivers/leds/led-class.c
@@ -56,8 +56,10 @@ static ssize_t led_brightness_store(stru
if (count == size) {
ret = count;
@@ -88877,10 +88079,8 @@ Index: linux-2.6.28/drivers/leds/led-class.c
led_set_brightness(led_cdev, state);
}
-Index: linux-2.6.28/drivers/leds/leds-neo1973-gta02.c
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/drivers/leds/leds-neo1973-gta02.c 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/drivers/leds/leds-neo1973-gta02.c
@@ -0,0 +1,179 @@
+/*
+ * LED driver for the Openmoko GTA02 GSM phone
@@ -89061,10 +88261,8 @@ Index: linux-2.6.28/drivers/leds/leds-neo1973-gta02.c
+MODULE_AUTHOR("Harald Welte <laforge@openmoko.org>");
+MODULE_DESCRIPTION("Openmoko GTA02 LED driver");
+MODULE_LICENSE("GPL");
-Index: linux-2.6.28/drivers/leds/leds-neo1973-vibrator.c
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/drivers/leds/leds-neo1973-vibrator.c 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/drivers/leds/leds-neo1973-vibrator.c
@@ -0,0 +1,209 @@
+/*
+ * LED driver for the vibrator of the Openmoko GTA01/GTA02 GSM Phones
@@ -89275,10 +88473,8 @@ Index: linux-2.6.28/drivers/leds/leds-neo1973-vibrator.c
+MODULE_AUTHOR("Harald Welte <laforge@openmoko.org>");
+MODULE_DESCRIPTION("Openmoko GTA01/GTA02 vibrator driver");
+MODULE_LICENSE("GPL");
-Index: linux-2.6.28/drivers/leds/Makefile
-===================================================================
---- linux-2.6.28.orig/drivers/leds/Makefile 2009-01-02 00:00:02.000000000 +0100
-+++ linux-2.6.28/drivers/leds/Makefile 2009-01-02 00:01:56.000000000 +0100
+--- a/drivers/leds/Makefile
++++ b/drivers/leds/Makefile
@@ -24,6 +24,8 @@ obj-$(CONFIG_LEDS_FSG) += leds-fsg.o
obj-$(CONFIG_LEDS_PCA955X) += leds-pca955x.o
obj-$(CONFIG_LEDS_DA903X) += leds-da903x.o
@@ -89288,10 +88484,8 @@ Index: linux-2.6.28/drivers/leds/Makefile
# LED Triggers
obj-$(CONFIG_LEDS_TRIGGER_TIMER) += ledtrig-timer.o
-Index: linux-2.6.28/drivers/Makefile
-===================================================================
---- linux-2.6.28.orig/drivers/Makefile 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.28/drivers/Makefile 2009-01-02 00:01:56.000000000 +0100
+--- a/drivers/Makefile
++++ b/drivers/Makefile
@@ -86,6 +86,7 @@ obj-$(CONFIG_CPU_IDLE) += cpuidle/
obj-y += idle/
obj-$(CONFIG_MMC) += mmc/
@@ -89308,10 +88502,8 @@ Index: linux-2.6.28/drivers/Makefile
obj-$(CONFIG_SSB) += ssb/
obj-$(CONFIG_VIRTIO) += virtio/
obj-$(CONFIG_REGULATOR) += regulator/
-Index: linux-2.6.28/drivers/mfd/glamo/glamo-core.c
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/drivers/mfd/glamo/glamo-core.c 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/drivers/mfd/glamo/glamo-core.c
@@ -0,0 +1,1399 @@
+/* Smedia Glamo 336x/337x driver
+ *
@@ -90712,10 +89904,8 @@ Index: linux-2.6.28/drivers/mfd/glamo/glamo-core.c
+MODULE_AUTHOR("Harald Welte <laforge@openmoko.org>");
+MODULE_DESCRIPTION("Smedia Glamo 336x/337x core/resource driver");
+MODULE_LICENSE("GPL");
-Index: linux-2.6.28/drivers/mfd/glamo/glamo-core.h
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/drivers/mfd/glamo/glamo-core.h 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/drivers/mfd/glamo/glamo-core.h
@@ -0,0 +1,92 @@
+#ifndef __GLAMO_CORE_H
+#define __GLAMO_CORE_H
@@ -90809,10 +89999,8 @@ Index: linux-2.6.28/drivers/mfd/glamo/glamo-core.h
+u_int16_t glamo_engine_clkreg_get(struct glamo_core *glamo,
+ enum glamo_engine engine);
+#endif /* __GLAMO_CORE_H */
-Index: linux-2.6.28/drivers/mfd/glamo/glamo-fb.c
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/drivers/mfd/glamo/glamo-fb.c 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/drivers/mfd/glamo/glamo-fb.c
@@ -0,0 +1,1048 @@
+/* Smedia Glamo 336x/337x driver
+ *
@@ -91862,10 +91050,8 @@ Index: linux-2.6.28/drivers/mfd/glamo/glamo-fb.c
+MODULE_AUTHOR("Harald Welte <laforge@openmoko.org>");
+MODULE_DESCRIPTION("Smedia Glamo 336x/337x framebuffer driver");
+MODULE_LICENSE("GPL");
-Index: linux-2.6.28/drivers/mfd/glamo/glamo-gpio.c
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/drivers/mfd/glamo/glamo-gpio.c 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/drivers/mfd/glamo/glamo-gpio.c
@@ -0,0 +1,62 @@
+
+#include <linux/kernel.h>
@@ -91929,10 +91115,8 @@ Index: linux-2.6.28/drivers/mfd/glamo/glamo-gpio.c
+}
+EXPORT_SYMBOL(glamo_gpio_cfgpin);
+
-Index: linux-2.6.28/drivers/mfd/glamo/glamo-lcm-spi.c
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/drivers/mfd/glamo/glamo-lcm-spi.c 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/drivers/mfd/glamo/glamo-lcm-spi.c
@@ -0,0 +1,240 @@
+/*
+ * Copyright (C) 2007 Openmoko, Inc.
@@ -92174,10 +91358,8 @@ Index: linux-2.6.28/drivers/mfd/glamo/glamo-lcm-spi.c
+MODULE_DESCRIPTION("Smedia Glamo 336x/337x LCM serial command SPI Driver");
+MODULE_AUTHOR("Harald Welte <laforge@openmoko.org>")
+MODULE_LICENSE("GPL");
-Index: linux-2.6.28/drivers/mfd/glamo/glamo-mci.c
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/drivers/mfd/glamo/glamo-mci.c 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/drivers/mfd/glamo/glamo-mci.c
@@ -0,0 +1,1133 @@
+/*
+ * linux/drivers/mmc/host/glamo-mmc.c - Glamo MMC driver
@@ -93312,10 +92494,8 @@ Index: linux-2.6.28/drivers/mfd/glamo/glamo-mci.c
+MODULE_DESCRIPTION("Glamo MMC/SD Card Interface driver");
+MODULE_LICENSE("GPL");
+MODULE_AUTHOR("Andy Green <andy@openmoko.com>");
-Index: linux-2.6.28/drivers/mfd/glamo/glamo-mci.h
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/drivers/mfd/glamo/glamo-mci.h 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/drivers/mfd/glamo/glamo-mci.h
@@ -0,0 +1,83 @@
+/*
+ * linux/drivers/mmc/host/glamo-mmc.h - GLAMO MCI driver
@@ -93400,10 +92580,8 @@ Index: linux-2.6.28/drivers/mfd/glamo/glamo-mci.h
+
+ struct regulator *regulator;
+};
-Index: linux-2.6.28/drivers/mfd/glamo/glamo-regs.h
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/drivers/mfd/glamo/glamo-regs.h 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/drivers/mfd/glamo/glamo-regs.h
@@ -0,0 +1,632 @@
+#ifndef _GLAMO_REGS_H
+#define _GLAMO_REGS_H
@@ -94037,10 +93215,8 @@ Index: linux-2.6.28/drivers/mfd/glamo/glamo-regs.h
+};
+
+#endif /* _GLAMO_REGS_H */
-Index: linux-2.6.28/drivers/mfd/glamo/glamo-spi-gpio.c
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/drivers/mfd/glamo/glamo-spi-gpio.c 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/drivers/mfd/glamo/glamo-spi-gpio.c
@@ -0,0 +1,288 @@
+/*
+ * Copyright (C) 2007 Openmoko, Inc.
@@ -94330,10 +93506,8 @@ Index: linux-2.6.28/drivers/mfd/glamo/glamo-spi-gpio.c
+MODULE_DESCRIPTION("Smedia Glamo 336x/337x LCM serial command SPI Driver");
+MODULE_AUTHOR("Harald Welte <laforge@openmoko.org>")
+MODULE_LICENSE("GPL");
-Index: linux-2.6.28/drivers/mfd/glamo/Kconfig
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/drivers/mfd/glamo/Kconfig 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/drivers/mfd/glamo/Kconfig
@@ -0,0 +1,44 @@
+config MFD_GLAMO
+ bool "Smedia Glamo 336x/337x support"
@@ -94380,10 +93554,8 @@ Index: linux-2.6.28/drivers/mfd/glamo/Kconfig
+
+ If unsure, say N.
\ No newline at end of file
-Index: linux-2.6.28/drivers/mfd/glamo/Makefile
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/drivers/mfd/glamo/Makefile 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/drivers/mfd/glamo/Makefile
@@ -0,0 +1,12 @@
+#
+# Makefile for the Smedia Glamo framebuffer driver
@@ -94397,10 +93569,8 @@ Index: linux-2.6.28/drivers/mfd/glamo/Makefile
+obj-$(CONFIG_MFD_GLAMO_SPI_FB) += glamo-lcm-spi.o
+obj-$(CONFIG_MFD_GLAMO_MCI) += glamo-mci.o
+
-Index: linux-2.6.28/drivers/mfd/Kconfig
-===================================================================
---- linux-2.6.28.orig/drivers/mfd/Kconfig 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.28/drivers/mfd/Kconfig 2009-01-02 00:01:56.000000000 +0100
+--- a/drivers/mfd/Kconfig
++++ b/drivers/mfd/Kconfig
@@ -153,6 +153,55 @@ config MFD_WM8350_I2C
I2C as the control interface. Additional options must be
selected to enable support for the functionality of the chip.
@@ -94457,10 +93627,8 @@ Index: linux-2.6.28/drivers/mfd/Kconfig
endmenu
menu "Multimedia Capabilities Port drivers"
-Index: linux-2.6.28/drivers/mfd/Makefile
-===================================================================
---- linux-2.6.28.orig/drivers/mfd/Makefile 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.28/drivers/mfd/Makefile 2009-01-02 00:01:56.000000000 +0100
+--- a/drivers/mfd/Makefile
++++ b/drivers/mfd/Makefile
@@ -4,6 +4,7 @@
obj-$(CONFIG_MFD_SM501) += sm501.o
@@ -94485,10 +93653,8 @@ Index: linux-2.6.28/drivers/mfd/Makefile
+obj-$(CONFIG_PCF50606_ADC) += pcf50606-adc.o
+obj-$(CONFIG_PCF50606_GPO) += pcf50606-gpo.o
+
-Index: linux-2.6.28/drivers/mfd/pcf50606-adc.c
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/drivers/mfd/pcf50606-adc.c 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/drivers/mfd/pcf50606-adc.c
@@ -0,0 +1,239 @@
+/* Philips PCF50606 ADC Driver
+ *
@@ -94729,10 +93895,8 @@ Index: linux-2.6.28/drivers/mfd/pcf50606-adc.c
+MODULE_LICENSE("GPL");
+MODULE_ALIAS("platform:pcf50606-adc");
+
-Index: linux-2.6.28/drivers/mfd/pcf50606-core.c
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/drivers/mfd/pcf50606-core.c 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/drivers/mfd/pcf50606-core.c
@@ -0,0 +1,580 @@
+/* Philips PCF50606 Power Management Unit (PMU) driver
+ *
@@ -95314,10 +94478,8 @@ Index: linux-2.6.28/drivers/mfd/pcf50606-core.c
+
+module_init(pcf50606_init);
+module_exit(pcf50606_exit);
-Index: linux-2.6.28/drivers/mfd/pcf50606-gpo.c
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/drivers/mfd/pcf50606-gpo.c 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/drivers/mfd/pcf50606-gpo.c
@@ -0,0 +1,128 @@
+/* Philips PCF50606 GPO Driver
+ *
@@ -95447,10 +94609,8 @@ Index: linux-2.6.28/drivers/mfd/pcf50606-gpo.c
+ return (value >> shift) & 0x01;
+}
+EXPORT_SYMBOL_GPL(pcf50606_gpo_invert_get);
-Index: linux-2.6.28/drivers/mfd/pcf50633-adc.c
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/drivers/mfd/pcf50633-adc.c 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/drivers/mfd/pcf50633-adc.c
@@ -0,0 +1,252 @@
+/* Philips PCF50633 ADC Driver
+ *
@@ -95704,10 +94864,8 @@ Index: linux-2.6.28/drivers/mfd/pcf50633-adc.c
+MODULE_LICENSE("GPL");
+MODULE_ALIAS("platform:pcf50633-adc");
+
-Index: linux-2.6.28/drivers/mfd/pcf50633-core.c
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/drivers/mfd/pcf50633-core.c 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/drivers/mfd/pcf50633-core.c
@@ -0,0 +1,627 @@
+/* Philips PCF50633 Power Management Unit (PMU) driver
+ *
@@ -96336,10 +95494,8 @@ Index: linux-2.6.28/drivers/mfd/pcf50633-core.c
+
+module_init(pcf50633_init);
+module_exit(pcf50633_exit);
-Index: linux-2.6.28/drivers/mfd/pcf50633-gpio.c
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/drivers/mfd/pcf50633-gpio.c 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/drivers/mfd/pcf50633-gpio.c
@@ -0,0 +1,100 @@
+/* Philips PCF50633 GPIO Driver
+ *
@@ -96441,18 +95597,14 @@ Index: linux-2.6.28/drivers/mfd/pcf50633-gpio.c
+ pcf50633_reg_set_bit_mask(pcf, reg, mask, val);
+}
+EXPORT_SYMBOL_GPL(pcf50633_gpio_power_supply_set);
-Index: linux-2.6.28/drivers/mfd/pcf50633-i2c.c
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/drivers/mfd/pcf50633-i2c.c 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/drivers/mfd/pcf50633-i2c.c
@@ -0,0 +1,3 @@
+
+};
+
-Index: linux-2.6.28/drivers/misc/Kconfig
-===================================================================
---- linux-2.6.28.orig/drivers/misc/Kconfig 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.28/drivers/misc/Kconfig 2009-01-02 00:01:56.000000000 +0100
+--- a/drivers/misc/Kconfig
++++ b/drivers/misc/Kconfig
@@ -401,6 +401,11 @@ config THINKPAD_ACPI_HOTKEY_POLL
If you are not sure, say Y here. The driver enables polling only if
it is strictly necessary to do so.
@@ -96475,10 +95627,8 @@ Index: linux-2.6.28/drivers/misc/Kconfig
+ Common machine code for Openmoko GTAxx hardware
+
endif # MISC_DEVICES
-Index: linux-2.6.28/drivers/misc/lowmemorykiller.c
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/drivers/misc/lowmemorykiller.c 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/drivers/misc/lowmemorykiller.c
@@ -0,0 +1,119 @@
+/* drivers/misc/lowmemorykiller.c
+ *
@@ -96599,10 +95749,8 @@ Index: linux-2.6.28/drivers/misc/lowmemorykiller.c
+
+MODULE_LICENSE("GPL");
+
-Index: linux-2.6.28/drivers/misc/Makefile
-===================================================================
---- linux-2.6.28.orig/drivers/misc/Makefile 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.28/drivers/misc/Makefile 2009-01-02 00:06:11.000000000 +0100
+--- a/drivers/misc/Makefile
++++ b/drivers/misc/Makefile
@@ -33,3 +33,8 @@ obj-$(CONFIG_SGI_XP) += sgi-xp/
obj-$(CONFIG_SGI_GRU) += sgi-gru/
obj-$(CONFIG_HP_ILO) += hpilo.o
@@ -96612,10 +95760,8 @@ Index: linux-2.6.28/drivers/misc/Makefile
+obj-$(CONFIG_MACH_NEO1973) += neo1973_version.o \
+ neo1973_pm_host.o \
+ neo1973_pm_resume_reason.o
-Index: linux-2.6.28/drivers/misc/neo1973_pm_charging_led.c
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/drivers/misc/neo1973_pm_charging_led.c 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/drivers/misc/neo1973_pm_charging_led.c
@@ -0,0 +1,106 @@
+/*
+ * Charging LED sysfs for the FIC Neo1973 GSM Phone
@@ -96723,10 +95869,8 @@ Index: linux-2.6.28/drivers/misc/neo1973_pm_charging_led.c
+MODULE_AUTHOR("Andy Green <andy@openmoko.com>");
+MODULE_DESCRIPTION("Neo1973 PCB charging_led");
+#endif
-Index: linux-2.6.28/drivers/misc/neo1973_pm_host.c
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/drivers/misc/neo1973_pm_host.c 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/drivers/misc/neo1973_pm_host.c
@@ -0,0 +1,109 @@
+/*
+ * Bluetooth PM code for the FIC Neo1973 GSM Phone
@@ -96837,10 +95981,8 @@ Index: linux-2.6.28/drivers/misc/neo1973_pm_host.c
+MODULE_AUTHOR("Andy Green <andy@openmoko.com>");
+MODULE_DESCRIPTION("Neo1973 USB Host Power Management");
+#endif
-Index: linux-2.6.28/drivers/misc/neo1973_pm_resume_reason.c
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/drivers/misc/neo1973_pm_resume_reason.c 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/drivers/misc/neo1973_pm_resume_reason.c
@@ -0,0 +1,147 @@
+/*
+ * Resume reason sysfs for the FIC Neo1973 GSM Phone
@@ -96989,10 +96131,8 @@ Index: linux-2.6.28/drivers/misc/neo1973_pm_resume_reason.c
+MODULE_LICENSE("GPL");
+MODULE_AUTHOR("Andy Green <andy@openmoko.com>");
+MODULE_DESCRIPTION("Neo1973 resume_reason");
-Index: linux-2.6.28/drivers/misc/neo1973_pm_usbhost.c
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/drivers/misc/neo1973_pm_usbhost.c 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/drivers/misc/neo1973_pm_usbhost.c
@@ -0,0 +1,132 @@
+/*
+ * Bluetooth PM code for the FIC Neo1973 GSM Phone
@@ -97126,10 +96266,8 @@ Index: linux-2.6.28/drivers/misc/neo1973_pm_usbhost.c
+MODULE_LICENSE("GPL");
+MODULE_AUTHOR("Andy Green <andy@openmoko.com>");
+MODULE_DESCRIPTION("Neo1973 USB Host Power Management");
-Index: linux-2.6.28/drivers/misc/neo1973_version.c
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/drivers/misc/neo1973_version.c 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/drivers/misc/neo1973_version.c
@@ -0,0 +1,90 @@
+/*
+ * PCB version sysfs for the FIC Neo1973 GSM Phone
@@ -97221,10 +96359,8 @@ Index: linux-2.6.28/drivers/misc/neo1973_version.c
+MODULE_AUTHOR("Andy Green <andy@openmoko.com>");
+MODULE_DESCRIPTION("Neo1973 PCB version");
+#endif
-Index: linux-2.6.28/drivers/misc/smdk6410-sleeptest.c
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/drivers/misc/smdk6410-sleeptest.c 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/drivers/misc/smdk6410-sleeptest.c
@@ -0,0 +1,65 @@
+/* linux/drivers/misc/smdk6410-sleeptest.c
+ *
@@ -97291,10 +96427,8 @@ Index: linux-2.6.28/drivers/misc/smdk6410-sleeptest.c
+
+MODULE_AUTHOR("Ben Dooks <ben@simtec.co.uk>");
+MODULE_LICENSE("GPL");
-Index: linux-2.6.28/drivers/mmc/core/core.c
-===================================================================
---- linux-2.6.28.orig/drivers/mmc/core/core.c 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.28/drivers/mmc/core/core.c 2009-01-02 00:01:56.000000000 +0100
+--- a/drivers/mmc/core/core.c
++++ b/drivers/mmc/core/core.c
@@ -57,10 +57,11 @@ static int mmc_schedule_delayed_work(str
/*
* Internal function. Flush all scheduled work from the MMC work queue.
@@ -97323,10 +96457,8 @@ Index: linux-2.6.28/drivers/mmc/core/core.c
host->ios.vdd = bit;
if (mmc_host_is_spi(host)) {
-Index: linux-2.6.28/drivers/mmc/host/Kconfig
-===================================================================
---- linux-2.6.28.orig/drivers/mmc/host/Kconfig 2009-01-02 00:00:02.000000000 +0100
-+++ linux-2.6.28/drivers/mmc/host/Kconfig 2009-01-02 00:01:56.000000000 +0100
+--- a/drivers/mmc/host/Kconfig
++++ b/drivers/mmc/host/Kconfig
@@ -48,6 +48,18 @@ config MMC_SDHCI_PCI
If unsure, say N.
@@ -97346,10 +96478,8 @@ Index: linux-2.6.28/drivers/mmc/host/Kconfig
config MMC_RICOH_MMC
tristate "Ricoh MMC Controller Disabler (EXPERIMENTAL)"
depends on MMC_SDHCI_PCI
-Index: linux-2.6.28/drivers/mmc/host/Makefile
-===================================================================
---- linux-2.6.28.orig/drivers/mmc/host/Makefile 2009-01-02 00:00:02.000000000 +0100
-+++ linux-2.6.28/drivers/mmc/host/Makefile 2009-01-02 00:01:56.000000000 +0100
+--- a/drivers/mmc/host/Makefile
++++ b/drivers/mmc/host/Makefile
@@ -11,6 +11,7 @@ obj-$(CONFIG_MMC_PXA) += pxamci.o
obj-$(CONFIG_MMC_IMX) += imxmmc.o
obj-$(CONFIG_MMC_SDHCI) += sdhci.o
@@ -97358,10 +96488,8 @@ Index: linux-2.6.28/drivers/mmc/host/Makefile
obj-$(CONFIG_MMC_RICOH_MMC) += ricoh_mmc.o
obj-$(CONFIG_MMC_WBSD) += wbsd.o
obj-$(CONFIG_MMC_AU1X) += au1xmmc.o
-Index: linux-2.6.28/drivers/mmc/host/s3cmci.c
-===================================================================
---- linux-2.6.28.orig/drivers/mmc/host/s3cmci.c 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.28/drivers/mmc/host/s3cmci.c 2009-01-02 00:01:56.000000000 +0100
+--- a/drivers/mmc/host/s3cmci.c
++++ b/drivers/mmc/host/s3cmci.c
@@ -2,6 +2,7 @@
* linux/drivers/mmc/s3cmci.h - Samsung S3C MCI driver
*
@@ -97555,10 +96683,8 @@ Index: linux-2.6.28/drivers/mmc/host/s3cmci.c
MODULE_ALIAS("platform:s3c2412-sdi");
MODULE_ALIAS("platform:s3c2440-sdi");
+
-Index: linux-2.6.28/drivers/mmc/host/s3cmci.h
-===================================================================
---- linux-2.6.28.orig/drivers/mmc/host/s3cmci.h 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.28/drivers/mmc/host/s3cmci.h 2009-01-02 00:01:56.000000000 +0100
+--- a/drivers/mmc/host/s3cmci.h
++++ b/drivers/mmc/host/s3cmci.h
@@ -8,6 +8,9 @@
* published by the Free Software Foundation.
*/
@@ -97583,10 +96709,8 @@ Index: linux-2.6.28/drivers/mmc/host/s3cmci.h
#ifdef CONFIG_CPU_FREQ
struct notifier_block freq_transition;
#endif
-Index: linux-2.6.28/drivers/mmc/host/sdhci.c
-===================================================================
---- linux-2.6.28.orig/drivers/mmc/host/sdhci.c 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.28/drivers/mmc/host/sdhci.c 2009-01-02 00:01:56.000000000 +0100
+--- a/drivers/mmc/host/sdhci.c
++++ b/drivers/mmc/host/sdhci.c
@@ -73,6 +73,11 @@ static void sdhci_dumpregs(struct sdhci_
readl(host->ioaddr + SDHCI_CAPABILITIES),
readl(host->ioaddr + SDHCI_MAX_CURRENT));
@@ -97761,10 +96885,8 @@ Index: linux-2.6.28/drivers/mmc/host/sdhci.c
if (host->timeout_clk == 0) {
printk(KERN_ERR "%s: Hardware doesn't specify timeout clock "
"frequency.\n", mmc_hostname(mmc));
-Index: linux-2.6.28/drivers/mmc/host/sdhci.h
-===================================================================
---- linux-2.6.28.orig/drivers/mmc/host/sdhci.h 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.28/drivers/mmc/host/sdhci.h 2009-01-02 00:01:56.000000000 +0100
+--- a/drivers/mmc/host/sdhci.h
++++ b/drivers/mmc/host/sdhci.h
@@ -57,6 +57,7 @@
#define SDHCI_DATA_AVAILABLE 0x00000800
#define SDHCI_CARD_PRESENT 0x00010000
@@ -97806,10 +96928,8 @@ Index: linux-2.6.28/drivers/mmc/host/sdhci.h
static inline void *sdhci_priv(struct sdhci_host *host)
{
return (void *)host->private;
-Index: linux-2.6.28/drivers/mmc/host/sdhci-pci.c
-===================================================================
---- linux-2.6.28.orig/drivers/mmc/host/sdhci-pci.c 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.28/drivers/mmc/host/sdhci-pci.c 2009-01-02 00:01:56.000000000 +0100
+--- a/drivers/mmc/host/sdhci-pci.c
++++ b/drivers/mmc/host/sdhci-pci.c
@@ -391,6 +391,7 @@ static int sdhci_pci_enable_dma(struct s
static struct sdhci_ops sdhci_pci_ops = {
@@ -97818,10 +96938,8 @@ Index: linux-2.6.28/drivers/mmc/host/sdhci-pci.c
};
/*****************************************************************************\
-Index: linux-2.6.28/drivers/mmc/host/sdhci-s3c.c
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/drivers/mmc/host/sdhci-s3c.c 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/drivers/mmc/host/sdhci-s3c.c
@@ -0,0 +1,419 @@
+/* linux/drivers/mmc/host/sdhci-s3c.c
+ *
@@ -98242,10 +97360,8 @@ Index: linux-2.6.28/drivers/mmc/host/sdhci-s3c.c
+MODULE_AUTHOR("Ben Dooks, <ben@simtec.co.uk>");
+MODULE_LICENSE("GPL v2");
+MODULE_ALIAS("platform:s3c-sdhci");
-Index: linux-2.6.28/drivers/mtd/nand/s3c2410.c
-===================================================================
---- linux-2.6.28.orig/drivers/mtd/nand/s3c2410.c 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.28/drivers/mtd/nand/s3c2410.c 2009-01-02 00:01:56.000000000 +0100
+--- a/drivers/mtd/nand/s3c2410.c
++++ b/drivers/mtd/nand/s3c2410.c
@@ -45,8 +45,8 @@
#include <asm/io.h>
@@ -98355,10 +97471,8 @@ Index: linux-2.6.28/drivers/mtd/nand/s3c2410.c
chip->ecc.calculate = s3c2410_nand_calculate_ecc;
chip->ecc.correct = s3c2410_nand_correct_data;
chip->ecc.mode = NAND_ECC_HW;
-Index: linux-2.6.28/drivers/net/wireless/libertas/if_sdio.c
-===================================================================
---- linux-2.6.28.orig/drivers/net/wireless/libertas/if_sdio.c 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.28/drivers/net/wireless/libertas/if_sdio.c 2009-01-02 00:01:56.000000000 +0100
+--- a/drivers/net/wireless/libertas/if_sdio.c
++++ b/drivers/net/wireless/libertas/if_sdio.c
@@ -48,6 +48,7 @@ module_param_named(fw_name, lbs_fw_name,
static const struct sdio_device_id if_sdio_ids[] = {
@@ -98381,10 +97495,8 @@ Index: linux-2.6.28/drivers/net/wireless/libertas/if_sdio.c
struct if_sdio_packet {
struct if_sdio_packet *next;
-Index: linux-2.6.28/drivers/pnp/Kconfig
-===================================================================
---- linux-2.6.28.orig/drivers/pnp/Kconfig 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.28/drivers/pnp/Kconfig 2009-01-02 00:01:56.000000000 +0100
+--- a/drivers/pnp/Kconfig
++++ b/drivers/pnp/Kconfig
@@ -5,7 +5,7 @@
menuconfig PNP
bool "Plug and Play support"
@@ -98394,10 +97506,8 @@ Index: linux-2.6.28/drivers/pnp/Kconfig
---help---
Plug and Play (PnP) is a standard for peripherals which allows those
peripherals to be configured by software, e.g. assign IRQ's or other
-Index: linux-2.6.28/drivers/pnp/resource.c
-===================================================================
---- linux-2.6.28.orig/drivers/pnp/resource.c 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.28/drivers/pnp/resource.c 2009-01-02 00:01:56.000000000 +0100
+--- a/drivers/pnp/resource.c
++++ b/drivers/pnp/resource.c
@@ -436,6 +436,7 @@ int pnp_check_dma(struct pnp_dev *dev, s
}
}
@@ -98414,10 +97524,8 @@ Index: linux-2.6.28/drivers/pnp/resource.c
/* check for conflicts with other pnp devices */
pnp_for_each_dev(tdev) {
-Index: linux-2.6.28/drivers/power/bq27000_battery.c
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/drivers/power/bq27000_battery.c 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/drivers/power/bq27000_battery.c
@@ -0,0 +1,463 @@
+/*
+ * Driver for batteries with bq27000 chips inside via HDQ
@@ -98882,10 +97990,8 @@ Index: linux-2.6.28/drivers/power/bq27000_battery.c
+MODULE_LICENSE("GPL");
+MODULE_AUTHOR("Andy Green <andy@openmoko.com>");
+MODULE_DESCRIPTION("bq27000 battery driver");
-Index: linux-2.6.28/drivers/power/gta02_hdq.c
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/drivers/power/gta02_hdq.c 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/drivers/power/gta02_hdq.c
@@ -0,0 +1,292 @@
+/*
+ * HDQ driver for the FIC Neo1973 GTA02 GSM phone
@@ -99179,10 +98285,8 @@ Index: linux-2.6.28/drivers/power/gta02_hdq.c
+MODULE_AUTHOR("Andy Green <andy@openmoko.com>");
+MODULE_DESCRIPTION("GTA02 HDQ driver");
+MODULE_LICENSE("GPL");
-Index: linux-2.6.28/drivers/power/Kconfig
-===================================================================
---- linux-2.6.28.orig/drivers/power/Kconfig 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.28/drivers/power/Kconfig 2009-01-02 00:01:56.000000000 +0100
+--- a/drivers/power/Kconfig
++++ b/drivers/power/Kconfig
@@ -68,4 +68,24 @@ config BATTERY_BQ27x00
help
Say Y here to enable support for batteries with BQ27200(I2C) chip.
@@ -99208,10 +98312,8 @@ Index: linux-2.6.28/drivers/power/Kconfig
+
endif # POWER_SUPPLY
+
-Index: linux-2.6.28/drivers/power/Makefile
-===================================================================
---- linux-2.6.28.orig/drivers/power/Makefile 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.28/drivers/power/Makefile 2009-01-02 00:01:56.000000000 +0100
+--- a/drivers/power/Makefile
++++ b/drivers/power/Makefile
@@ -23,3 +23,9 @@ obj-$(CONFIG_BATTERY_OLPC) += olpc_batte
obj-$(CONFIG_BATTERY_TOSA) += tosa_battery.o
obj-$(CONFIG_BATTERY_WM97XX) += wm97xx_battery.o
@@ -99222,10 +98324,8 @@ Index: linux-2.6.28/drivers/power/Makefile
+obj-$(CONFIG_GTA02_HDQ) += gta02_hdq.o
+
+obj-$(CONFIG_CHARGER_PCF50633) += pcf50633-charger.o
-Index: linux-2.6.28/drivers/power/pcf50633-charger.c
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/drivers/power/pcf50633-charger.c 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/drivers/power/pcf50633-charger.c
@@ -0,0 +1,415 @@
+/* Philips PCF50633 Main Battery Charger Driver
+ *
@@ -99642,10 +98742,8 @@ Index: linux-2.6.28/drivers/power/pcf50633-charger.c
+MODULE_DESCRIPTION("PCF50633 mbc driver");
+MODULE_LICENSE("GPL");
+MODULE_ALIAS("platform:pcf50633-mbc");
-Index: linux-2.6.28/drivers/regulator/core.c
-===================================================================
---- linux-2.6.28.orig/drivers/regulator/core.c 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.28/drivers/regulator/core.c 2009-01-02 00:01:56.000000000 +0100
+--- a/drivers/regulator/core.c
++++ b/drivers/regulator/core.c
@@ -1113,6 +1113,7 @@ int regulator_disable(struct regulator *
if (!regulator->enabled) {
printk(KERN_ERR "%s: not in use by this consumer\n",
@@ -99654,10 +98752,8 @@ Index: linux-2.6.28/drivers/regulator/core.c
return 0;
}
-Index: linux-2.6.28/drivers/regulator/Kconfig
-===================================================================
---- linux-2.6.28.orig/drivers/regulator/Kconfig 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.28/drivers/regulator/Kconfig 2009-01-02 00:01:56.000000000 +0100
+--- a/drivers/regulator/Kconfig
++++ b/drivers/regulator/Kconfig
@@ -73,4 +73,10 @@ config REGULATOR_DA903X
Say y here to support the BUCKs and LDOs regulators found on
Dialog Semiconductor DA9030/DA9034 PMIC.
@@ -99669,10 +98765,8 @@ Index: linux-2.6.28/drivers/regulator/Kconfig
+ Say Y here to support the voltage regulators and convertors
+ on PCF50633
endif
-Index: linux-2.6.28/drivers/regulator/Makefile
-===================================================================
---- linux-2.6.28.orig/drivers/regulator/Makefile 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.28/drivers/regulator/Makefile 2009-01-02 00:01:56.000000000 +0100
+--- a/drivers/regulator/Makefile
++++ b/drivers/regulator/Makefile
@@ -11,5 +11,6 @@ obj-$(CONFIG_REGULATOR_BQ24022) += bq240
obj-$(CONFIG_REGULATOR_WM8350) += wm8350-regulator.o
obj-$(CONFIG_REGULATOR_WM8400) += wm8400-regulator.o
@@ -99680,10 +98774,8 @@ Index: linux-2.6.28/drivers/regulator/Makefile
+obj-$(CONFIG_REGULATOR_PCF50633) += pcf50633-regulator.o
ccflags-$(CONFIG_REGULATOR_DEBUG) += -DDEBUG
-Index: linux-2.6.28/drivers/regulator/pcf50633-regulator.c
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/drivers/regulator/pcf50633-regulator.c 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/drivers/regulator/pcf50633-regulator.c
@@ -0,0 +1,330 @@
+/* Philips PCF50633 PMIC Driver
+ *
@@ -100015,10 +99107,8 @@ Index: linux-2.6.28/drivers/regulator/pcf50633-regulator.c
+MODULE_DESCRIPTION("PCF50633 regulator driver");
+MODULE_LICENSE("GPL");
+MODULE_ALIAS("platform:pcf50633-regulator");
-Index: linux-2.6.28/drivers/rtc/Kconfig
-===================================================================
---- linux-2.6.28.orig/drivers/rtc/Kconfig 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.28/drivers/rtc/Kconfig 2009-01-02 00:01:56.000000000 +0100
+--- a/drivers/rtc/Kconfig
++++ b/drivers/rtc/Kconfig
@@ -219,6 +219,18 @@ config RTC_DRV_PCF8583
This driver can also be built as a module. If so, the module
will be called rtc-pcf8583.
@@ -100038,10 +99128,8 @@ Index: linux-2.6.28/drivers/rtc/Kconfig
config RTC_DRV_M41T80
tristate "ST M41T65/M41T80/81/82/83/84/85/87"
help
-Index: linux-2.6.28/drivers/rtc/Makefile
-===================================================================
---- linux-2.6.28.orig/drivers/rtc/Makefile 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.28/drivers/rtc/Makefile 2009-01-02 00:01:56.000000000 +0100
+--- a/drivers/rtc/Makefile
++++ b/drivers/rtc/Makefile
@@ -50,6 +50,8 @@ obj-$(CONFIG_RTC_DRV_MAX6902) += rtc-max
obj-$(CONFIG_RTC_DRV_OMAP) += rtc-omap.o
obj-$(CONFIG_RTC_DRV_PCF8563) += rtc-pcf8563.o
@@ -100051,10 +99139,8 @@ Index: linux-2.6.28/drivers/rtc/Makefile
obj-$(CONFIG_RTC_DRV_PL030) += rtc-pl030.o
obj-$(CONFIG_RTC_DRV_PL031) += rtc-pl031.o
obj-$(CONFIG_RTC_DRV_PARISC) += rtc-parisc.o
-Index: linux-2.6.28/drivers/rtc/rtc-pcf50606.c
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/drivers/rtc/rtc-pcf50606.c 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/drivers/rtc/rtc-pcf50606.c
@@ -0,0 +1,300 @@
+/* Philips PCF50606 RTC Driver
+ *
@@ -100356,10 +99442,8 @@ Index: linux-2.6.28/drivers/rtc/rtc-pcf50606.c
+MODULE_AUTHOR("Balaji Rao <balajirrao@openmoko.org>");
+MODULE_LICENSE("GPL");
+
-Index: linux-2.6.28/drivers/rtc/rtc-pcf50633.c
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/drivers/rtc/rtc-pcf50633.c 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/drivers/rtc/rtc-pcf50633.c
@@ -0,0 +1,300 @@
+/* Philips PCF50633 RTC Driver
+ *
@@ -100661,10 +99745,8 @@ Index: linux-2.6.28/drivers/rtc/rtc-pcf50633.c
+MODULE_AUTHOR("Balaji Rao <balajirrao@openmoko.org>");
+MODULE_LICENSE("GPL");
+
-Index: linux-2.6.28/drivers/rtc/rtc-s3c.c
-===================================================================
---- linux-2.6.28.orig/drivers/rtc/rtc-s3c.c 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.28/drivers/rtc/rtc-s3c.c 2009-01-02 00:01:56.000000000 +0100
+--- a/drivers/rtc/rtc-s3c.c
++++ b/drivers/rtc/rtc-s3c.c
@@ -26,7 +26,7 @@
#include <asm/uaccess.h>
#include <asm/io.h>
@@ -100674,10 +99756,8 @@ Index: linux-2.6.28/drivers/rtc/rtc-s3c.c
/* I have yet to find an S3C implementation with more than one
* of these rtc blocks in */
-Index: linux-2.6.28/drivers/serial/Kconfig
-===================================================================
---- linux-2.6.28.orig/drivers/serial/Kconfig 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.28/drivers/serial/Kconfig 2009-01-02 00:01:56.000000000 +0100
+--- a/drivers/serial/Kconfig
++++ b/drivers/serial/Kconfig
@@ -447,7 +447,7 @@ config SERIAL_CLPS711X_CONSOLE
config SERIAL_SAMSUNG
@@ -100726,10 +99806,8 @@ Index: linux-2.6.28/drivers/serial/Kconfig
config SERIAL_DZ
bool "DECstation DZ serial driver"
-Index: linux-2.6.28/drivers/serial/Makefile
-===================================================================
---- linux-2.6.28.orig/drivers/serial/Makefile 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.28/drivers/serial/Makefile 2009-01-02 00:01:56.000000000 +0100
+--- a/drivers/serial/Makefile
++++ b/drivers/serial/Makefile
@@ -41,6 +41,8 @@ obj-$(CONFIG_SERIAL_S3C2400) += s3c2400.
obj-$(CONFIG_SERIAL_S3C2410) += s3c2410.o
obj-$(CONFIG_SERIAL_S3C2412) += s3c2412.o
@@ -100739,10 +99817,8 @@ Index: linux-2.6.28/drivers/serial/Makefile
obj-$(CONFIG_SERIAL_IP22_ZILOG) += ip22zilog.o
obj-$(CONFIG_SERIAL_MUX) += mux.o
obj-$(CONFIG_SERIAL_68328) += 68328serial.o
-Index: linux-2.6.28/drivers/serial/s3c2410.c
-===================================================================
---- linux-2.6.28.orig/drivers/serial/s3c2410.c 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.28/drivers/serial/s3c2410.c 2009-01-02 00:01:56.000000000 +0100
+--- a/drivers/serial/s3c2410.c
++++ b/drivers/serial/s3c2410.c
@@ -19,6 +19,7 @@
#include <linux/serial.h>
@@ -100751,10 +99827,8 @@ Index: linux-2.6.28/drivers/serial/s3c2410.c
#include <mach/hardware.h>
#include <plat/regs-serial.h>
-Index: linux-2.6.28/drivers/serial/s3c24a0.c
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/drivers/serial/s3c24a0.c 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/drivers/serial/s3c24a0.c
@@ -0,0 +1,118 @@
+/* linux/drivers/serial/s3c24a0.c
+ *
@@ -100874,10 +99948,8 @@ Index: linux-2.6.28/drivers/serial/s3c24a0.c
+module_init(s3c24a0_serial_init);
+module_exit(s3c24a0_serial_exit);
+
-Index: linux-2.6.28/drivers/serial/s3c6400.c
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/drivers/serial/s3c6400.c 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/drivers/serial/s3c6400.c
@@ -0,0 +1,152 @@
+/* linux/drivers/serial/s3c6400.c
+ *
@@ -101031,10 +100103,8 @@ Index: linux-2.6.28/drivers/serial/s3c6400.c
+MODULE_AUTHOR("Ben Dooks <ben@simtec.co.uk>");
+MODULE_LICENSE("GPL v2");
+MODULE_ALIAS("platform:s3c6400-uart");
-Index: linux-2.6.28/drivers/serial/samsung.c
-===================================================================
---- linux-2.6.28.orig/drivers/serial/samsung.c 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.28/drivers/serial/samsung.c 2009-01-02 00:01:56.000000000 +0100
+--- a/drivers/serial/samsung.c
++++ b/drivers/serial/samsung.c
@@ -42,13 +42,18 @@
#include <linux/serial.h>
#include <linux/delay.h>
@@ -101686,10 +100756,8 @@ Index: linux-2.6.28/drivers/serial/samsung.c
co->index = 0;
port = &s3c24xx_serial_ports[co->index].port;
-Index: linux-2.6.28/drivers/serial/samsung.h
-===================================================================
---- linux-2.6.28.orig/drivers/serial/samsung.h 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.28/drivers/serial/samsung.h 2009-01-02 00:01:56.000000000 +0100
+--- a/drivers/serial/samsung.h
++++ b/drivers/serial/samsung.h
@@ -10,6 +10,8 @@
* published by the Free Software Foundation.
*/
@@ -101734,10 +100802,8 @@ Index: linux-2.6.28/drivers/serial/samsung.h
};
/* conversion functions */
-Index: linux-2.6.28/drivers/spi/spi_s3c24xx.c
-===================================================================
---- linux-2.6.28.orig/drivers/spi/spi_s3c24xx.c 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.28/drivers/spi/spi_s3c24xx.c 2009-01-02 00:01:56.000000000 +0100
+--- a/drivers/spi/spi_s3c24xx.c
++++ b/drivers/spi/spi_s3c24xx.c
@@ -28,7 +28,7 @@
#include <mach/hardware.h>
@@ -101747,10 +100813,8 @@ Index: linux-2.6.28/drivers/spi/spi_s3c24xx.c
#include <mach/spi.h>
struct s3c24xx_spi {
-Index: linux-2.6.28/drivers/spi/spi_s3c24xx_gpio.c
-===================================================================
---- linux-2.6.28.orig/drivers/spi/spi_s3c24xx_gpio.c 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.28/drivers/spi/spi_s3c24xx_gpio.c 2009-01-02 00:01:56.000000000 +0100
+--- a/drivers/spi/spi_s3c24xx_gpio.c
++++ b/drivers/spi/spi_s3c24xx_gpio.c
@@ -91,7 +91,7 @@ static void s3c2410_spigpio_chipselect(s
struct s3c2410_spigpio *sg = spidev_to_sg(dev);
@@ -101804,10 +100868,8 @@ Index: linux-2.6.28/drivers/spi/spi_s3c24xx_gpio.c
return 0;
err_no_bitbang:
-Index: linux-2.6.28/drivers/usb/gadget/composite.c
-===================================================================
---- linux-2.6.28.orig/drivers/usb/gadget/composite.c 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.28/drivers/usb/gadget/composite.c 2009-01-02 00:01:56.000000000 +0100
+--- a/drivers/usb/gadget/composite.c
++++ b/drivers/usb/gadget/composite.c
@@ -1045,7 +1045,11 @@ composite_resume(struct usb_gadget *gadg
/*-------------------------------------------------------------------------*/
@@ -101820,10 +100882,8 @@ Index: linux-2.6.28/drivers/usb/gadget/composite.c
.bind = composite_bind,
.unbind = __exit_p(composite_unbind),
-Index: linux-2.6.28/drivers/usb/gadget/ether.c
-===================================================================
---- linux-2.6.28.orig/drivers/usb/gadget/ether.c 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.28/drivers/usb/gadget/ether.c 2009-01-02 00:01:56.000000000 +0100
+--- a/drivers/usb/gadget/ether.c
++++ b/drivers/usb/gadget/ether.c
@@ -122,11 +122,16 @@ static inline bool has_rndis(void)
* Instead: allocate your own, using normal USB-IF procedures.
*/
@@ -101852,10 +100912,8 @@ Index: linux-2.6.28/drivers/usb/gadget/ether.c
/*-------------------------------------------------------------------------*/
-Index: linux-2.6.28/drivers/usb/gadget/s3c2410_udc.c
-===================================================================
---- linux-2.6.28.orig/drivers/usb/gadget/s3c2410_udc.c 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.28/drivers/usb/gadget/s3c2410_udc.c 2009-01-02 00:01:56.000000000 +0100
+--- a/drivers/usb/gadget/s3c2410_udc.c
++++ b/drivers/usb/gadget/s3c2410_udc.c
@@ -53,8 +53,8 @@
#include <mach/hardware.h>
#include <mach/regs-gpio.h>
@@ -101932,10 +100990,8 @@ Index: linux-2.6.28/drivers/usb/gadget/s3c2410_udc.c
retval = platform_driver_register(&udc_driver_2410);
if (retval)
-Index: linux-2.6.28/drivers/usb/host/ohci-s3c2410.c
-===================================================================
---- linux-2.6.28.orig/drivers/usb/host/ohci-s3c2410.c 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.28/drivers/usb/host/ohci-s3c2410.c 2009-01-02 00:01:56.000000000 +0100
+--- a/drivers/usb/host/ohci-s3c2410.c
++++ b/drivers/usb/host/ohci-s3c2410.c
@@ -24,6 +24,7 @@
#include <mach/hardware.h>
@@ -102011,10 +101067,8 @@ Index: linux-2.6.28/drivers/usb/host/ohci-s3c2410.c
err_ioremap:
s3c2410_stop_hc(dev);
iounmap(hcd->regs);
-Index: linux-2.6.28/drivers/video/backlight/gta01_bl.c
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/drivers/video/backlight/gta01_bl.c 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/drivers/video/backlight/gta01_bl.c
@@ -0,0 +1,269 @@
+/*
+ * Backlight Driver for FIC GTA01 (Neo1973) GSM Phone
@@ -102285,10 +101339,8 @@ Index: linux-2.6.28/drivers/video/backlight/gta01_bl.c
+MODULE_DESCRIPTION("FIC GTA01 (Neo1973) Backlight Driver");
+MODULE_AUTHOR("Harald Welte <laforge@openmoko.org>");
+MODULE_LICENSE("GPL");
-Index: linux-2.6.28/drivers/video/backlight/Kconfig
-===================================================================
---- linux-2.6.28.orig/drivers/video/backlight/Kconfig 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.28/drivers/video/backlight/Kconfig 2009-01-02 00:01:56.000000000 +0100
+--- a/drivers/video/backlight/Kconfig
++++ b/drivers/video/backlight/Kconfig
@@ -152,6 +152,13 @@ config BACKLIGHT_OMAP1
the PWL module of OMAP1 processors. Say Y if your board
uses this hardware.
@@ -102303,10 +101355,8 @@ Index: linux-2.6.28/drivers/video/backlight/Kconfig
config BACKLIGHT_HP680
tristate "HP Jornada 680 Backlight Driver"
depends on BACKLIGHT_CLASS_DEVICE && SH_HP6XX
-Index: linux-2.6.28/drivers/video/backlight/Makefile
-===================================================================
---- linux-2.6.28.orig/drivers/video/backlight/Makefile 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.28/drivers/video/backlight/Makefile 2009-01-02 00:01:56.000000000 +0100
+--- a/drivers/video/backlight/Makefile
++++ b/drivers/video/backlight/Makefile
@@ -12,6 +12,7 @@ obj-$(CONFIG_LCD_TOSA) += tosa_lcd.o
obj-$(CONFIG_BACKLIGHT_CLASS_DEVICE) += backlight.o
obj-$(CONFIG_BACKLIGHT_ATMEL_PWM) += atmel-pwm-bl.o
@@ -102315,10 +101365,8 @@ Index: linux-2.6.28/drivers/video/backlight/Makefile
obj-$(CONFIG_BACKLIGHT_HP680) += hp680_bl.o
obj-$(CONFIG_BACKLIGHT_LOCOMO) += locomolcd.o
obj-$(CONFIG_BACKLIGHT_OMAP1) += omap1_bl.o
-Index: linux-2.6.28/drivers/video/console/fbcon.c
-===================================================================
---- linux-2.6.28.orig/drivers/video/console/fbcon.c 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.28/drivers/video/console/fbcon.c 2009-01-02 00:01:56.000000000 +0100
+--- a/drivers/video/console/fbcon.c
++++ b/drivers/video/console/fbcon.c
@@ -401,6 +401,9 @@ static void fb_flashcursor(struct work_s
int c;
int mode;
@@ -102349,10 +101397,8 @@ Index: linux-2.6.28/drivers/video/console/fbcon.c
/*
* ignore all events except driver registration and deregistration
* if fbcon is not active
-Index: linux-2.6.28/drivers/video/display/jbt6k74.c
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/drivers/video/display/jbt6k74.c 2009-01-02 00:01:56.000000000 +0100
+--- /dev/null
++++ b/drivers/video/display/jbt6k74.c
@@ -0,0 +1,809 @@
+/* Linux kernel driver for the tpo JBT6K74-AS LCM ASIC
+ *
@@ -103163,10 +102209,8 @@ Index: linux-2.6.28/drivers/video/display/jbt6k74.c
+
+module_init(jbt_init);
+module_exit(jbt_exit);
-Index: linux-2.6.28/drivers/video/display/Kconfig
-===================================================================
---- linux-2.6.28.orig/drivers/video/display/Kconfig 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.28/drivers/video/display/Kconfig 2009-01-02 00:01:56.000000000 +0100
+--- a/drivers/video/display/Kconfig
++++ b/drivers/video/display/Kconfig
@@ -21,4 +21,15 @@ config DISPLAY_SUPPORT
comment "Display hardware drivers"
depends on DISPLAY_SUPPORT
@@ -103183,20 +102227,16 @@ Index: linux-2.6.28/drivers/video/display/Kconfig
+ controls power management, display timing and gamma calibration.
+
endmenu
-Index: linux-2.6.28/drivers/video/display/Makefile
-===================================================================
---- linux-2.6.28.orig/drivers/video/display/Makefile 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.28/drivers/video/display/Makefile 2009-01-02 00:01:56.000000000 +0100
+--- a/drivers/video/display/Makefile
++++ b/drivers/video/display/Makefile
@@ -3,4 +3,5 @@
display-objs := display-sysfs.o
obj-$(CONFIG_DISPLAY_SUPPORT) += display.o
+obj-$(CONFIG_DISPLAY_JBT6K74) += jbt6k74.o
-Index: linux-2.6.28/drivers/video/Kconfig
-===================================================================
---- linux-2.6.28.orig/drivers/video/Kconfig 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.28/drivers/video/Kconfig 2009-01-02 00:01:56.000000000 +0100
+--- a/drivers/video/Kconfig
++++ b/drivers/video/Kconfig
@@ -1918,6 +1918,30 @@ config FB_TMIO_ACCELL
depends on FB_TMIO
default y
@@ -103228,10 +102268,8 @@ Index: linux-2.6.28/drivers/video/Kconfig
config FB_S3C2410
tristate "S3C2410 LCD framebuffer support"
depends on FB && ARCH_S3C2410
-Index: linux-2.6.28/drivers/video/logo/Kconfig
-===================================================================
---- linux-2.6.28.orig/drivers/video/logo/Kconfig 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.28/drivers/video/logo/Kconfig 2009-01-02 00:01:56.000000000 +0100
+--- a/drivers/video/logo/Kconfig
++++ b/drivers/video/logo/Kconfig
@@ -77,6 +77,11 @@ config LOGO_SUPERH_CLUT224
depends on SUPERH
default y
@@ -103244,10 +102282,8 @@ Index: linux-2.6.28/drivers/video/logo/Kconfig
config LOGO_M32R_CLUT224
bool "224-color M32R Linux logo"
depends on M32R
-Index: linux-2.6.28/drivers/video/logo/logo.c
-===================================================================
---- linux-2.6.28.orig/drivers/video/logo/logo.c 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.28/drivers/video/logo/logo.c 2009-01-02 00:01:56.000000000 +0100
+--- a/drivers/video/logo/logo.c
++++ b/drivers/video/logo/logo.c
@@ -35,6 +35,7 @@ extern const struct linux_logo logo_supe
extern const struct linux_logo logo_superh_vga16;
extern const struct linux_logo logo_superh_clut224;
@@ -103267,10 +102303,8 @@ Index: linux-2.6.28/drivers/video/logo/logo.c
}
return logo;
}
-Index: linux-2.6.28/drivers/video/logo/logo_openmoko_clut224.ppm
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/drivers/video/logo/logo_openmoko_clut224.ppm 2009-01-02 00:01:57.000000000 +0100
+--- /dev/null
++++ b/drivers/video/logo/logo_openmoko_clut224.ppm
@@ -0,0 +1,40003 @@
+P3
+480 500
@@ -143275,10 +142309,8 @@ Index: linux-2.6.28/drivers/video/logo/logo_openmoko_clut224.ppm
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
-Index: linux-2.6.28/drivers/video/logo/Makefile
-===================================================================
---- linux-2.6.28.orig/drivers/video/logo/Makefile 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.28/drivers/video/logo/Makefile 2009-01-02 00:01:57.000000000 +0100
+--- a/drivers/video/logo/Makefile
++++ b/drivers/video/logo/Makefile
@@ -15,6 +15,7 @@ obj-$(CONFIG_LOGO_SUPERH_MONO) += logo_
obj-$(CONFIG_LOGO_SUPERH_VGA16) += logo_superh_vga16.o
obj-$(CONFIG_LOGO_SUPERH_CLUT224) += logo_superh_clut224.o
@@ -143287,10 +142319,8 @@ Index: linux-2.6.28/drivers/video/logo/Makefile
obj-$(CONFIG_SPU_BASE) += logo_spe_clut224.o
-Index: linux-2.6.28/drivers/video/Makefile
-===================================================================
---- linux-2.6.28.orig/drivers/video/Makefile 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.28/drivers/video/Makefile 2009-01-02 00:01:57.000000000 +0100
+--- a/drivers/video/Makefile
++++ b/drivers/video/Makefile
@@ -109,6 +109,7 @@ obj-$(CONFIG_FB_METRONOME) += met
obj-$(CONFIG_FB_S1D13XXX) += s1d13xxxfb.o
obj-$(CONFIG_FB_SH7760) += sh7760fb.o
@@ -143299,10 +142329,8 @@ Index: linux-2.6.28/drivers/video/Makefile
obj-$(CONFIG_FB_S3C2410) += s3c2410fb.o
obj-$(CONFIG_FB_FSL_DIU) += fsl-diu-fb.o
obj-$(CONFIG_FB_COBALT) += cobalt_lcdfb.o
-Index: linux-2.6.28/drivers/video/s3c2410fb.c
-===================================================================
---- linux-2.6.28.orig/drivers/video/s3c2410fb.c 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.28/drivers/video/s3c2410fb.c 2009-01-02 00:01:57.000000000 +0100
+--- a/drivers/video/s3c2410fb.c
++++ b/drivers/video/s3c2410fb.c
@@ -1017,6 +1017,8 @@ static int s3c2410fb_resume(struct platf
s3c2410fb_init_registers(fbinfo);
@@ -143312,10 +142340,8 @@ Index: linux-2.6.28/drivers/video/s3c2410fb.c
return 0;
}
-Index: linux-2.6.28/drivers/video/s3c-fb.c
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/drivers/video/s3c-fb.c 2009-01-02 00:01:57.000000000 +0100
+--- /dev/null
++++ b/drivers/video/s3c-fb.c
@@ -0,0 +1,1036 @@
+/* linux/drivers/video/s3c-fb.c
+ *
@@ -144353,10 +143379,8 @@ Index: linux-2.6.28/drivers/video/s3c-fb.c
+MODULE_DESCRIPTION("Samsung S3C SoC Framebuffer driver");
+MODULE_LICENSE("GPL");
+MODULE_ALIAS("platform:s3c-fb");
-Index: linux-2.6.28/drivers/watchdog/Kconfig
-===================================================================
---- linux-2.6.28.orig/drivers/watchdog/Kconfig 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.28/drivers/watchdog/Kconfig 2009-01-02 00:01:57.000000000 +0100
+--- a/drivers/watchdog/Kconfig
++++ b/drivers/watchdog/Kconfig
@@ -233,6 +233,12 @@ config ORION5X_WATCHDOG
To compile this driver as a module, choose M here: the
module will be called orion5x_wdt.
@@ -144379,10 +143403,8 @@ Index: linux-2.6.28/drivers/watchdog/Kconfig
To compile this driver as a module, choose M here. The module
will be called wdrtas.
-Index: linux-2.6.28/drivers/watchdog/Makefile
-===================================================================
---- linux-2.6.28.orig/drivers/watchdog/Makefile 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.28/drivers/watchdog/Makefile 2009-01-02 00:01:57.000000000 +0100
+--- a/drivers/watchdog/Makefile
++++ b/drivers/watchdog/Makefile
@@ -41,6 +41,7 @@ obj-$(CONFIG_PNX4008_WATCHDOG) += pnx400
obj-$(CONFIG_IOP_WATCHDOG) += iop_wdt.o
obj-$(CONFIG_DAVINCI_WATCHDOG) += davinci_wdt.o
@@ -144391,10 +143413,8 @@ Index: linux-2.6.28/drivers/watchdog/Makefile
# ARM26 Architecture
-Index: linux-2.6.28/drivers/watchdog/pcf50606_wdt.c
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/drivers/watchdog/pcf50606_wdt.c 2009-01-02 00:01:57.000000000 +0100
+--- /dev/null
++++ b/drivers/watchdog/pcf50606_wdt.c
@@ -0,0 +1,213 @@
+/* Philips PCF50606 Watchdog Timer Driver
+ *
@@ -144609,10 +143629,8 @@ Index: linux-2.6.28/drivers/watchdog/pcf50606_wdt.c
+MODULE_LICENSE("GPL");
+MODULE_ALIAS("platform:pcf50606-wdt");
+
-Index: linux-2.6.28/drivers/watchdog/s3c2410_wdt.c
-===================================================================
---- linux-2.6.28.orig/drivers/watchdog/s3c2410_wdt.c 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.28/drivers/watchdog/s3c2410_wdt.c 2009-01-02 00:01:57.000000000 +0100
+--- a/drivers/watchdog/s3c2410_wdt.c
++++ b/drivers/watchdog/s3c2410_wdt.c
@@ -42,7 +42,7 @@
#undef S3C_VA_WATCHDOG
#define S3C_VA_WATCHDOG (0)
@@ -144622,10 +143640,8 @@ Index: linux-2.6.28/drivers/watchdog/s3c2410_wdt.c
#define PFX "s3c2410-wdt: "
-Index: linux-2.6.28/fs/jffs2/background.c
-===================================================================
---- linux-2.6.28.orig/fs/jffs2/background.c 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.28/fs/jffs2/background.c 2009-01-02 00:01:57.000000000 +0100
+--- a/fs/jffs2/background.c
++++ b/fs/jffs2/background.c
@@ -95,13 +95,17 @@ static int jffs2_garbage_collect_thread(
spin_unlock(&c->erase_completion_lock);
@@ -144651,10 +143667,8 @@ Index: linux-2.6.28/fs/jffs2/background.c
/* Put_super will send a SIGKILL and then wait on the sem.
*/
-Index: linux-2.6.28/include/asm-arm/plat-s3c/iic.h
-===================================================================
---- linux-2.6.28.orig/include/asm-arm/plat-s3c/iic.h 2008-12-25 00:26:37.000000000 +0100
-+++ /dev/null 1970-01-01 00:00:00.000000000 +0000
+--- a/include/asm-arm/plat-s3c/iic.h
++++ /dev/null
@@ -1,33 +0,0 @@
-/* arch/arm/mach-s3c2410/include/mach/iic.h
- *
@@ -144689,10 +143703,8 @@ Index: linux-2.6.28/include/asm-arm/plat-s3c/iic.h
-};
-
-#endif /* __ASM_ARCH_IIC_H */
-Index: linux-2.6.28/include/asm-arm/plat-s3c/nand.h
-===================================================================
---- linux-2.6.28.orig/include/asm-arm/plat-s3c/nand.h 2008-12-25 00:26:37.000000000 +0100
-+++ /dev/null 1970-01-01 00:00:00.000000000 +0000
+--- a/include/asm-arm/plat-s3c/nand.h
++++ /dev/null
@@ -1,50 +0,0 @@
-/* arch/arm/mach-s3c2410/include/mach/nand.h
- *
@@ -144744,10 +143756,8 @@ Index: linux-2.6.28/include/asm-arm/plat-s3c/nand.h
- int chip);
-};
-
-Index: linux-2.6.28/include/asm-arm/plat-s3c/regs-ac97.h
-===================================================================
---- linux-2.6.28.orig/include/asm-arm/plat-s3c/regs-ac97.h 2008-12-25 00:26:37.000000000 +0100
-+++ /dev/null 1970-01-01 00:00:00.000000000 +0000
+--- a/include/asm-arm/plat-s3c/regs-ac97.h
++++ /dev/null
@@ -1,67 +0,0 @@
-/* arch/arm/mach-s3c2410/include/mach/regs-ac97.h
- *
@@ -144816,10 +143826,8 @@ Index: linux-2.6.28/include/asm-arm/plat-s3c/regs-ac97.h
-#define S3C_AC97_MIC_DATA (0x1C)
-
-#endif /* __ASM_ARCH_REGS_AC97_H */
-Index: linux-2.6.28/include/asm-arm/plat-s3c/regs-iic.h
-===================================================================
---- linux-2.6.28.orig/include/asm-arm/plat-s3c/regs-iic.h 2008-12-25 00:26:37.000000000 +0100
-+++ /dev/null 1970-01-01 00:00:00.000000000 +0000
+--- a/include/asm-arm/plat-s3c/regs-iic.h
++++ /dev/null
@@ -1,56 +0,0 @@
-/* arch/arm/mach-s3c2410/include/mach/regs-iic.h
- *
@@ -144877,10 +143885,8 @@ Index: linux-2.6.28/include/asm-arm/plat-s3c/regs-iic.h
-#define S3C2410_IICLC_FILTER_ON (1<<2)
-
-#endif /* __ASM_ARCH_REGS_IIC_H */
-Index: linux-2.6.28/include/asm-arm/plat-s3c/regs-nand.h
-===================================================================
---- linux-2.6.28.orig/include/asm-arm/plat-s3c/regs-nand.h 2008-12-25 00:26:37.000000000 +0100
-+++ /dev/null 1970-01-01 00:00:00.000000000 +0000
+--- a/include/asm-arm/plat-s3c/regs-nand.h
++++ /dev/null
@@ -1,123 +0,0 @@
-/* arch/arm/mach-s3c2410/include/mach/regs-nand.h
- *
@@ -145005,10 +144011,8 @@ Index: linux-2.6.28/include/asm-arm/plat-s3c/regs-nand.h
-
-#endif /* __ASM_ARM_REGS_NAND */
-
-Index: linux-2.6.28/include/asm-arm/plat-s3c/regs-rtc.h
-===================================================================
---- linux-2.6.28.orig/include/asm-arm/plat-s3c/regs-rtc.h 2008-12-25 00:26:37.000000000 +0100
-+++ /dev/null 1970-01-01 00:00:00.000000000 +0000
+--- a/include/asm-arm/plat-s3c/regs-rtc.h
++++ /dev/null
@@ -1,61 +0,0 @@
-/* arch/arm/mach-s3c2410/include/mach/regs-rtc.h
- *
@@ -145071,10 +144075,8 @@ Index: linux-2.6.28/include/asm-arm/plat-s3c/regs-rtc.h
-
-
-#endif /* __ASM_ARCH_REGS_RTC_H */
-Index: linux-2.6.28/include/asm-arm/plat-s3c/regs-watchdog.h
-===================================================================
---- linux-2.6.28.orig/include/asm-arm/plat-s3c/regs-watchdog.h 2008-12-25 00:26:37.000000000 +0100
-+++ /dev/null 1970-01-01 00:00:00.000000000 +0000
+--- a/include/asm-arm/plat-s3c/regs-watchdog.h
++++ /dev/null
@@ -1,41 +0,0 @@
-/* arch/arm/mach-s3c2410/include/mach/regs-watchdog.h
- *
@@ -145117,10 +144119,8 @@ Index: linux-2.6.28/include/asm-arm/plat-s3c/regs-watchdog.h
-#endif /* __ASM_ARCH_REGS_WATCHDOG_H */
-
-
-Index: linux-2.6.28/include/asm-arm/plat-s3c24xx/mci.h
-===================================================================
---- linux-2.6.28.orig/include/asm-arm/plat-s3c24xx/mci.h 2008-12-25 00:26:37.000000000 +0100
-+++ /dev/null 1970-01-01 00:00:00.000000000 +0000
+--- a/include/asm-arm/plat-s3c24xx/mci.h
++++ /dev/null
@@ -1,15 +0,0 @@
-#ifndef _ARCH_MCI_H
-#define _ARCH_MCI_H
@@ -145137,10 +144137,8 @@ Index: linux-2.6.28/include/asm-arm/plat-s3c24xx/mci.h
-};
-
-#endif /* _ARCH_NCI_H */
-Index: linux-2.6.28/include/asm-arm/plat-s3c24xx/neo1973.h
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/include/asm-arm/plat-s3c24xx/neo1973.h 2009-01-02 00:01:57.000000000 +0100
+--- /dev/null
++++ b/include/asm-arm/plat-s3c24xx/neo1973.h
@@ -0,0 +1,33 @@
+/*
+ * include/asm-arm/plat-s3c24xx/neo1973.h
@@ -145175,10 +144173,8 @@ Index: linux-2.6.28/include/asm-arm/plat-s3c24xx/neo1973.h
+void neo1973_gpb_setpin(unsigned int pin, unsigned to);
+
+#endif
-Index: linux-2.6.28/include/asm-arm/plat-s3c24xx/regs-spi.h
-===================================================================
---- linux-2.6.28.orig/include/asm-arm/plat-s3c24xx/regs-spi.h 2008-12-25 00:26:37.000000000 +0100
-+++ /dev/null 1970-01-01 00:00:00.000000000 +0000
+--- a/include/asm-arm/plat-s3c24xx/regs-spi.h
++++ /dev/null
@@ -1,82 +0,0 @@
-/* arch/arm/mach-s3c2410/include/mach/regs-spi.h
- *
@@ -145262,10 +144258,8 @@ Index: linux-2.6.28/include/asm-arm/plat-s3c24xx/regs-spi.h
-
-
-#endif /* __ASM_ARCH_REGS_SPI_H */
-Index: linux-2.6.28/include/asm-arm/plat-s3c24xx/regs-udc.h
-===================================================================
---- linux-2.6.28.orig/include/asm-arm/plat-s3c24xx/regs-udc.h 2008-12-25 00:26:37.000000000 +0100
-+++ /dev/null 1970-01-01 00:00:00.000000000 +0000
+--- a/include/asm-arm/plat-s3c24xx/regs-udc.h
++++ /dev/null
@@ -1,153 +0,0 @@
-/* arch/arm/mach-s3c2410/include/mach/regs-udc.h
- *
@@ -145420,10 +144414,8 @@ Index: linux-2.6.28/include/asm-arm/plat-s3c24xx/regs-udc.h
-
-
-#endif
-Index: linux-2.6.28/include/asm-arm/plat-s3c24xx/udc.h
-===================================================================
---- linux-2.6.28.orig/include/asm-arm/plat-s3c24xx/udc.h 2008-12-25 00:26:37.000000000 +0100
-+++ /dev/null 1970-01-01 00:00:00.000000000 +0000
+--- a/include/asm-arm/plat-s3c24xx/udc.h
++++ /dev/null
@@ -1,36 +0,0 @@
-/* arch/arm/mach-s3c2410/include/mach/udc.h
- *
@@ -145461,10 +144453,8 @@ Index: linux-2.6.28/include/asm-arm/plat-s3c24xx/udc.h
-extern void __init s3c24xx_udc_set_platdata(struct s3c2410_udc_mach_info *);
-
-#endif /* __ASM_ARM_ARCH_UDC_H */
-Index: linux-2.6.28/include/linux/android_aid.h
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/include/linux/android_aid.h 2009-01-02 00:01:57.000000000 +0100
+--- /dev/null
++++ b/include/linux/android_aid.h
@@ -0,0 +1,25 @@
+/* include/linux/android_aid.h
+ *
@@ -145491,10 +144481,8 @@ Index: linux-2.6.28/include/linux/android_aid.h
+#define AID_NET_RAW 3004
+
+#endif
-Index: linux-2.6.28/include/linux/android_alarm.h
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/include/linux/android_alarm.h 2009-01-02 00:01:57.000000000 +0100
+--- /dev/null
++++ b/include/linux/android_alarm.h
@@ -0,0 +1,59 @@
+/* include/linux/android_alarm.h
+ *
@@ -145555,10 +144543,8 @@ Index: linux-2.6.28/include/linux/android_alarm.h
+#define ANDROID_ALARM_IOCTL_TO_TYPE(cmd) (_IOC_NR(cmd) >> 4)
+
+#endif
-Index: linux-2.6.28/include/linux/android_power.h
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/include/linux/android_power.h 2009-01-02 00:01:57.000000000 +0100
+--- /dev/null
++++ b/include/linux/android_power.h
@@ -0,0 +1,98 @@
+/* include/linux/android_power.h
+ *
@@ -145658,10 +144644,8 @@ Index: linux-2.6.28/include/linux/android_power.h
+
+#endif
+
-Index: linux-2.6.28/include/linux/android_timed_gpio.h
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/include/linux/android_timed_gpio.h 2009-01-02 00:01:57.000000000 +0100
+--- /dev/null
++++ b/include/linux/android_timed_gpio.h
@@ -0,0 +1,31 @@
+/* include/linux/android_timed_gpio.h
+ *
@@ -145694,10 +144678,8 @@ Index: linux-2.6.28/include/linux/android_timed_gpio.h
+};
+
+#endif
-Index: linux-2.6.28/include/linux/ashmem.h
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/include/linux/ashmem.h 2009-01-02 00:01:57.000000000 +0100
+--- /dev/null
++++ b/include/linux/ashmem.h
@@ -0,0 +1,48 @@
+/*
+ * include/linux/ashmem.h
@@ -145747,10 +144729,8 @@ Index: linux-2.6.28/include/linux/ashmem.h
+#define ASHMEM_PURGE_ALL_CACHES _IO(__ASHMEMIOC, 10)
+
+#endif /* _LINUX_ASHMEM_H */
-Index: linux-2.6.28/include/linux/binder.h
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/include/linux/binder.h 2009-01-02 00:01:57.000000000 +0100
+--- /dev/null
++++ b/include/linux/binder.h
@@ -0,0 +1,330 @@
+/*
+ * Copyright (C) 2008 Google, Inc.
@@ -146082,10 +145062,8 @@ Index: linux-2.6.28/include/linux/binder.h
+
+#endif /* _LINUX_BINDER_H */
+
-Index: linux-2.6.28/include/linux/bq27000_battery.h
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/include/linux/bq27000_battery.h 2009-01-02 00:01:57.000000000 +0100
+--- /dev/null
++++ b/include/linux/bq27000_battery.h
@@ -0,0 +1,14 @@
+#ifndef __BQ27000_BATTERY_H__
+#define __BQ27000_BATTERY_H__
@@ -146101,10 +145079,8 @@ Index: linux-2.6.28/include/linux/bq27000_battery.h
+};
+
+#endif
-Index: linux-2.6.28/include/linux/device.h
-===================================================================
---- linux-2.6.28.orig/include/linux/device.h 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.28/include/linux/device.h 2009-01-02 00:01:57.000000000 +0100
+--- a/include/linux/device.h
++++ b/include/linux/device.h
@@ -48,6 +48,11 @@ extern int __must_check bus_create_file(
struct bus_attribute *);
extern void bus_remove_file(struct bus_type *, struct bus_attribute *);
@@ -146117,10 +145093,8 @@ Index: linux-2.6.28/include/linux/device.h
struct bus_type {
const char *name;
struct bus_attribute *bus_attrs;
-Index: linux-2.6.28/include/linux/fb.h
-===================================================================
---- linux-2.6.28.orig/include/linux/fb.h 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.28/include/linux/fb.h 2009-01-02 00:01:57.000000000 +0100
+--- a/include/linux/fb.h
++++ b/include/linux/fb.h
@@ -123,6 +123,7 @@ struct dentry;
#define FB_ACCEL_TRIDENT_3DIMAGE 51 /* Trident 3DImage */
#define FB_ACCEL_TRIDENT_BLADE3D 52 /* Trident Blade3D */
@@ -146129,10 +145103,8 @@ Index: linux-2.6.28/include/linux/fb.h
#define FB_ACCEL_NEOMAGIC_NM2070 90 /* NeoMagic NM2070 */
#define FB_ACCEL_NEOMAGIC_NM2090 91 /* NeoMagic NM2090 */
#define FB_ACCEL_NEOMAGIC_NM2093 92 /* NeoMagic NM2093 */
-Index: linux-2.6.28/include/linux/glamofb.h
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/include/linux/glamofb.h 2009-01-02 00:01:57.000000000 +0100
+--- /dev/null
++++ b/include/linux/glamofb.h
@@ -0,0 +1,45 @@
+#ifndef _LINUX_GLAMOFB_H
+#define _LINUX_GLAMOFB_H
@@ -146179,10 +145151,8 @@ Index: linux-2.6.28/include/linux/glamofb.h
+void glamo_lcm_reset(int level);
+
+#endif
-Index: linux-2.6.28/include/linux/glamo-gpio.h
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/include/linux/glamo-gpio.h 2009-01-02 00:01:57.000000000 +0100
+--- /dev/null
++++ b/include/linux/glamo-gpio.h
@@ -0,0 +1,99 @@
+#ifndef __GLAMO_GPIO_H
+#define __GLAMO_GPIO_H
@@ -146283,10 +145253,8 @@ Index: linux-2.6.28/include/linux/glamo-gpio.h
+
+
+#endif /* _GLAMO_GPIO */
-Index: linux-2.6.28/include/linux/gta02_hdq.h
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/include/linux/gta02_hdq.h 2009-01-02 00:01:57.000000000 +0100
+--- /dev/null
++++ b/include/linux/gta02_hdq.h
@@ -0,0 +1,18 @@
+#ifndef __GTA02HDQ_H__
+#define __GTA02HDQ_H__
@@ -146306,10 +145274,8 @@ Index: linux-2.6.28/include/linux/gta02_hdq.h
+int gta02hdq_initialized(void);
+
+#endif
-Index: linux-2.6.28/include/linux/i2c-id.h
-===================================================================
---- linux-2.6.28.orig/include/linux/i2c-id.h 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.28/include/linux/i2c-id.h 2009-01-02 00:01:57.000000000 +0100
+--- a/include/linux/i2c-id.h
++++ b/include/linux/i2c-id.h
@@ -83,6 +83,9 @@
#define I2C_DRIVERID_CS5345 96 /* cs5345 audio processor */
@@ -146320,10 +145286,8 @@ Index: linux-2.6.28/include/linux/i2c-id.h
/*
* ---- Adapter types ----------------------------------------------------
-Index: linux-2.6.28/include/linux/jbt6k74.h
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/include/linux/jbt6k74.h 2009-01-02 00:01:57.000000000 +0100
+--- /dev/null
++++ b/include/linux/jbt6k74.h
@@ -0,0 +1,14 @@
+#ifndef __JBT6K74_H__
+#define __JBT6K74_H__
@@ -146339,10 +145303,8 @@ Index: linux-2.6.28/include/linux/jbt6k74.h
+};
+
+#endif
-Index: linux-2.6.28/include/linux/kernel.h
-===================================================================
---- linux-2.6.28.orig/include/linux/kernel.h 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.28/include/linux/kernel.h 2009-01-02 00:01:57.000000000 +0100
+--- a/include/linux/kernel.h
++++ b/include/linux/kernel.h
@@ -225,6 +225,8 @@ extern struct ratelimit_state printk_rat
extern int printk_ratelimit(void);
extern bool printk_timed_ratelimit(unsigned long *caller_jiffies,
@@ -146352,10 +145314,8 @@ Index: linux-2.6.28/include/linux/kernel.h
#else
static inline int vprintk(const char *s, va_list args)
__attribute__ ((format (printf, 1, 0)));
-Index: linux-2.6.28/include/linux/kexec.h
-===================================================================
---- linux-2.6.28.orig/include/linux/kexec.h 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.28/include/linux/kexec.h 2009-01-02 00:01:57.000000000 +0100
+--- a/include/linux/kexec.h
++++ b/include/linux/kexec.h
@@ -1,7 +1,6 @@
#ifndef LINUX_KEXEC_H
#define LINUX_KEXEC_H
@@ -146373,10 +145333,8 @@ Index: linux-2.6.28/include/linux/kexec.h
/* Verify architecture specific macros are defined */
#ifndef KEXEC_SOURCE_MEMORY_LIMIT
-Index: linux-2.6.28/include/linux/lis302dl.h
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/include/linux/lis302dl.h 2009-01-02 00:01:57.000000000 +0100
+--- /dev/null
++++ b/include/linux/lis302dl.h
@@ -0,0 +1,154 @@
+#ifndef _LINUX_LIS302DL_H
+#define _LINUX_LIS302DL_H
@@ -146532,10 +145490,8 @@ Index: linux-2.6.28/include/linux/lis302dl.h
+
+#endif /* _LINUX_LIS302DL_H */
+
-Index: linux-2.6.28/include/linux/logger.h
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/include/linux/logger.h 2009-01-02 00:01:57.000000000 +0100
+--- /dev/null
++++ b/include/linux/logger.h
@@ -0,0 +1,48 @@
+/* include/linux/logger.h
+ *
@@ -146585,10 +145541,8 @@ Index: linux-2.6.28/include/linux/logger.h
+#define LOGGER_FLUSH_LOG _IO(__LOGGERIO, 4) /* flush log */
+
+#endif /* _LINUX_LOGGER_H */
-Index: linux-2.6.28/include/linux/mfd/pcf50606/adc.h
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/include/linux/mfd/pcf50606/adc.h 2009-01-02 00:01:57.000000000 +0100
+--- /dev/null
++++ b/include/linux/mfd/pcf50606/adc.h
@@ -0,0 +1,87 @@
+/*
+ * adc.h -- Driver for NXP PCF50606 ADC
@@ -146677,10 +145631,8 @@ Index: linux-2.6.28/include/linux/mfd/pcf50606/adc.h
+pcf50606_adc_sync_read(struct pcf50606 *pcf, int mux, int avg);
+
+#endif /* __LINUX_PCF50606_ADC_H */
-Index: linux-2.6.28/include/linux/mfd/pcf50606/core.h
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/include/linux/mfd/pcf50606/core.h 2009-01-02 00:01:57.000000000 +0100
+--- /dev/null
++++ b/include/linux/mfd/pcf50606/core.h
@@ -0,0 +1,163 @@
+/*
+ * core.h -- Core driver for NXP PCF50606
@@ -146845,10 +145797,8 @@ Index: linux-2.6.28/include/linux/mfd/pcf50606/core.h
+
+#endif
+
-Index: linux-2.6.28/include/linux/mfd/pcf50606/gpo.h
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/include/linux/mfd/pcf50606/gpo.h 2009-01-02 00:01:57.000000000 +0100
+--- /dev/null
++++ b/include/linux/mfd/pcf50606/gpo.h
@@ -0,0 +1,43 @@
+/*
+ * gpo.h -- GPO driver for NXP PCF50606
@@ -146893,10 +145843,8 @@ Index: linux-2.6.28/include/linux/mfd/pcf50606/gpo.h
+#endif /* __LINUX_MFD_PCF50606_GPIO_H */
+
+
-Index: linux-2.6.28/include/linux/mfd/pcf50606/input.h
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/include/linux/mfd/pcf50606/input.h 2009-01-02 00:01:57.000000000 +0100
+--- /dev/null
++++ b/include/linux/mfd/pcf50606/input.h
@@ -0,0 +1,37 @@
+/*
+ * input.h -- Input driver for NXP PCF50606
@@ -146935,10 +145883,8 @@ Index: linux-2.6.28/include/linux/mfd/pcf50606/input.h
+
+#endif
+
-Index: linux-2.6.28/include/linux/mfd/pcf50606/led.h
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/include/linux/mfd/pcf50606/led.h 2009-01-02 00:01:57.000000000 +0100
+--- /dev/null
++++ b/include/linux/mfd/pcf50606/led.h
@@ -0,0 +1,22 @@
+/*
+ * led.h -- LED driver for NXP PCF50606
@@ -146962,10 +145908,8 @@ Index: linux-2.6.28/include/linux/mfd/pcf50606/led.h
+
+#endif
+
-Index: linux-2.6.28/include/linux/mfd/pcf50606/mbc.h
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/include/linux/mfd/pcf50606/mbc.h 2009-01-02 00:01:57.000000000 +0100
+--- /dev/null
++++ b/include/linux/mfd/pcf50606/mbc.h
@@ -0,0 +1,53 @@
+/*
+ * mbc.h -- Driver for NXP PCF50606 Main Battery Charger
@@ -147020,10 +145964,8 @@ Index: linux-2.6.28/include/linux/mfd/pcf50606/mbc.h
+};
+#endif
+
-Index: linux-2.6.28/include/linux/mfd/pcf50606/pmic.h
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/include/linux/mfd/pcf50606/pmic.h 2009-01-02 00:01:57.000000000 +0100
+--- /dev/null
++++ b/include/linux/mfd/pcf50606/pmic.h
@@ -0,0 +1,82 @@
+#ifndef __LINUX_MFD_PCF50606_PMIC_H
+#define __LINUX_MFD_PCF50606_PMIC_H
@@ -147107,10 +146049,8 @@ Index: linux-2.6.28/include/linux/mfd/pcf50606/pmic.h
+};
+#endif
+
-Index: linux-2.6.28/include/linux/mfd/pcf50606/rtc.h
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/include/linux/mfd/pcf50606/rtc.h 2009-01-02 00:01:57.000000000 +0100
+--- /dev/null
++++ b/include/linux/mfd/pcf50606/rtc.h
@@ -0,0 +1,43 @@
+/*
+ * rtc.h -- RTC driver for NXP PCF50606
@@ -147155,10 +146095,8 @@ Index: linux-2.6.28/include/linux/mfd/pcf50606/rtc.h
+
+#endif
+
-Index: linux-2.6.28/include/linux/mfd/pcf50606/wdt.h
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/include/linux/mfd/pcf50606/wdt.h 2009-01-02 00:01:57.000000000 +0100
+--- /dev/null
++++ b/include/linux/mfd/pcf50606/wdt.h
@@ -0,0 +1,32 @@
+/*
+ * wdt.h -- WDT driver for NXP PCF50606
@@ -147192,10 +146130,8 @@ Index: linux-2.6.28/include/linux/mfd/pcf50606/wdt.h
+#endif /* __LINUX_MFD_PCF50606_WDT_H */
+
+
-Index: linux-2.6.28/include/linux/mfd/pcf50633/adc.h
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/include/linux/mfd/pcf50633/adc.h 2009-01-02 00:01:57.000000000 +0100
+--- /dev/null
++++ b/include/linux/mfd/pcf50633/adc.h
@@ -0,0 +1,88 @@
+/*
+ * adc.h -- Driver for NXP PCF50633 ADC
@@ -147285,10 +146221,8 @@ Index: linux-2.6.28/include/linux/mfd/pcf50633/adc.h
+pcf50633_adc_sync_read(struct pcf50633 *pcf, int mux, int avg);
+
+#endif /* __LINUX_PCF50633_ADC_H */
-Index: linux-2.6.28/include/linux/mfd/pcf50633/core.h
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/include/linux/mfd/pcf50633/core.h 2009-01-02 00:01:57.000000000 +0100
+--- /dev/null
++++ b/include/linux/mfd/pcf50633/core.h
@@ -0,0 +1,212 @@
+/*
+ * core.h -- Core driver for NXP PCF50633
@@ -147502,10 +146436,8 @@ Index: linux-2.6.28/include/linux/mfd/pcf50633/core.h
+
+#endif
+
-Index: linux-2.6.28/include/linux/mfd/pcf50633/gpio.h
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/include/linux/mfd/pcf50633/gpio.h 2009-01-02 00:01:57.000000000 +0100
+--- /dev/null
++++ b/include/linux/mfd/pcf50633/gpio.h
@@ -0,0 +1,51 @@
+/*
+ * gpio.h -- GPIO driver for NXP PCF50633
@@ -147558,10 +146490,8 @@ Index: linux-2.6.28/include/linux/mfd/pcf50633/gpio.h
+#endif /* __LINUX_MFD_PCF50633_GPIO_H */
+
+
-Index: linux-2.6.28/include/linux/mfd/pcf50633/input.h
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/include/linux/mfd/pcf50633/input.h 2009-01-02 00:01:57.000000000 +0100
+--- /dev/null
++++ b/include/linux/mfd/pcf50633/input.h
@@ -0,0 +1,29 @@
+/*
+ * input.h -- Input driver for NXP PCF50633
@@ -147592,10 +146522,8 @@ Index: linux-2.6.28/include/linux/mfd/pcf50633/input.h
+
+#endif
+
-Index: linux-2.6.28/include/linux/mfd/pcf50633/led.h
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/include/linux/mfd/pcf50633/led.h 2009-01-02 00:01:57.000000000 +0100
+--- /dev/null
++++ b/include/linux/mfd/pcf50633/led.h
@@ -0,0 +1,24 @@
+/*
+ * led.h -- LED driver for NXP PCF50633
@@ -147621,10 +146549,8 @@ Index: linux-2.6.28/include/linux/mfd/pcf50633/led.h
+
+#endif
+
-Index: linux-2.6.28/include/linux/mfd/pcf50633/mbc.h
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/include/linux/mfd/pcf50633/mbc.h 2009-01-02 00:01:57.000000000 +0100
+--- /dev/null
++++ b/include/linux/mfd/pcf50633/mbc.h
@@ -0,0 +1,140 @@
+/*
+ * mbc.h -- Driver for NXP PCF50633 Main Battery Charger
@@ -147766,10 +146692,8 @@ Index: linux-2.6.28/include/linux/mfd/pcf50633/mbc.h
+};
+#endif
+
-Index: linux-2.6.28/include/linux/mfd/pcf50633/pmic.h
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/include/linux/mfd/pcf50633/pmic.h 2009-01-02 00:01:57.000000000 +0100
+--- /dev/null
++++ b/include/linux/mfd/pcf50633/pmic.h
@@ -0,0 +1,73 @@
+#ifndef __LINUX_MFD_PCF50633_PMIC_H
+#define __LINUX_MFD_PCF50633_PMIC_H
@@ -147844,10 +146768,8 @@ Index: linux-2.6.28/include/linux/mfd/pcf50633/pmic.h
+};
+#endif
+
-Index: linux-2.6.28/include/linux/mfd/pcf50633/rtc.h
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/include/linux/mfd/pcf50633/rtc.h 2009-01-02 00:01:57.000000000 +0100
+--- /dev/null
++++ b/include/linux/mfd/pcf50633/rtc.h
@@ -0,0 +1,43 @@
+/*
+ * rtc.h -- RTC driver for NXP PCF50633
@@ -147892,10 +146814,8 @@ Index: linux-2.6.28/include/linux/mfd/pcf50633/rtc.h
+
+#endif
+
-Index: linux-2.6.28/include/linux/mmc/core.h
-===================================================================
---- linux-2.6.28.orig/include/linux/mmc/core.h 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.28/include/linux/mmc/core.h 2009-01-02 00:01:57.000000000 +0100
+--- a/include/linux/mmc/core.h
++++ b/include/linux/mmc/core.h
@@ -129,6 +129,8 @@ struct mmc_request {
struct mmc_host;
struct mmc_card;
@@ -147905,10 +146825,8 @@ Index: linux-2.6.28/include/linux/mmc/core.h
extern void mmc_wait_for_req(struct mmc_host *, struct mmc_request *);
extern int mmc_wait_for_cmd(struct mmc_host *, struct mmc_command *, int);
extern int mmc_wait_for_app_cmd(struct mmc_host *, struct mmc_card *,
-Index: linux-2.6.28/include/linux/mmc/sdio_ids.h
-===================================================================
---- linux-2.6.28.orig/include/linux/mmc/sdio_ids.h 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.28/include/linux/mmc/sdio_ids.h 2009-01-02 00:01:57.000000000 +0100
+--- a/include/linux/mmc/sdio_ids.h
++++ b/include/linux/mmc/sdio_ids.h
@@ -25,5 +25,8 @@
#define SDIO_VENDOR_ID_MARVELL 0x02df
@@ -147918,11 +146836,9 @@ Index: linux-2.6.28/include/linux/mmc/sdio_ids.h
+#define SDIO_DEVICE_ID_ATHEROS_AR6000 0x0100
#endif
-Index: linux-2.6.28/include/linux/mm.h
-===================================================================
---- linux-2.6.28.orig/include/linux/mm.h 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.28/include/linux/mm.h 2009-01-02 00:01:57.000000000 +0100
-@@ -714,7 +714,7 @@ static inline int shmem_lock(struct file
+--- a/include/linux/mm.h
++++ b/include/linux/mm.h
+@@ -713,7 +713,7 @@ static inline int shmem_lock(struct file
}
#endif
struct file *shmem_file_setup(char *name, loff_t size, unsigned long flags);
@@ -147931,10 +146847,8 @@ Index: linux-2.6.28/include/linux/mm.h
int shmem_zero_setup(struct vm_area_struct *);
#ifndef CONFIG_MMU
-Index: linux-2.6.28/include/linux/pcf50606.h
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/include/linux/pcf50606.h 2009-01-02 00:01:57.000000000 +0100
+--- /dev/null
++++ b/include/linux/pcf50606.h
@@ -0,0 +1,91 @@
+#ifndef _LINUX_PCF50606_H
+#define _LINUX_PCF50606_H
@@ -148027,10 +146941,8 @@ Index: linux-2.6.28/include/linux/pcf50606.h
+};
+
+#endif
-Index: linux-2.6.28/include/linux/pcf50633.h
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/include/linux/pcf50633.h 2009-01-02 00:01:57.000000000 +0100
+--- /dev/null
++++ b/include/linux/pcf50633.h
@@ -0,0 +1,618 @@
+#ifndef _LINUX_PCF50633_H
+#define _LINUX_PCF50633_H
@@ -148650,10 +147562,8 @@ Index: linux-2.6.28/include/linux/pcf50633.h
+void pcf50633_charge_autofast(int on);
+#endif /* _PCF50633_H */
+
-Index: linux-2.6.28/include/linux/pcf506xx.h
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/include/linux/pcf506xx.h 2009-01-02 00:01:57.000000000 +0100
+--- /dev/null
++++ b/include/linux/pcf506xx.h
@@ -0,0 +1,34 @@
+#ifndef _LINUX_PCF506XX_H
+#define _LINUX_PCF506XX_H
@@ -148689,18 +147599,14 @@ Index: linux-2.6.28/include/linux/pcf506xx.h
+
+
+#endif /* !_LINUX_PCF506XX_H */
-Index: linux-2.6.28/include/linux/regulator/pcf50633.h
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/include/linux/regulator/pcf50633.h 2009-01-02 00:01:57.000000000 +0100
+--- /dev/null
++++ b/include/linux/regulator/pcf50633.h
@@ -0,0 +1,3 @@
+#include <linux/pcf50633.h>
+
+int pcf50633_regulator_init(struct pcf50633_data *, int);
-Index: linux-2.6.28/include/linux/resume-dependency.h
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/include/linux/resume-dependency.h 2009-01-02 00:01:57.000000000 +0100
+--- /dev/null
++++ b/include/linux/resume-dependency.h
@@ -0,0 +1,114 @@
+#ifndef __RESUME_DEPENDENCY_H__
+#define __RESUME_DEPENDENCY_H__
@@ -148816,10 +147722,8 @@ Index: linux-2.6.28/include/linux/resume-dependency.h
+ */
+
+#endif
-Index: linux-2.6.28/include/linux/rtc/pcf50633.h
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/include/linux/rtc/pcf50633.h 2009-01-02 00:01:57.000000000 +0100
+--- /dev/null
++++ b/include/linux/rtc/pcf50633.h
@@ -0,0 +1,9 @@
+enum pcf50633_rtc_event {
+ PCF50633_RTC_EVENT_ALARM,
@@ -148830,10 +147734,8 @@ Index: linux-2.6.28/include/linux/rtc/pcf50633.h
+ enum pcf50633_rtc_event evt);
+
+
-Index: linux-2.6.28/include/linux/serial_core.h
-===================================================================
---- linux-2.6.28.orig/include/linux/serial_core.h 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.28/include/linux/serial_core.h 2009-01-02 00:01:57.000000000 +0100
+--- a/include/linux/serial_core.h
++++ b/include/linux/serial_core.h
@@ -158,6 +158,8 @@
/* SH-SCI */
#define PORT_SCIFA 83
@@ -148843,10 +147745,8 @@ Index: linux-2.6.28/include/linux/serial_core.h
#ifdef __KERNEL__
#include <linux/compiler.h>
-Index: linux-2.6.28/include/linux/spi/glamo.h
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/include/linux/spi/glamo.h 2009-01-02 00:01:57.000000000 +0100
+--- /dev/null
++++ b/include/linux/spi/glamo.h
@@ -0,0 +1,28 @@
+#ifndef __GLAMO_SPI_H
+#define __GLAMO_SPI_H
@@ -148876,10 +147776,8 @@ Index: linux-2.6.28/include/linux/spi/glamo.h
+
+
+#endif
-Index: linux-2.6.28/include/linux/suspend.h
-===================================================================
---- linux-2.6.28.orig/include/linux/suspend.h 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.28/include/linux/suspend.h 2009-01-02 00:01:57.000000000 +0100
+--- a/include/linux/suspend.h
++++ b/include/linux/suspend.h
@@ -146,6 +146,12 @@ struct pbe {
struct pbe *next;
};
@@ -148893,10 +147791,8 @@ Index: linux-2.6.28/include/linux/suspend.h
/* mm/page_alloc.c */
extern void mark_free_pages(struct zone *zone);
-Index: linux-2.6.28/include/linux/ts_filter_group.h
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/include/linux/ts_filter_group.h 2009-01-02 00:01:57.000000000 +0100
+--- /dev/null
++++ b/include/linux/ts_filter_group.h
@@ -0,0 +1,39 @@
+#ifndef __TS_FILTER_GROUP_H__
+#define __TS_FILTER_GROUP_H__
@@ -148937,10 +147833,8 @@ Index: linux-2.6.28/include/linux/ts_filter_group.h
+extern struct ts_filter_api ts_filter_group_api;
+
+#endif
-Index: linux-2.6.28/include/linux/ts_filter.h
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/include/linux/ts_filter.h 2009-01-02 00:01:57.000000000 +0100
+--- /dev/null
++++ b/include/linux/ts_filter.h
@@ -0,0 +1,56 @@
+#ifndef __TS_FILTER_H__
+#define __TS_FILTER_H__
@@ -148998,10 +147892,8 @@ Index: linux-2.6.28/include/linux/ts_filter.h
+ struct ts_filter **list);
+
+#endif
-Index: linux-2.6.28/include/linux/ts_filter_linear.h
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/include/linux/ts_filter_linear.h 2009-01-02 00:01:57.000000000 +0100
+--- /dev/null
++++ b/include/linux/ts_filter_linear.h
@@ -0,0 +1,64 @@
+#ifndef __TS_FILTER_LINEAR_H__
+#define __TS_FILTER_LINEAR_H__
@@ -149067,10 +147959,8 @@ Index: linux-2.6.28/include/linux/ts_filter_linear.h
+extern struct ts_filter_api ts_filter_linear_api;
+
+#endif
-Index: linux-2.6.28/include/linux/ts_filter_mean.h
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/include/linux/ts_filter_mean.h 2009-01-02 00:01:57.000000000 +0100
+--- /dev/null
++++ b/include/linux/ts_filter_mean.h
@@ -0,0 +1,34 @@
+#ifndef __TS_FILTER_MEAN_H__
+#define __TS_FILTER_MEAN_H__
@@ -149106,10 +147996,8 @@ Index: linux-2.6.28/include/linux/ts_filter_mean.h
+extern struct ts_filter_api ts_filter_mean_api;
+
+#endif
-Index: linux-2.6.28/include/linux/ts_filter_median.h
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/include/linux/ts_filter_median.h 2009-01-02 00:01:57.000000000 +0100
+--- /dev/null
++++ b/include/linux/ts_filter_median.h
@@ -0,0 +1,36 @@
+#ifndef __TS_FILTER_MEDIAN_H__
+#define __TS_FILTER_MEDIAN_H__
@@ -149147,10 +148035,8 @@ Index: linux-2.6.28/include/linux/ts_filter_median.h
+extern struct ts_filter_api ts_filter_median_api;
+
+#endif
-Index: linux-2.6.28/include/linux/vt.h
-===================================================================
---- linux-2.6.28.orig/include/linux/vt.h 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.28/include/linux/vt.h 2009-01-02 00:01:57.000000000 +0100
+--- a/include/linux/vt.h
++++ b/include/linux/vt.h
@@ -18,8 +18,19 @@ extern int unregister_vt_notifier(struct
* resizing).
*/
@@ -149171,10 +148057,8 @@ Index: linux-2.6.28/include/linux/vt.h
/* Note: the ioctl VT_GETSTATE does not work for
consoles 16 and higher (since it returns a short) */
-Index: linux-2.6.28/include/sound/soc-dapm.h
-===================================================================
---- linux-2.6.28.orig/include/sound/soc-dapm.h 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.28/include/sound/soc-dapm.h 2009-01-02 00:01:57.000000000 +0100
+--- a/include/sound/soc-dapm.h
++++ b/include/sound/soc-dapm.h
@@ -244,6 +244,13 @@ int snd_soc_dapm_nc_pin(struct snd_soc_c
int snd_soc_dapm_get_pin_status(struct snd_soc_codec *codec, char *pin);
int snd_soc_dapm_sync(struct snd_soc_codec *codec);
@@ -149189,10 +148073,8 @@ Index: linux-2.6.28/include/sound/soc-dapm.h
/* dapm widget types */
enum snd_soc_dapm_type {
snd_soc_dapm_input = 0, /* input pin */
-Index: linux-2.6.28/init/Kconfig
-===================================================================
---- linux-2.6.28.orig/init/Kconfig 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.28/init/Kconfig 2009-01-02 00:01:57.000000000 +0100
+--- a/init/Kconfig
++++ b/init/Kconfig
@@ -732,6 +732,15 @@ config AIO
by some high performance threaded applications. Disabling
this option saves about 7k.
@@ -149209,10 +148091,8 @@ Index: linux-2.6.28/init/Kconfig
config VM_EVENT_COUNTERS
default y
bool "Enable VM event counters for /proc/vmstat" if EMBEDDED
-Index: linux-2.6.28/kernel/irq/chip.c
-===================================================================
---- linux-2.6.28.orig/kernel/irq/chip.c 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.28/kernel/irq/chip.c 2009-01-02 00:01:57.000000000 +0100
+--- a/kernel/irq/chip.c
++++ b/kernel/irq/chip.c
@@ -380,6 +380,7 @@ handle_level_irq(unsigned int irq, struc
out_unlock:
spin_unlock(&desc->lock);
@@ -149229,10 +148109,8 @@ Index: linux-2.6.28/kernel/irq/chip.c
void
set_irq_chip_and_handler(unsigned int irq, struct irq_chip *chip,
-Index: linux-2.6.28/kernel/power/main.c
-===================================================================
---- linux-2.6.28.orig/kernel/power/main.c 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.28/kernel/power/main.c 2009-01-02 00:01:57.000000000 +0100
+--- a/kernel/power/main.c
++++ b/kernel/power/main.c
@@ -132,6 +132,9 @@ static inline int suspend_test(int level
#endif /* CONFIG_PM_SLEEP */
@@ -149270,10 +148148,8 @@ Index: linux-2.6.28/kernel/power/main.c
sys_sync();
printk("done.\n");
-Index: linux-2.6.28/kernel/printk.c
-===================================================================
---- linux-2.6.28.orig/kernel/printk.c 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.28/kernel/printk.c 2009-01-02 00:01:57.000000000 +0100
+--- a/kernel/printk.c
++++ b/kernel/printk.c
@@ -32,8 +32,11 @@
#include <linux/security.h>
#include <linux/bootmem.h>
@@ -149341,10 +148217,8 @@ Index: linux-2.6.28/kernel/printk.c
/*
* Copy the output into log_buf. If the caller didn't provide
* appropriate log level tags, we insert them here
-Index: linux-2.6.28/kernel/timer.c
-===================================================================
---- linux-2.6.28.orig/kernel/timer.c 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.28/kernel/timer.c 2009-01-02 00:01:57.000000000 +0100
+--- a/kernel/timer.c
++++ b/kernel/timer.c
@@ -813,7 +813,11 @@ static int cascade(struct tvec_base *bas
* don't have to detach them individually.
*/
@@ -149358,10 +148232,8 @@ Index: linux-2.6.28/kernel/timer.c
internal_add_timer(base, timer);
}
-Index: linux-2.6.28/MAINTAINERS
-===================================================================
---- linux-2.6.28.orig/MAINTAINERS 2009-01-02 00:00:02.000000000 +0100
-+++ linux-2.6.28/MAINTAINERS 2009-01-02 00:01:57.000000000 +0100
+--- a/MAINTAINERS
++++ b/MAINTAINERS
@@ -1705,6 +1705,20 @@ FILE LOCKING (flock() and fcntl()/lockf(
P: Matthew Wilcox
M: matthew@wil.cx
@@ -149383,10 +148255,8 @@ Index: linux-2.6.28/MAINTAINERS
S: Maintained
FILESYSTEMS (VFS and infrastructure)
-Index: linux-2.6.28/makerecovery
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/makerecovery 2009-01-02 00:01:57.000000000 +0100
+--- /dev/null
++++ b/makerecovery
@@ -0,0 +1,17 @@
+#!/bin/sh
+#
@@ -149405,10 +148275,8 @@ Index: linux-2.6.28/makerecovery
+rm -f _spacer
+cat $1 >> recovery-$1
+
-Index: linux-2.6.28/mm/ashmem.c
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/mm/ashmem.c 2009-01-02 00:01:57.000000000 +0100
+--- /dev/null
++++ b/mm/ashmem.c
@@ -0,0 +1,657 @@
+/* drivers/android/ashmem.c
+**
@@ -150067,10 +148935,8 @@ Index: linux-2.6.28/mm/ashmem.c
+module_exit(ashmem_exit);
+
+MODULE_LICENSE("GPL");
-Index: linux-2.6.28/mm/Makefile
-===================================================================
---- linux-2.6.28.orig/mm/Makefile 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.28/mm/Makefile 2009-01-02 00:01:57.000000000 +0100
+--- a/mm/Makefile
++++ b/mm/Makefile
@@ -22,6 +22,7 @@ obj-$(CONFIG_NUMA) += mempolicy.o
obj-$(CONFIG_SPARSEMEM) += sparse.o
obj-$(CONFIG_SPARSEMEM_VMEMMAP) += sparse-vmemmap.o
@@ -150079,10 +148945,8 @@ Index: linux-2.6.28/mm/Makefile
obj-$(CONFIG_TMPFS_POSIX_ACL) += shmem_acl.o
obj-$(CONFIG_TINY_SHMEM) += tiny-shmem.o
obj-$(CONFIG_SLOB) += slob.o
-Index: linux-2.6.28/mm/tiny-shmem.c
-===================================================================
---- linux-2.6.28.orig/mm/tiny-shmem.c 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.28/mm/tiny-shmem.c 2009-01-02 00:01:57.000000000 +0100
+--- a/mm/tiny-shmem.c
++++ b/mm/tiny-shmem.c
@@ -97,6 +97,22 @@ put_memory:
}
EXPORT_SYMBOL_GPL(shmem_file_setup);
@@ -150119,10 +148983,8 @@ Index: linux-2.6.28/mm/tiny-shmem.c
return 0;
}
-Index: linux-2.6.28/remote_install_sdcard
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/remote_install_sdcard 2009-01-02 00:01:58.000000000 +0100
+--- /dev/null
++++ b/remote_install_sdcard
@@ -0,0 +1,18 @@
+#!/bin/sh
+
@@ -150142,10 +149004,8 @@ Index: linux-2.6.28/remote_install_sdcard
+scp uImage.bin root@$GTA_DEVICE_IP:/boot
+ssh root@$GTA_DEVICE_IP "mount /dev/mmcblk0p1 / -oremount,ro ; reboot -if &"
+
-Index: linux-2.6.28/scripts/mkuboot.sh
-===================================================================
---- linux-2.6.28.orig/scripts/mkuboot.sh 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.28/scripts/mkuboot.sh 2009-01-02 00:01:58.000000000 +0100
+--- a/scripts/mkuboot.sh
++++ b/scripts/mkuboot.sh
@@ -11,7 +11,7 @@ if [ -z "${MKIMAGE}" ]; then
if [ -z "${MKIMAGE}" ]; then
# Doesn't exist
@@ -150155,10 +149015,8 @@ Index: linux-2.6.28/scripts/mkuboot.sh
fi
fi
-Index: linux-2.6.28/sound/soc/codecs/wm8753.c
-===================================================================
---- linux-2.6.28.orig/sound/soc/codecs/wm8753.c 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.28/sound/soc/codecs/wm8753.c 2009-01-02 00:01:58.000000000 +0100
+--- a/sound/soc/codecs/wm8753.c
++++ b/sound/soc/codecs/wm8753.c
@@ -1584,6 +1584,9 @@ static int wm8753_init(struct snd_soc_de
schedule_delayed_work(&codec->delayed_work,
msecs_to_jiffies(caps_charge));
@@ -150234,10 +149092,8 @@ Index: linux-2.6.28/sound/soc/codecs/wm8753.c
i2c_del_driver(&wm8753_i2c_driver);
#endif
#if defined(CONFIG_SPI_MASTER)
-Index: linux-2.6.28/sound/soc/s3c24xx/Kconfig
-===================================================================
---- linux-2.6.28.orig/sound/soc/s3c24xx/Kconfig 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.28/sound/soc/s3c24xx/Kconfig 2009-01-02 00:01:58.000000000 +0100
+--- a/sound/soc/s3c24xx/Kconfig
++++ b/sound/soc/s3c24xx/Kconfig
@@ -26,6 +26,15 @@ config SND_S3C24XX_SOC_NEO1973_WM8753
Say Y if you want to add support for SoC audio on smdk2440
with the WM8753.
@@ -150254,10 +149110,8 @@ Index: linux-2.6.28/sound/soc/s3c24xx/Kconfig
config SND_S3C24XX_SOC_SMDK2443_WM9710
tristate "SoC AC97 Audio support for SMDK2443 - WM9710"
depends on SND_S3C24XX_SOC && MACH_SMDK2443
-Index: linux-2.6.28/sound/soc/s3c24xx/Makefile
-===================================================================
---- linux-2.6.28.orig/sound/soc/s3c24xx/Makefile 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.28/sound/soc/s3c24xx/Makefile 2009-01-02 00:01:58.000000000 +0100
+--- a/sound/soc/s3c24xx/Makefile
++++ b/sound/soc/s3c24xx/Makefile
@@ -13,7 +13,10 @@ obj-$(CONFIG_SND_S3C2412_SOC_I2S) += snd
snd-soc-neo1973-wm8753-objs := neo1973_wm8753.o
snd-soc-smdk2443-wm9710-objs := smdk2443_wm9710.o
@@ -150269,10 +149123,8 @@ Index: linux-2.6.28/sound/soc/s3c24xx/Makefile
obj-$(CONFIG_SND_S3C24XX_SOC_LN2440SBC_ALC650) += snd-soc-ln2440sbc-alc650.o
+obj-$(CONFIG_SND_S3C24XX_SOC_NEO1973_GTA02_WM8753) += snd-soc-neo1973-gta02-wm8753.o
+
-Index: linux-2.6.28/sound/soc/s3c24xx/neo1973_gta02_wm8753.c
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.28/sound/soc/s3c24xx/neo1973_gta02_wm8753.c 2009-01-02 00:01:58.000000000 +0100
+--- /dev/null
++++ b/sound/soc/s3c24xx/neo1973_gta02_wm8753.c
@@ -0,0 +1,673 @@
+/*
+ * neo1973_gta02_wm8753.c -- SoC audio for Neo1973
@@ -150947,10 +149799,8 @@ Index: linux-2.6.28/sound/soc/s3c24xx/neo1973_gta02_wm8753.c
+MODULE_DESCRIPTION("ALSA SoC WM8753 Neo1973 GTA02");
+MODULE_LICENSE("GPL");
+
-Index: linux-2.6.28/sound/soc/s3c24xx/neo1973_wm8753.c
-===================================================================
---- linux-2.6.28.orig/sound/soc/s3c24xx/neo1973_wm8753.c 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.28/sound/soc/s3c24xx/neo1973_wm8753.c 2009-01-02 00:01:58.000000000 +0100
+--- a/sound/soc/s3c24xx/neo1973_wm8753.c
++++ b/sound/soc/s3c24xx/neo1973_wm8753.c
@@ -32,7 +32,7 @@
#include <mach/audio.h>
#include <linux/io.h>
@@ -150987,10 +149837,8 @@ Index: linux-2.6.28/sound/soc/s3c24xx/neo1973_wm8753.c
if (!machine_is_neo1973_gta01()) {
printk(KERN_INFO
-Index: linux-2.6.28/sound/soc/s3c24xx/s3c2443-ac97.c
-===================================================================
---- linux-2.6.28.orig/sound/soc/s3c24xx/s3c2443-ac97.c 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.28/sound/soc/s3c24xx/s3c2443-ac97.c 2009-01-02 00:01:58.000000000 +0100
+--- a/sound/soc/s3c24xx/s3c2443-ac97.c
++++ b/sound/soc/s3c24xx/s3c2443-ac97.c
@@ -28,7 +28,7 @@
#include <sound/soc.h>
@@ -151000,10 +149848,8 @@ Index: linux-2.6.28/sound/soc/s3c24xx/s3c2443-ac97.c
#include <mach/regs-gpio.h>
#include <mach/regs-clock.h>
#include <mach/audio.h>
-Index: linux-2.6.28/sound/soc/s3c24xx/s3c24xx-i2s.c
-===================================================================
---- linux-2.6.28.orig/sound/soc/s3c24xx/s3c24xx-i2s.c 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.28/sound/soc/s3c24xx/s3c24xx-i2s.c 2009-01-02 00:01:58.000000000 +0100
+--- a/sound/soc/s3c24xx/s3c24xx-i2s.c
++++ b/sound/soc/s3c24xx/s3c24xx-i2s.c
@@ -175,7 +175,7 @@ static void s3c24xx_snd_rxctrl(int on)
static int s3c24xx_snd_lrsync(void)
{
@@ -151041,10 +149887,8 @@ Index: linux-2.6.28/sound/soc/s3c24xx/s3c24xx-i2s.c
return ret;
}
-Index: linux-2.6.28/sound/soc/s3c24xx/s3c24xx-pcm.c
-===================================================================
---- linux-2.6.28.orig/sound/soc/s3c24xx/s3c24xx-pcm.c 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.28/sound/soc/s3c24xx/s3c24xx-pcm.c 2009-01-02 00:01:58.000000000 +0100
+--- a/sound/soc/s3c24xx/s3c24xx-pcm.c
++++ b/sound/soc/s3c24xx/s3c24xx-pcm.c
@@ -168,7 +168,7 @@ static int s3c24xx_pcm_hw_params(struct
prtd->params->client, NULL);
@@ -151054,10 +149898,8 @@ Index: linux-2.6.28/sound/soc/s3c24xx/s3c24xx-pcm.c
return ret;
}
}
-Index: linux-2.6.28/sound/soc/soc-core.c
-===================================================================
---- linux-2.6.28.orig/sound/soc/soc-core.c 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.28/sound/soc/soc-core.c 2009-01-02 00:01:58.000000000 +0100
+--- a/sound/soc/soc-core.c
++++ b/sound/soc/soc-core.c
@@ -1003,6 +1003,38 @@ static ssize_t codec_reg_show(struct dev
}
static DEVICE_ATTR(codec_reg, 0444, codec_reg_show, NULL);
@@ -151107,10 +149949,8 @@ Index: linux-2.6.28/sound/soc/soc-core.c
out:
return ret;
}
-Index: linux-2.6.28/sound/soc/soc-dapm.c
-===================================================================
---- linux-2.6.28.orig/sound/soc/soc-dapm.c 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.28/sound/soc/soc-dapm.c 2009-01-02 00:01:58.000000000 +0100
+--- a/sound/soc/soc-dapm.c
++++ b/sound/soc/soc-dapm.c
@@ -1525,6 +1525,56 @@ int snd_soc_dapm_get_pin_status(struct s
EXPORT_SYMBOL_GPL(snd_soc_dapm_get_pin_status);
diff --git a/target/linux/s3c24xx/patches-2.6.28/002-call-preinit-instead-of-init.patch b/target/linux/s3c24xx/patches-2.6.28/002-call-preinit-instead-of-init.patch
index 19ecbf96c..8ab3a5ce3 100644
--- a/target/linux/s3c24xx/patches-2.6.28/002-call-preinit-instead-of-init.patch
+++ b/target/linux/s3c24xx/patches-2.6.28/002-call-preinit-instead-of-init.patch
@@ -1,7 +1,5 @@
-Index: linux-2.6.28/init/main.c
-===================================================================
---- linux-2.6.28.orig/init/main.c 2009-01-03 13:03:03.000000000 +0100
-+++ linux-2.6.28/init/main.c 2009-01-03 13:03:14.000000000 +0100
+--- a/init/main.c
++++ b/init/main.c
@@ -825,6 +825,7 @@ static int noinline init_post(void)
printk(KERN_WARNING "Failed to execute %s. Attempting "
"defaults...\n", execute_command);
diff --git a/target/linux/s3c24xx/patches-2.6.28/003-disable-xt-chaos.patch b/target/linux/s3c24xx/patches-2.6.28/003-disable-xt-chaos.patch
index e1b017feb..b8c2e04e4 100644
--- a/target/linux/s3c24xx/patches-2.6.28/003-disable-xt-chaos.patch
+++ b/target/linux/s3c24xx/patches-2.6.28/003-disable-xt-chaos.patch
@@ -1,10 +1,8 @@
Does not compile. --mb
---
-Index: linux-2.6.28/net/netfilter/Kconfig
-===================================================================
---- linux-2.6.28.orig/net/netfilter/Kconfig 2009-01-02 00:42:52.000000000 +0100
-+++ linux-2.6.28/net/netfilter/Kconfig 2009-01-02 00:43:19.000000000 +0100
+--- a/net/netfilter/Kconfig
++++ b/net/netfilter/Kconfig
@@ -314,7 +314,7 @@ if NETFILTER_XTABLES
config NETFILTER_XT_TARGET_CHAOS
diff --git a/target/linux/s3c24xx/patches-2.6.28/004-rename-serialdevs.patch b/target/linux/s3c24xx/patches-2.6.28/004-rename-serialdevs.patch
index a0424f8c7..3e6fdbea9 100644
--- a/target/linux/s3c24xx/patches-2.6.28/004-rename-serialdevs.patch
+++ b/target/linux/s3c24xx/patches-2.6.28/004-rename-serialdevs.patch
@@ -1,7 +1,6 @@
-diff -ruN linux-2.6.28.orig/drivers/serial/samsung.c linux-2.6.28/drivers/serial/samsung.c
---- linux-2.6.28.orig/drivers/serial/samsung.c 2009-01-19 21:52:17.000000000 +0100
-+++ linux-2.6.28/drivers/serial/samsung.c 2009-01-19 21:53:42.000000000 +0100
-@@ -882,7 +882,7 @@
+--- a/drivers/serial/samsung.c
++++ b/drivers/serial/samsung.c
+@@ -882,7 +882,7 @@ static struct uart_ops s3c24xx_serial_op
static struct uart_driver s3c24xx_uart_drv = {
.owner = THIS_MODULE,
diff --git a/target/linux/sibyte/Makefile b/target/linux/sibyte/Makefile
index b54f034a2..c2dd4ec81 100644
--- a/target/linux/sibyte/Makefile
+++ b/target/linux/sibyte/Makefile
@@ -11,7 +11,7 @@ BOARD:=sibyte
BOARDNAME:=Broadcom/SiByte SB-1
FEATURES:=broken
-LINUX_VERSION:=2.6.28
+LINUX_VERSION:=2.6.28.2
include $(INCLUDE_DIR)/target.mk
diff --git a/target/linux/uml/Makefile b/target/linux/uml/Makefile
index 41d20ff94..4a823c102 100644
--- a/target/linux/uml/Makefile
+++ b/target/linux/uml/Makefile
@@ -23,7 +23,7 @@ BOARDNAME:=User Mode Linux
FEATURES:=ext2
LINUX_CONFIG:=$(CURDIR)/config/$(ARCH)
-LINUX_VERSION:=2.6.28
+LINUX_VERSION:=2.6.28.2
include $(INCLUDE_DIR)/target.mk
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-25 01:18:34 +0000