projects / openwrt.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
[ubicom32]: refresh patch
[openwrt.git] / target / linux / ubicom32 / patches-2.6.30 / 100-ubicom32_support.patch
diff --git a/target/linux/ubicom32/patches-2.6.30/100-ubicom32_support.patch b/target/linux/ubicom32/patches-2.6.30/100-ubicom32_support.patch
index 2e0f1a7..04dec6b 100644 (file)
--- a/target/linux/ubicom32/patches-2.6.30/100-ubicom32_support.patch
+++ b/target/linux/ubicom32/patches-2.6.30/100-ubicom32_support.patch
@@ -1,6 +1,5 @@
-diff -ruN linux-2.6.30.10/arch/ubicom32/crypto/aes_ubicom32.c linux-2.6.30.10-ubi/arch/ubicom32/crypto/aes_ubicom32.c
---- linux-2.6.30.10/arch/ubicom32/crypto/aes_ubicom32.c        1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.30.10-ubi/arch/ubicom32/crypto/aes_ubicom32.c    2009-12-11 11:45:11.000000000 +0200
+--- /dev/null
++++ b/arch/ubicom32/crypto/aes_ubicom32.c
 @@ -0,0 +1,458 @@
 +/*
 + * arch/ubicom32/crypto/aes_ubicom32.c
 @@ -0,0 +1,458 @@
 +/*
 + * arch/ubicom32/crypto/aes_ubicom32.c
@@ -460,9 +459,8 @@ diff -ruN linux-2.6.30.10/arch/ubicom32/crypto/aes_ubicom32.c linux-2.6.30.10-ub
 +
 +MODULE_DESCRIPTION("Rijndael (AES) Cipher Algorithm");
 +MODULE_LICENSE("GPL");
 +
 +MODULE_DESCRIPTION("Rijndael (AES) Cipher Algorithm");
 +MODULE_LICENSE("GPL");
-diff -ruN linux-2.6.30.10/arch/ubicom32/crypto/crypto_des.h linux-2.6.30.10-ubi/arch/ubicom32/crypto/crypto_des.h
---- linux-2.6.30.10/arch/ubicom32/crypto/crypto_des.h  1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.30.10-ubi/arch/ubicom32/crypto/crypto_des.h      2009-12-11 11:45:11.000000000 +0200
+--- /dev/null
++++ b/arch/ubicom32/crypto/crypto_des.h
 @@ -0,0 +1,34 @@
 +/*
 + * arch/ubicom32/crypto/crypto_des.h
 @@ -0,0 +1,34 @@
 +/*
 + * arch/ubicom32/crypto/crypto_des.h
@@ -498,9 +496,8 @@ diff -ruN linux-2.6.30.10/arch/ubicom32/crypto/crypto_des.h linux-2.6.30.10-ubi/
 +extern int crypto_des_check_key(const u8*, unsigned int, u32*);
 +
 +#endif /* __CRYPTO_DES_H__ */
 +extern int crypto_des_check_key(const u8*, unsigned int, u32*);
 +
 +#endif /* __CRYPTO_DES_H__ */
-diff -ruN linux-2.6.30.10/arch/ubicom32/crypto/crypto_ubicom32.c linux-2.6.30.10-ubi/arch/ubicom32/crypto/crypto_ubicom32.c
---- linux-2.6.30.10/arch/ubicom32/crypto/crypto_ubicom32.c     1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.30.10-ubi/arch/ubicom32/crypto/crypto_ubicom32.c 2009-12-11 11:45:11.000000000 +0200
+--- /dev/null
++++ b/arch/ubicom32/crypto/crypto_ubicom32.c
 @@ -0,0 +1,50 @@
 +/*
 + * arch/ubicom32/crypto/crypto_ubicom32.c
 @@ -0,0 +1,50 @@
 +/*
 + * arch/ubicom32/crypto/crypto_ubicom32.c
@@ -552,9 +549,8 @@ diff -ruN linux-2.6.30.10/arch/ubicom32/crypto/crypto_ubicom32.c linux-2.6.30.10
 +      /* keep monitoring */
 +      hw_crypto_ps_start();
 +}
 +      /* keep monitoring */
 +      hw_crypto_ps_start();
 +}
-diff -ruN linux-2.6.30.10/arch/ubicom32/crypto/crypto_ubicom32.h linux-2.6.30.10-ubi/arch/ubicom32/crypto/crypto_ubicom32.h
---- linux-2.6.30.10/arch/ubicom32/crypto/crypto_ubicom32.h     1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.30.10-ubi/arch/ubicom32/crypto/crypto_ubicom32.h 2009-12-11 11:45:11.000000000 +0200
+--- /dev/null
++++ b/arch/ubicom32/crypto/crypto_ubicom32.h
 @@ -0,0 +1,346 @@
 +/*
 + * arch/ubicom32/crypto/crypto_ubicom32.h
 @@ -0,0 +1,346 @@
 +/*
 + * arch/ubicom32/crypto/crypto_ubicom32.h
@@ -902,9 +898,8 @@ diff -ruN linux-2.6.30.10/arch/ubicom32/crypto/crypto_ubicom32.h linux-2.6.30.10
 +#endif
 +
 +#endif        /* _CRYPTO_ARCH_UBICOM32_CRYPT_H */
 +#endif
 +
 +#endif        /* _CRYPTO_ARCH_UBICOM32_CRYPT_H */
-diff -ruN linux-2.6.30.10/arch/ubicom32/crypto/des_check_key.c linux-2.6.30.10-ubi/arch/ubicom32/crypto/des_check_key.c
---- linux-2.6.30.10/arch/ubicom32/crypto/des_check_key.c       1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.30.10-ubi/arch/ubicom32/crypto/des_check_key.c   2009-12-11 11:45:11.000000000 +0200
+--- /dev/null
++++ b/arch/ubicom32/crypto/des_check_key.c
 @@ -0,0 +1,148 @@
 +/*
 + * arch/ubicom32/crypto/des_check_key.c
 @@ -0,0 +1,148 @@
 +/*
 + * arch/ubicom32/crypto/des_check_key.c
@@ -1054,9 +1049,8 @@ diff -ruN linux-2.6.30.10/arch/ubicom32/crypto/des_check_key.c linux-2.6.30.10-u
 +
 +MODULE_LICENSE("GPL");
 +MODULE_DESCRIPTION("Key Check function for DES &  DES3 Cipher Algorithms");
 +
 +MODULE_LICENSE("GPL");
 +MODULE_DESCRIPTION("Key Check function for DES &  DES3 Cipher Algorithms");
-diff -ruN linux-2.6.30.10/arch/ubicom32/crypto/des_ubicom32.c linux-2.6.30.10-ubi/arch/ubicom32/crypto/des_ubicom32.c
---- linux-2.6.30.10/arch/ubicom32/crypto/des_ubicom32.c        1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.30.10-ubi/arch/ubicom32/crypto/des_ubicom32.c    2009-12-11 11:45:11.000000000 +0200
+--- /dev/null
++++ b/arch/ubicom32/crypto/des_ubicom32.c
 @@ -0,0 +1,761 @@
 +/*
 + * arch/ubicom32/crypto/des_ubicom32.c
 @@ -0,0 +1,761 @@
 +/*
 + * arch/ubicom32/crypto/des_ubicom32.c
@@ -1819,9 +1813,8 @@ diff -ruN linux-2.6.30.10/arch/ubicom32/crypto/des_ubicom32.c linux-2.6.30.10-ub
 +
 +MODULE_LICENSE("GPL");
 +MODULE_DESCRIPTION("DES & Triple DES EDE Cipher Algorithms");
 +
 +MODULE_LICENSE("GPL");
 +MODULE_DESCRIPTION("DES & Triple DES EDE Cipher Algorithms");
-diff -ruN linux-2.6.30.10/arch/ubicom32/crypto/Makefile linux-2.6.30.10-ubi/arch/ubicom32/crypto/Makefile
---- linux-2.6.30.10/arch/ubicom32/crypto/Makefile      1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.30.10-ubi/arch/ubicom32/crypto/Makefile  2009-12-11 11:45:11.000000000 +0200
+--- /dev/null
++++ b/arch/ubicom32/crypto/Makefile
 @@ -0,0 +1,36 @@
 +#
 +# arch/ubicom32/crypto/Makefile
 @@ -0,0 +1,36 @@
 +#
 +# arch/ubicom32/crypto/Makefile
@@ -1859,9 +1852,8 @@ diff -ruN linux-2.6.30.10/arch/ubicom32/crypto/Makefile linux-2.6.30.10-ubi/arch
 +des-y := des_ubicom32.o des_check_key.o
 +md5-y := md5_ubicom32.o md5_ubicom32_asm.o
 +sha1-y := sha1_ubicom32.o
 +des-y := des_ubicom32.o des_check_key.o
 +md5-y := md5_ubicom32.o md5_ubicom32_asm.o
 +sha1-y := sha1_ubicom32.o
-diff -ruN linux-2.6.30.10/arch/ubicom32/crypto/md5_ubicom32_asm.S linux-2.6.30.10-ubi/arch/ubicom32/crypto/md5_ubicom32_asm.S
---- linux-2.6.30.10/arch/ubicom32/crypto/md5_ubicom32_asm.S    1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.30.10-ubi/arch/ubicom32/crypto/md5_ubicom32_asm.S        2009-12-11 11:45:11.000000000 +0200
+--- /dev/null
++++ b/arch/ubicom32/crypto/md5_ubicom32_asm.S
 @@ -0,0 +1,234 @@
 +/*
 + * arch/ubicom32/crypto/md5_ubicom32_asm.S
 @@ -0,0 +1,234 @@
 +/*
 + * arch/ubicom32/crypto/md5_ubicom32_asm.S
@@ -2097,9 +2089,8 @@ diff -ruN linux-2.6.30.10/arch/ubicom32/crypto/md5_ubicom32_asm.S linux-2.6.30.1
 +
 +      call_return_macro
 +      .endfunc
 +
 +      call_return_macro
 +      .endfunc
-diff -ruN linux-2.6.30.10/arch/ubicom32/crypto/md5_ubicom32.c linux-2.6.30.10-ubi/arch/ubicom32/crypto/md5_ubicom32.c
---- linux-2.6.30.10/arch/ubicom32/crypto/md5_ubicom32.c        1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.30.10-ubi/arch/ubicom32/crypto/md5_ubicom32.c    2009-12-11 11:45:11.000000000 +0200
+--- /dev/null
++++ b/arch/ubicom32/crypto/md5_ubicom32.c
 @@ -0,0 +1,200 @@
 +/*
 + * arch/ubicom32/crypto/md5_ubicom32.c
 @@ -0,0 +1,200 @@
 +/*
 + * arch/ubicom32/crypto/md5_ubicom32.c
@@ -2301,9 +2292,8 @@ diff -ruN linux-2.6.30.10/arch/ubicom32/crypto/md5_ubicom32.c linux-2.6.30.10-ub
 +
 +MODULE_LICENSE("GPL");
 +MODULE_DESCRIPTION("MD5 Secure Hash Algorithm");
 +
 +MODULE_LICENSE("GPL");
 +MODULE_DESCRIPTION("MD5 Secure Hash Algorithm");
-diff -ruN linux-2.6.30.10/arch/ubicom32/crypto/sha1_ubicom32_asm.S linux-2.6.30.10-ubi/arch/ubicom32/crypto/sha1_ubicom32_asm.S
---- linux-2.6.30.10/arch/ubicom32/crypto/sha1_ubicom32_asm.S   1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.30.10-ubi/arch/ubicom32/crypto/sha1_ubicom32_asm.S       2009-12-11 11:45:11.000000000 +0200
+--- /dev/null
++++ b/arch/ubicom32/crypto/sha1_ubicom32_asm.S
 @@ -0,0 +1,244 @@
 +/*
 + * arch/ubicom32/crypto/sha1_ubicom32_asm.S
 @@ -0,0 +1,244 @@
 +/*
 + * arch/ubicom32/crypto/sha1_ubicom32_asm.S
@@ -2549,9 +2539,8 @@ diff -ruN linux-2.6.30.10/arch/ubicom32/crypto/sha1_ubicom32_asm.S linux-2.6.30.
 +;*****************************************************************************************
 +;END                  ;End of program code
 +;*****************************************************************************************
 +;*****************************************************************************************
 +;END                  ;End of program code
 +;*****************************************************************************************
-diff -ruN linux-2.6.30.10/arch/ubicom32/crypto/sha1_ubicom32.c linux-2.6.30.10-ubi/arch/ubicom32/crypto/sha1_ubicom32.c
---- linux-2.6.30.10/arch/ubicom32/crypto/sha1_ubicom32.c       1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.30.10-ubi/arch/ubicom32/crypto/sha1_ubicom32.c   2009-12-11 11:45:11.000000000 +0200
+--- /dev/null
++++ b/arch/ubicom32/crypto/sha1_ubicom32.c
 @@ -0,0 +1,354 @@
 +/*
 + * arch/ubicom32/crypto/sha1_ubicom32.c
 @@ -0,0 +1,354 @@
 +/*
 + * arch/ubicom32/crypto/sha1_ubicom32.c
@@ -2907,9 +2896,8 @@ diff -ruN linux-2.6.30.10/arch/ubicom32/crypto/sha1_ubicom32.c linux-2.6.30.10-u
 +
 +MODULE_LICENSE("GPL");
 +MODULE_DESCRIPTION("SHA1 Secure Hash Algorithm");
 +
 +MODULE_LICENSE("GPL");
 +MODULE_DESCRIPTION("SHA1 Secure Hash Algorithm");
-diff -ruN linux-2.6.30.10/arch/ubicom32/include/asm/a.out.h linux-2.6.30.10-ubi/arch/ubicom32/include/asm/a.out.h
---- linux-2.6.30.10/arch/ubicom32/include/asm/a.out.h  1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.30.10-ubi/arch/ubicom32/include/asm/a.out.h      2009-12-11 11:45:11.000000000 +0200
+--- /dev/null
++++ b/arch/ubicom32/include/asm/a.out.h
 @@ -0,0 +1,47 @@
 +/*
 + * arch/ubicom32/include/asm/a.out.h
 @@ -0,0 +1,47 @@
 +/*
 + * arch/ubicom32/include/asm/a.out.h
@@ -2958,9 +2946,8 @@ diff -ruN linux-2.6.30.10/arch/ubicom32/include/asm/a.out.h linux-2.6.30.10-ubi/
 +#define N_SYMSIZE(a)  ((a).a_syms)
 +
 +#endif /* _ASM_UBICOM32_A_OUT_H */
 +#define N_SYMSIZE(a)  ((a).a_syms)
 +
 +#endif /* _ASM_UBICOM32_A_OUT_H */
-diff -ruN linux-2.6.30.10/arch/ubicom32/include/asm/atomic.h linux-2.6.30.10-ubi/arch/ubicom32/include/asm/atomic.h
---- linux-2.6.30.10/arch/ubicom32/include/asm/atomic.h 1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.30.10-ubi/arch/ubicom32/include/asm/atomic.h     2009-12-11 11:45:11.000000000 +0200
+--- /dev/null
++++ b/arch/ubicom32/include/asm/atomic.h
 @@ -0,0 +1,348 @@
 +/*
 + * arch/ubicom32/include/asm/atomic.h
 @@ -0,0 +1,348 @@
 +/*
 + * arch/ubicom32/include/asm/atomic.h
@@ -3310,9 +3297,8 @@ diff -ruN linux-2.6.30.10/arch/ubicom32/include/asm/atomic.h linux-2.6.30.10-ubi
 +#define smp_mb__after_atomic_dec() asm volatile ("" : : : "memory")
 +
 +#endif /* _ASM_UBICOM32_ATOMIC_H */
 +#define smp_mb__after_atomic_dec() asm volatile ("" : : : "memory")
 +
 +#endif /* _ASM_UBICOM32_ATOMIC_H */
-diff -ruN linux-2.6.30.10/arch/ubicom32/include/asm/audio.h linux-2.6.30.10-ubi/arch/ubicom32/include/asm/audio.h
---- linux-2.6.30.10/arch/ubicom32/include/asm/audio.h  1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.30.10-ubi/arch/ubicom32/include/asm/audio.h      2009-12-11 11:45:11.000000000 +0200
+--- /dev/null
++++ b/arch/ubicom32/include/asm/audio.h
 @@ -0,0 +1,40 @@
 +/*
 + * arch/ubicom32/include/asm/audio.h
 @@ -0,0 +1,40 @@
 +/*
 + * arch/ubicom32/include/asm/audio.h
@@ -3354,9 +3340,8 @@ diff -ruN linux-2.6.30.10/arch/ubicom32/include/asm/audio.h linux-2.6.30.10-ubi/
 +
 +#define audio_device_priv(pdev) (((struct ubi32pcm_platform_data *)(((struct platform_device *)(pdev))->dev.platform_data))->priv_data)
 +#endif
 +
 +#define audio_device_priv(pdev) (((struct ubi32pcm_platform_data *)(((struct platform_device *)(pdev))->dev.platform_data))->priv_data)
 +#endif
-diff -ruN linux-2.6.30.10/arch/ubicom32/include/asm/audionode.h linux-2.6.30.10-ubi/arch/ubicom32/include/asm/audionode.h
---- linux-2.6.30.10/arch/ubicom32/include/asm/audionode.h      1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.30.10-ubi/arch/ubicom32/include/asm/audionode.h  2009-12-11 11:45:11.000000000 +0200
+--- /dev/null
++++ b/arch/ubicom32/include/asm/audionode.h
 @@ -0,0 +1,152 @@
 +/*
 + * audionode.h
 @@ -0,0 +1,152 @@
 +/*
 + * audionode.h
@@ -3510,9 +3495,8 @@ diff -ruN linux-2.6.30.10/arch/ubicom32/include/asm/audionode.h linux-2.6.30.10-
 +};
 +
 +#endif
 +};
 +
 +#endif
-diff -ruN linux-2.6.30.10/arch/ubicom32/include/asm/auxvec.h linux-2.6.30.10-ubi/arch/ubicom32/include/asm/auxvec.h
---- linux-2.6.30.10/arch/ubicom32/include/asm/auxvec.h 1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.30.10-ubi/arch/ubicom32/include/asm/auxvec.h     2009-12-11 11:45:11.000000000 +0200
+--- /dev/null
++++ b/arch/ubicom32/include/asm/auxvec.h
 @@ -0,0 +1,32 @@
 +/*
 + * arch/ubicom32/include/asm/auxvec.h
 @@ -0,0 +1,32 @@
 +/*
 + * arch/ubicom32/include/asm/auxvec.h
@@ -3546,9 +3530,8 @@ diff -ruN linux-2.6.30.10/arch/ubicom32/include/asm/auxvec.h linux-2.6.30.10-ubi
 +#define _ASM_UBICOM32_AUXVEC_H
 +
 +#endif /* _ASM_UBICOM32_AUXVEC_H */
 +#define _ASM_UBICOM32_AUXVEC_H
 +
 +#endif /* _ASM_UBICOM32_AUXVEC_H */
-diff -ruN linux-2.6.30.10/arch/ubicom32/include/asm/bitops.h linux-2.6.30.10-ubi/arch/ubicom32/include/asm/bitops.h
---- linux-2.6.30.10/arch/ubicom32/include/asm/bitops.h 1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.30.10-ubi/arch/ubicom32/include/asm/bitops.h     2009-12-11 11:45:11.000000000 +0200
+--- /dev/null
++++ b/arch/ubicom32/include/asm/bitops.h
 @@ -0,0 +1,172 @@
 +/*
 + * arch/ubicom32/include/asm/bitops.h
 @@ -0,0 +1,172 @@
 +/*
 + * arch/ubicom32/include/asm/bitops.h
@@ -3722,9 +3705,8 @@ diff -ruN linux-2.6.30.10/arch/ubicom32/include/asm/bitops.h linux-2.6.30.10-ubi
 +#include <asm-generic/bitops/fls64.h>
 +
 +#endif /* _ASM_UBICOM32_BITOPS_H */
 +#include <asm-generic/bitops/fls64.h>
 +
 +#endif /* _ASM_UBICOM32_BITOPS_H */
-diff -ruN linux-2.6.30.10/arch/ubicom32/include/asm/board.h linux-2.6.30.10-ubi/arch/ubicom32/include/asm/board.h
---- linux-2.6.30.10/arch/ubicom32/include/asm/board.h  1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.30.10-ubi/arch/ubicom32/include/asm/board.h      2009-12-11 11:45:11.000000000 +0200
+--- /dev/null
++++ b/arch/ubicom32/include/asm/board.h
 @@ -0,0 +1,34 @@
 +/*
 + * arch/ubicom32/include/asm/board.h
 @@ -0,0 +1,34 @@
 +/*
 + * arch/ubicom32/include/asm/board.h
@@ -3760,9 +3742,8 @@ diff -ruN linux-2.6.30.10/arch/ubicom32/include/asm/board.h linux-2.6.30.10-ubi/
 +extern void __init board_init(void);
 +
 +#endif /* _ASM_UBICOM32_BOARD_H */
 +extern void __init board_init(void);
 +
 +#endif /* _ASM_UBICOM32_BOARD_H */
-diff -ruN linux-2.6.30.10/arch/ubicom32/include/asm/bootargs.h linux-2.6.30.10-ubi/arch/ubicom32/include/asm/bootargs.h
---- linux-2.6.30.10/arch/ubicom32/include/asm/bootargs.h       1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.30.10-ubi/arch/ubicom32/include/asm/bootargs.h   2009-12-11 11:45:11.000000000 +0200
+--- /dev/null
++++ b/arch/ubicom32/include/asm/bootargs.h
 @@ -0,0 +1,34 @@
 +/*
 + * arch/ubicom32/include/asm/bootargs.h
 @@ -0,0 +1,34 @@
 +/*
 + * arch/ubicom32/include/asm/bootargs.h
@@ -3798,9 +3779,8 @@ diff -ruN linux-2.6.30.10/arch/ubicom32/include/asm/bootargs.h linux-2.6.30.10-u
 +extern void __init bootargs_init(void);
 +
 +#endif /* _ASM_UBICOM32_BOOTARGS_H */
 +extern void __init bootargs_init(void);
 +
 +#endif /* _ASM_UBICOM32_BOOTARGS_H */
-diff -ruN linux-2.6.30.10/arch/ubicom32/include/asm/bootinfo.h linux-2.6.30.10-ubi/arch/ubicom32/include/asm/bootinfo.h
---- linux-2.6.30.10/arch/ubicom32/include/asm/bootinfo.h       1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.30.10-ubi/arch/ubicom32/include/asm/bootinfo.h   2009-12-11 11:45:11.000000000 +0200
+--- /dev/null
++++ b/arch/ubicom32/include/asm/bootinfo.h
 @@ -0,0 +1,34 @@
 +/*
 + * arch/ubicom32/include/asm/bootinfo.h
 @@ -0,0 +1,34 @@
 +/*
 + * arch/ubicom32/include/asm/bootinfo.h
@@ -3836,9 +3816,8 @@ diff -ruN linux-2.6.30.10/arch/ubicom32/include/asm/bootinfo.h linux-2.6.30.10-u
 +/* Nothing for ubicom32 */
 +
 +#endif /* _ASM_UBICOM32_BOOTINFO_H */
 +/* Nothing for ubicom32 */
 +
 +#endif /* _ASM_UBICOM32_BOOTINFO_H */
-diff -ruN linux-2.6.30.10/arch/ubicom32/include/asm/bug.h linux-2.6.30.10-ubi/arch/ubicom32/include/asm/bug.h
---- linux-2.6.30.10/arch/ubicom32/include/asm/bug.h    1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.30.10-ubi/arch/ubicom32/include/asm/bug.h        2009-12-11 11:45:11.000000000 +0200
+--- /dev/null
++++ b/arch/ubicom32/include/asm/bug.h
 @@ -0,0 +1,95 @@
 +/*
 + * arch/ubicom32/include/asm/bug.h
 @@ -0,0 +1,95 @@
 +/*
 + * arch/ubicom32/include/asm/bug.h
@@ -3935,9 +3914,8 @@ diff -ruN linux-2.6.30.10/arch/ubicom32/include/asm/bug.h linux-2.6.30.10-ubi/ar
 +#include <asm-generic/bug.h>
 +
 +#endif /* _ASM_UBICOM32_BUG_H */
 +#include <asm-generic/bug.h>
 +
 +#endif /* _ASM_UBICOM32_BUG_H */
-diff -ruN linux-2.6.30.10/arch/ubicom32/include/asm/bugs.h linux-2.6.30.10-ubi/arch/ubicom32/include/asm/bugs.h
---- linux-2.6.30.10/arch/ubicom32/include/asm/bugs.h   1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.30.10-ubi/arch/ubicom32/include/asm/bugs.h       2009-12-11 11:45:11.000000000 +0200
+--- /dev/null
++++ b/arch/ubicom32/include/asm/bugs.h
 @@ -0,0 +1,44 @@
 +/*
 + * arch/ubicom32/include/asm/bugs.h
 @@ -0,0 +1,44 @@
 +/*
 + * arch/ubicom32/include/asm/bugs.h
@@ -3983,9 +3961,8 @@ diff -ruN linux-2.6.30.10/arch/ubicom32/include/asm/bugs.h linux-2.6.30.10-ubi/a
 +}
 +
 +#endif /* _ASM_UBICOM32_BUGS_H */
 +}
 +
 +#endif /* _ASM_UBICOM32_BUGS_H */
-diff -ruN linux-2.6.30.10/arch/ubicom32/include/asm/byteorder.h linux-2.6.30.10-ubi/arch/ubicom32/include/asm/byteorder.h
---- linux-2.6.30.10/arch/ubicom32/include/asm/byteorder.h      1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.30.10-ubi/arch/ubicom32/include/asm/byteorder.h  2009-12-11 11:45:11.000000000 +0200
+--- /dev/null
++++ b/arch/ubicom32/include/asm/byteorder.h
 @@ -0,0 +1,33 @@
 +/*
 + * arch/ubicom32/include/asm/byteorder.h
 @@ -0,0 +1,33 @@
 +/*
 + * arch/ubicom32/include/asm/byteorder.h
@@ -4020,9 +3997,8 @@ diff -ruN linux-2.6.30.10/arch/ubicom32/include/asm/byteorder.h linux-2.6.30.10-
 +#include <linux/byteorder/big_endian.h>
 +
 +#endif /* _ASM_UBICOM32_BYTEORDER_H */
 +#include <linux/byteorder/big_endian.h>
 +
 +#endif /* _ASM_UBICOM32_BYTEORDER_H */
-diff -ruN linux-2.6.30.10/arch/ubicom32/include/asm/cachectl.h linux-2.6.30.10-ubi/arch/ubicom32/include/asm/cachectl.h
---- linux-2.6.30.10/arch/ubicom32/include/asm/cachectl.h       1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.30.10-ubi/arch/ubicom32/include/asm/cachectl.h   2009-12-11 11:45:11.000000000 +0200
+--- /dev/null
++++ b/arch/ubicom32/include/asm/cachectl.h
 @@ -0,0 +1,39 @@
 +/*
 + * arch/ubicom32/include/asm/cachectl.h
 @@ -0,0 +1,39 @@
 +/*
 + * arch/ubicom32/include/asm/cachectl.h
@@ -4063,9 +4039,8 @@ diff -ruN linux-2.6.30.10/arch/ubicom32/include/asm/cachectl.h linux-2.6.30.10-u
 +extern void mem_cache_control(unsigned long cc, unsigned long begin_addr, unsigned long end_addr, unsigned long op);
 +
 +#endif /* _ASM_UBICOM32_CACHECTL_H */
 +extern void mem_cache_control(unsigned long cc, unsigned long begin_addr, unsigned long end_addr, unsigned long op);
 +
 +#endif /* _ASM_UBICOM32_CACHECTL_H */
-diff -ruN linux-2.6.30.10/arch/ubicom32/include/asm/cacheflush.h linux-2.6.30.10-ubi/arch/ubicom32/include/asm/cacheflush.h
---- linux-2.6.30.10/arch/ubicom32/include/asm/cacheflush.h     1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.30.10-ubi/arch/ubicom32/include/asm/cacheflush.h 2009-12-11 11:45:11.000000000 +0200
+--- /dev/null
++++ b/arch/ubicom32/include/asm/cacheflush.h
 @@ -0,0 +1,111 @@
 +/*
 + * arch/ubicom32/include/asm/cacheflush.h
 @@ -0,0 +1,111 @@
 +/*
 + * arch/ubicom32/include/asm/cacheflush.h
@@ -4178,9 +4153,8 @@ diff -ruN linux-2.6.30.10/arch/ubicom32/include/asm/cacheflush.h linux-2.6.30.10
 +}
 +
 +#endif /* _ASM_UBICOM32_CACHEFLUSH_H */
 +}
 +
 +#endif /* _ASM_UBICOM32_CACHEFLUSH_H */
-diff -ruN linux-2.6.30.10/arch/ubicom32/include/asm/cache.h linux-2.6.30.10-ubi/arch/ubicom32/include/asm/cache.h
---- linux-2.6.30.10/arch/ubicom32/include/asm/cache.h  1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.30.10-ubi/arch/ubicom32/include/asm/cache.h      2009-12-11 11:45:11.000000000 +0200
+--- /dev/null
++++ b/arch/ubicom32/include/asm/cache.h
 @@ -0,0 +1,40 @@
 +/*
 + * arch/ubicom32/include/asm/cache.h
 @@ -0,0 +1,40 @@
 +/*
 + * arch/ubicom32/include/asm/cache.h
@@ -4222,9 +4196,8 @@ diff -ruN linux-2.6.30.10/arch/ubicom32/include/asm/cache.h linux-2.6.30.10-ubi/
 +#define ____cacheline_aligned
 +
 +#endif /* _ASM_UBICOM32_CACHE_H */
 +#define ____cacheline_aligned
 +
 +#endif /* _ASM_UBICOM32_CACHE_H */
-diff -ruN linux-2.6.30.10/arch/ubicom32/include/asm/checksum.h linux-2.6.30.10-ubi/arch/ubicom32/include/asm/checksum.h
---- linux-2.6.30.10/arch/ubicom32/include/asm/checksum.h       1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.30.10-ubi/arch/ubicom32/include/asm/checksum.h   2009-12-11 11:45:11.000000000 +0200
+--- /dev/null
++++ b/arch/ubicom32/include/asm/checksum.h
 @@ -0,0 +1,149 @@
 +/*
 + * arch/ubicom32/include/asm/checksum.h
 @@ -0,0 +1,149 @@
 +/*
 + * arch/ubicom32/include/asm/checksum.h
@@ -4375,9 +4348,8 @@ diff -ruN linux-2.6.30.10/arch/ubicom32/include/asm/checksum.h linux-2.6.30.10-u
 +}
 +
 +#endif /* _ASM_UBICOM32_CHECKSUM_H */
 +}
 +
 +#endif /* _ASM_UBICOM32_CHECKSUM_H */
-diff -ruN linux-2.6.30.10/arch/ubicom32/include/asm/cpu.h linux-2.6.30.10-ubi/arch/ubicom32/include/asm/cpu.h
---- linux-2.6.30.10/arch/ubicom32/include/asm/cpu.h    1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.30.10-ubi/arch/ubicom32/include/asm/cpu.h        2009-12-11 11:45:11.000000000 +0200
+--- /dev/null
++++ b/arch/ubicom32/include/asm/cpu.h
 @@ -0,0 +1,45 @@
 +/*
 + * arch/ubicom32/include/asm/cpu.h
 @@ -0,0 +1,45 @@
 +/*
 + * arch/ubicom32/include/asm/cpu.h
@@ -4424,9 +4396,8 @@ diff -ruN linux-2.6.30.10/arch/ubicom32/include/asm/cpu.h linux-2.6.30.10-ubi/ar
 +DECLARE_PER_CPU(struct cpuinfo_ubicom32, cpu_data);
 +
 +#endif /* _ASM_UBICOM32_CPU_H */
 +DECLARE_PER_CPU(struct cpuinfo_ubicom32, cpu_data);
 +
 +#endif /* _ASM_UBICOM32_CPU_H */
-diff -ruN linux-2.6.30.10/arch/ubicom32/include/asm/cputime.h linux-2.6.30.10-ubi/arch/ubicom32/include/asm/cputime.h
---- linux-2.6.30.10/arch/ubicom32/include/asm/cputime.h        1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.30.10-ubi/arch/ubicom32/include/asm/cputime.h    2009-12-11 11:45:11.000000000 +0200
+--- /dev/null
++++ b/arch/ubicom32/include/asm/cputime.h
 @@ -0,0 +1,33 @@
 +/*
 + * arch/ubicom32/include/asm/cputime.h
 @@ -0,0 +1,33 @@
 +/*
 + * arch/ubicom32/include/asm/cputime.h
@@ -4461,9 +4432,8 @@ diff -ruN linux-2.6.30.10/arch/ubicom32/include/asm/cputime.h linux-2.6.30.10-ub
 +#include <asm-generic/cputime.h>
 +
 +#endif /* _ASM_UBICOM32_CPUTIME_H */
 +#include <asm-generic/cputime.h>
 +
 +#endif /* _ASM_UBICOM32_CPUTIME_H */
-diff -ruN linux-2.6.30.10/arch/ubicom32/include/asm/current.h linux-2.6.30.10-ubi/arch/ubicom32/include/asm/current.h
---- linux-2.6.30.10/arch/ubicom32/include/asm/current.h        1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.30.10-ubi/arch/ubicom32/include/asm/current.h    2009-12-11 11:45:11.000000000 +0200
+--- /dev/null
++++ b/arch/ubicom32/include/asm/current.h
 @@ -0,0 +1,44 @@
 +/*
 + * arch/ubicom32/include/asm/current.h
 @@ -0,0 +1,44 @@
 +/*
 + * arch/ubicom32/include/asm/current.h
@@ -4509,9 +4479,8 @@ diff -ruN linux-2.6.30.10/arch/ubicom32/include/asm/current.h linux-2.6.30.10-ub
 +#define       current get_current()
 +
 +#endif /* _ASM_UBICOM32_CURRENT_H */
 +#define       current get_current()
 +
 +#endif /* _ASM_UBICOM32_CURRENT_H */
-diff -ruN linux-2.6.30.10/arch/ubicom32/include/asm/delay.h linux-2.6.30.10-ubi/arch/ubicom32/include/asm/delay.h
---- linux-2.6.30.10/arch/ubicom32/include/asm/delay.h  1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.30.10-ubi/arch/ubicom32/include/asm/delay.h      2009-12-11 11:45:11.000000000 +0200
+--- /dev/null
++++ b/arch/ubicom32/include/asm/delay.h
 @@ -0,0 +1,75 @@
 +/*
 + * arch/ubicom32/include/asm/delay.h
 @@ -0,0 +1,75 @@
 +/*
 + * arch/ubicom32/include/asm/delay.h
@@ -4588,9 +4557,8 @@ diff -ruN linux-2.6.30.10/arch/ubicom32/include/asm/delay.h linux-2.6.30.10-ubi/
 +extern void udelay(unsigned long usecs);
 +
 +#endif /* _ASM_UBICOM32_DELAY_H */
 +extern void udelay(unsigned long usecs);
 +
 +#endif /* _ASM_UBICOM32_DELAY_H */
-diff -ruN linux-2.6.30.10/arch/ubicom32/include/asm/device.h linux-2.6.30.10-ubi/arch/ubicom32/include/asm/device.h
---- linux-2.6.30.10/arch/ubicom32/include/asm/device.h 1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.30.10-ubi/arch/ubicom32/include/asm/device.h     2009-12-11 11:45:11.000000000 +0200
+--- /dev/null
++++ b/arch/ubicom32/include/asm/device.h
 @@ -0,0 +1,35 @@
 +/*
 + * arch/ubicom32/include/asm/device.h
 @@ -0,0 +1,35 @@
 +/*
 + * arch/ubicom32/include/asm/device.h
@@ -4627,9 +4595,8 @@ diff -ruN linux-2.6.30.10/arch/ubicom32/include/asm/device.h linux-2.6.30.10-ubi
 +#include <asm-generic/device.h>
 +
 +#endif /* _ASM_UBICOM32_DEVICE_H */
 +#include <asm-generic/device.h>
 +
 +#endif /* _ASM_UBICOM32_DEVICE_H */
-diff -ruN linux-2.6.30.10/arch/ubicom32/include/asm/devtree.h linux-2.6.30.10-ubi/arch/ubicom32/include/asm/devtree.h
---- linux-2.6.30.10/arch/ubicom32/include/asm/devtree.h        1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.30.10-ubi/arch/ubicom32/include/asm/devtree.h    2009-12-11 11:45:11.000000000 +0200
+--- /dev/null
++++ b/arch/ubicom32/include/asm/devtree.h
 @@ -0,0 +1,52 @@
 +/*
 + * arch/ubicom32/include/asm/devtree.h
 @@ -0,0 +1,52 @@
 +/*
 + * arch/ubicom32/include/asm/devtree.h
@@ -4683,9 +4650,8 @@ diff -ruN linux-2.6.30.10/arch/ubicom32/include/asm/devtree.h linux-2.6.30.10-ub
 +extern void devtree_print(void);
 +
 +#endif /* _ASM_UBICOM32_DEVTREE_H */
 +extern void devtree_print(void);
 +
 +#endif /* _ASM_UBICOM32_DEVTREE_H */
-diff -ruN linux-2.6.30.10/arch/ubicom32/include/asm/div64.h linux-2.6.30.10-ubi/arch/ubicom32/include/asm/div64.h
---- linux-2.6.30.10/arch/ubicom32/include/asm/div64.h  1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.30.10-ubi/arch/ubicom32/include/asm/div64.h      2009-12-11 11:45:11.000000000 +0200
+--- /dev/null
++++ b/arch/ubicom32/include/asm/div64.h
 @@ -0,0 +1,33 @@
 +/*
 + * arch/ubicom32/include/asm/div64.h
 @@ -0,0 +1,33 @@
 +/*
 + * arch/ubicom32/include/asm/div64.h
@@ -4720,9 +4686,8 @@ diff -ruN linux-2.6.30.10/arch/ubicom32/include/asm/div64.h linux-2.6.30.10-ubi/
 +#include <asm-generic/div64.h>
 +
 +#endif /* _ASM_UBICOM32_DIV64_H */
 +#include <asm-generic/div64.h>
 +
 +#endif /* _ASM_UBICOM32_DIV64_H */
-diff -ruN linux-2.6.30.10/arch/ubicom32/include/asm/dma.h linux-2.6.30.10-ubi/arch/ubicom32/include/asm/dma.h
---- linux-2.6.30.10/arch/ubicom32/include/asm/dma.h    1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.30.10-ubi/arch/ubicom32/include/asm/dma.h        2009-12-11 11:45:11.000000000 +0200
+--- /dev/null
++++ b/arch/ubicom32/include/asm/dma.h
 @@ -0,0 +1,34 @@
 +/*
 + * arch/ubicom32/include/asm/dma.h
 @@ -0,0 +1,34 @@
 +/*
 + * arch/ubicom32/include/asm/dma.h
@@ -4758,9 +4723,8 @@ diff -ruN linux-2.6.30.10/arch/ubicom32/include/asm/dma.h linux-2.6.30.10-ubi/ar
 +#define MAX_DMA_ADDRESS 0x00  /* This is quite suspicious */
 +
 +#endif /* _ASM_UBICOM32_DMA_H */
 +#define MAX_DMA_ADDRESS 0x00  /* This is quite suspicious */
 +
 +#endif /* _ASM_UBICOM32_DMA_H */
-diff -ruN linux-2.6.30.10/arch/ubicom32/include/asm/dma-mapping.h linux-2.6.30.10-ubi/arch/ubicom32/include/asm/dma-mapping.h
---- linux-2.6.30.10/arch/ubicom32/include/asm/dma-mapping.h    1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.30.10-ubi/arch/ubicom32/include/asm/dma-mapping.h        2009-12-11 11:45:11.000000000 +0200
+--- /dev/null
++++ b/arch/ubicom32/include/asm/dma-mapping.h
 @@ -0,0 +1,328 @@
 +/*
 + * arch/ubicom32/include/asm/dma-mapping.h
 @@ -0,0 +1,328 @@
 +/*
 + * arch/ubicom32/include/asm/dma-mapping.h
@@ -5090,9 +5054,8 @@ diff -ruN linux-2.6.30.10/arch/ubicom32/include/asm/dma-mapping.h linux-2.6.30.1
 +}
 +
 +#endif /* _ASM_UBICOM32_DMA_MAPPING_H */
 +}
 +
 +#endif /* _ASM_UBICOM32_DMA_MAPPING_H */
-diff -ruN linux-2.6.30.10/arch/ubicom32/include/asm/elf.h linux-2.6.30.10-ubi/arch/ubicom32/include/asm/elf.h
---- linux-2.6.30.10/arch/ubicom32/include/asm/elf.h    1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.30.10-ubi/arch/ubicom32/include/asm/elf.h        2009-12-11 11:45:11.000000000 +0200
+--- /dev/null
++++ b/arch/ubicom32/include/asm/elf.h
 @@ -0,0 +1,173 @@
 +/*
 + * arch/ubicom32/include/asm/elf.h
 @@ -0,0 +1,173 @@
 +/*
 + * arch/ubicom32/include/asm/elf.h
@@ -5267,9 +5230,8 @@ diff -ruN linux-2.6.30.10/arch/ubicom32/include/asm/elf.h linux-2.6.30.10-ubi/ar
 +#define SET_PERSONALITY(ex, ibcs2) set_personality((ibcs2)?PER_SVR4:PER_LINUX)
 +
 +#endif /* _ASM_UBICOM32_ELF_H */
 +#define SET_PERSONALITY(ex, ibcs2) set_personality((ibcs2)?PER_SVR4:PER_LINUX)
 +
 +#endif /* _ASM_UBICOM32_ELF_H */
-diff -ruN linux-2.6.30.10/arch/ubicom32/include/asm/emergency-restart.h linux-2.6.30.10-ubi/arch/ubicom32/include/asm/emergency-restart.h
---- linux-2.6.30.10/arch/ubicom32/include/asm/emergency-restart.h      1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.30.10-ubi/arch/ubicom32/include/asm/emergency-restart.h  2009-12-11 11:45:11.000000000 +0200
+--- /dev/null
++++ b/arch/ubicom32/include/asm/emergency-restart.h
 @@ -0,0 +1,33 @@
 +/*
 + * arch/ubicom32/include/asm/emergency-restart.h
 @@ -0,0 +1,33 @@
 +/*
 + * arch/ubicom32/include/asm/emergency-restart.h
@@ -5304,9 +5266,8 @@ diff -ruN linux-2.6.30.10/arch/ubicom32/include/asm/emergency-restart.h linux-2.
 +#include <asm-generic/emergency-restart.h>
 +
 +#endif /* _ASM_UBICOM32_EMERGENCY_RESTART_H */
 +#include <asm-generic/emergency-restart.h>
 +
 +#endif /* _ASM_UBICOM32_EMERGENCY_RESTART_H */
-diff -ruN linux-2.6.30.10/arch/ubicom32/include/asm/entry.h linux-2.6.30.10-ubi/arch/ubicom32/include/asm/entry.h
---- linux-2.6.30.10/arch/ubicom32/include/asm/entry.h  1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.30.10-ubi/arch/ubicom32/include/asm/entry.h      2009-12-11 11:45:11.000000000 +0200
+--- /dev/null
++++ b/arch/ubicom32/include/asm/entry.h
 @@ -0,0 +1,34 @@
 +/*
 + * arch/ubicom32/include/asm/entry.h
 @@ -0,0 +1,34 @@
 +/*
 + * arch/ubicom32/include/asm/entry.h
@@ -5342,9 +5303,8 @@ diff -ruN linux-2.6.30.10/arch/ubicom32/include/asm/entry.h linux-2.6.30.10-ubi/
 +#include <asm/page.h>
 +
 +#endif /* _ASM_UBICOM32_ENTRY_H */
 +#include <asm/page.h>
 +
 +#endif /* _ASM_UBICOM32_ENTRY_H */
-diff -ruN linux-2.6.30.10/arch/ubicom32/include/asm/errno.h linux-2.6.30.10-ubi/arch/ubicom32/include/asm/errno.h
---- linux-2.6.30.10/arch/ubicom32/include/asm/errno.h  1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.30.10-ubi/arch/ubicom32/include/asm/errno.h      2009-12-11 11:45:11.000000000 +0200
+--- /dev/null
++++ b/arch/ubicom32/include/asm/errno.h
 @@ -0,0 +1,33 @@
 +/*
 + * arch/ubicom32/include/asm/errno.h
 @@ -0,0 +1,33 @@
 +/*
 + * arch/ubicom32/include/asm/errno.h
@@ -5379,9 +5339,8 @@ diff -ruN linux-2.6.30.10/arch/ubicom32/include/asm/errno.h linux-2.6.30.10-ubi/
 +#include <asm-generic/errno.h>
 +
 +#endif /* _ASM_UBICOM32_ERRNO_H */
 +#include <asm-generic/errno.h>
 +
 +#endif /* _ASM_UBICOM32_ERRNO_H */
-diff -ruN linux-2.6.30.10/arch/ubicom32/include/asm/fb.h linux-2.6.30.10-ubi/arch/ubicom32/include/asm/fb.h
---- linux-2.6.30.10/arch/ubicom32/include/asm/fb.h     1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.30.10-ubi/arch/ubicom32/include/asm/fb.h 2009-12-11 11:45:11.000000000 +0200
+--- /dev/null
++++ b/arch/ubicom32/include/asm/fb.h
 @@ -0,0 +1,39 @@
 +/*
 + * arch/ubicom32/include/asm/fb.h
 @@ -0,0 +1,39 @@
 +/*
 + * arch/ubicom32/include/asm/fb.h
@@ -5422,9 +5381,8 @@ diff -ruN linux-2.6.30.10/arch/ubicom32/include/asm/fb.h linux-2.6.30.10-ubi/arc
 +}
 +
 +#endif /* _ASM_UBICOM32_FB_H */
 +}
 +
 +#endif /* _ASM_UBICOM32_FB_H */
-diff -ruN linux-2.6.30.10/arch/ubicom32/include/asm/fcntl.h linux-2.6.30.10-ubi/arch/ubicom32/include/asm/fcntl.h
---- linux-2.6.30.10/arch/ubicom32/include/asm/fcntl.h  1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.30.10-ubi/arch/ubicom32/include/asm/fcntl.h      2009-12-11 11:45:11.000000000 +0200
+--- /dev/null
++++ b/arch/ubicom32/include/asm/fcntl.h
 @@ -0,0 +1,38 @@
 +/*
 + * arch/ubicom32/include/asm/fcntl.h
 @@ -0,0 +1,38 @@
 +/*
 + * arch/ubicom32/include/asm/fcntl.h
@@ -5464,9 +5422,8 @@ diff -ruN linux-2.6.30.10/arch/ubicom32/include/asm/fcntl.h linux-2.6.30.10-ubi/
 +#include <asm-generic/fcntl.h>
 +
 +#endif /* _ASM_UBICOM32_FCNTL_H */
 +#include <asm-generic/fcntl.h>
 +
 +#endif /* _ASM_UBICOM32_FCNTL_H */
-diff -ruN linux-2.6.30.10/arch/ubicom32/include/asm/flat.h linux-2.6.30.10-ubi/arch/ubicom32/include/asm/flat.h
---- linux-2.6.30.10/arch/ubicom32/include/asm/flat.h   1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.30.10-ubi/arch/ubicom32/include/asm/flat.h       2009-12-11 11:45:11.000000000 +0200
+--- /dev/null
++++ b/arch/ubicom32/include/asm/flat.h
 @@ -0,0 +1,73 @@
 +/*
 + * arch/ubicom32/include/asm/flat.h
 @@ -0,0 +1,73 @@
 +/*
 + * arch/ubicom32/include/asm/flat.h
@@ -5541,9 +5498,8 @@ diff -ruN linux-2.6.30.10/arch/ubicom32/include/asm/flat.h linux-2.6.30.10-ubi/a
 +}
 +
 +#endif /* _ASM_UBICOM32_FLAT_H */
 +}
 +
 +#endif /* _ASM_UBICOM32_FLAT_H */
-diff -ruN linux-2.6.30.10/arch/ubicom32/include/asm/fpu.h linux-2.6.30.10-ubi/arch/ubicom32/include/asm/fpu.h
---- linux-2.6.30.10/arch/ubicom32/include/asm/fpu.h    1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.30.10-ubi/arch/ubicom32/include/asm/fpu.h        2009-12-11 11:45:11.000000000 +0200
+--- /dev/null
++++ b/arch/ubicom32/include/asm/fpu.h
 @@ -0,0 +1,37 @@
 +/*
 + * arch/ubicom32/include/asm/fpu.h
 @@ -0,0 +1,37 @@
 +/*
 + * arch/ubicom32/include/asm/fpu.h
@@ -5582,14 +5538,12 @@ diff -ruN linux-2.6.30.10/arch/ubicom32/include/asm/fpu.h linux-2.6.30.10-ubi/ar
 +#define FPSTATESIZE (2) /* dummy size */
 +
 +#endif /* _ASM_UBICOM32_FPU_H */
 +#define FPSTATESIZE (2) /* dummy size */
 +
 +#endif /* _ASM_UBICOM32_FPU_H */
-diff -ruN linux-2.6.30.10/arch/ubicom32/include/asm/ftrace.h linux-2.6.30.10-ubi/arch/ubicom32/include/asm/ftrace.h
---- linux-2.6.30.10/arch/ubicom32/include/asm/ftrace.h 1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.30.10-ubi/arch/ubicom32/include/asm/ftrace.h     2009-12-11 11:45:11.000000000 +0200
+--- /dev/null
++++ b/arch/ubicom32/include/asm/ftrace.h
 @@ -0,0 +1 @@
 +/* empty */
 @@ -0,0 +1 @@
 +/* empty */
-diff -ruN linux-2.6.30.10/arch/ubicom32/include/asm/futex.h linux-2.6.30.10-ubi/arch/ubicom32/include/asm/futex.h
---- linux-2.6.30.10/arch/ubicom32/include/asm/futex.h  1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.30.10-ubi/arch/ubicom32/include/asm/futex.h      2009-12-11 11:45:11.000000000 +0200
+--- /dev/null
++++ b/arch/ubicom32/include/asm/futex.h
 @@ -0,0 +1,33 @@
 +/*
 + * arch/ubicom32/include/asm/futex.h
 @@ -0,0 +1,33 @@
 +/*
 + * arch/ubicom32/include/asm/futex.h
@@ -5624,14 +5578,12 @@ diff -ruN linux-2.6.30.10/arch/ubicom32/include/asm/futex.h linux-2.6.30.10-ubi/
 +#include <asm-generic/futex.h>
 +
 +#endif /* _ASM_UBICOM32_FUTEX_H */
 +#include <asm-generic/futex.h>
 +
 +#endif /* _ASM_UBICOM32_FUTEX_H */
-diff -ruN linux-2.6.30.10/arch/ubicom32/include/asm/.gitignore linux-2.6.30.10-ubi/arch/ubicom32/include/asm/.gitignore
---- linux-2.6.30.10/arch/ubicom32/include/asm/.gitignore       1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.30.10-ubi/arch/ubicom32/include/asm/.gitignore   2009-12-11 11:45:11.000000000 +0200
+--- /dev/null
++++ b/arch/ubicom32/include/asm/.gitignore
 @@ -0,0 +1 @@
 +/ocm_size.h
 @@ -0,0 +1 @@
 +/ocm_size.h
-diff -ruN linux-2.6.30.10/arch/ubicom32/include/asm/gpio.h linux-2.6.30.10-ubi/arch/ubicom32/include/asm/gpio.h
---- linux-2.6.30.10/arch/ubicom32/include/asm/gpio.h   1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.30.10-ubi/arch/ubicom32/include/asm/gpio.h       2009-12-11 11:45:11.000000000 +0200
+--- /dev/null
++++ b/arch/ubicom32/include/asm/gpio.h
 @@ -0,0 +1,453 @@
 +/*
 + * arch/ubicom32/include/asm/gpio.h
 @@ -0,0 +1,453 @@
 +/*
 + * arch/ubicom32/include/asm/gpio.h
@@ -6086,9 +6038,8 @@ diff -ruN linux-2.6.30.10/arch/ubicom32/include/asm/gpio.h linux-2.6.30.10-ubi/a
 +extern int __init ubi_gpio_init(void);
 +
 +#endif /* _ASM_UBICOM32_GPIO_H */
 +extern int __init ubi_gpio_init(void);
 +
 +#endif /* _ASM_UBICOM32_GPIO_H */
-diff -ruN linux-2.6.30.10/arch/ubicom32/include/asm/hardirq.h linux-2.6.30.10-ubi/arch/ubicom32/include/asm/hardirq.h
---- linux-2.6.30.10/arch/ubicom32/include/asm/hardirq.h        1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.30.10-ubi/arch/ubicom32/include/asm/hardirq.h    2009-12-11 11:45:11.000000000 +0200
+--- /dev/null
++++ b/arch/ubicom32/include/asm/hardirq.h
 @@ -0,0 +1,55 @@
 +/*
 + * arch/ubicom32/include/asm/hardirq.h
 @@ -0,0 +1,55 @@
 +/*
 + * arch/ubicom32/include/asm/hardirq.h
@@ -6145,9 +6096,8 @@ diff -ruN linux-2.6.30.10/arch/ubicom32/include/asm/hardirq.h linux-2.6.30.10-ub
 +extern void ack_bad_irq(unsigned int irq);
 +
 +#endif /* _ASM_UBICOM32_HARDIRQ_H */
 +extern void ack_bad_irq(unsigned int irq);
 +
 +#endif /* _ASM_UBICOM32_HARDIRQ_H */
-diff -ruN linux-2.6.30.10/arch/ubicom32/include/asm/hw_irq.h linux-2.6.30.10-ubi/arch/ubicom32/include/asm/hw_irq.h
---- linux-2.6.30.10/arch/ubicom32/include/asm/hw_irq.h 1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.30.10-ubi/arch/ubicom32/include/asm/hw_irq.h     2009-12-11 11:45:11.000000000 +0200
+--- /dev/null
++++ b/arch/ubicom32/include/asm/hw_irq.h
 @@ -0,0 +1,31 @@
 +/*
 + * arch/ubicom32/include/asm/hw_irq.h
 @@ -0,0 +1,31 @@
 +/*
 + * arch/ubicom32/include/asm/hw_irq.h
@@ -6180,9 +6130,8 @@ diff -ruN linux-2.6.30.10/arch/ubicom32/include/asm/hw_irq.h linux-2.6.30.10-ubi
 +#define _ASM_UBICOM32_HW_IRQ_H
 +
 +#endif /* _ASM_UBICOM32_HW_IRQ_H */
 +#define _ASM_UBICOM32_HW_IRQ_H
 +
 +#endif /* _ASM_UBICOM32_HW_IRQ_H */
-diff -ruN linux-2.6.30.10/arch/ubicom32/include/asm/ioctl.h linux-2.6.30.10-ubi/arch/ubicom32/include/asm/ioctl.h
---- linux-2.6.30.10/arch/ubicom32/include/asm/ioctl.h  1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.30.10-ubi/arch/ubicom32/include/asm/ioctl.h      2009-12-11 11:45:11.000000000 +0200
+--- /dev/null
++++ b/arch/ubicom32/include/asm/ioctl.h
 @@ -0,0 +1,33 @@
 +/*
 + * arch/ubicom32/include/asm/ioctl.h
 @@ -0,0 +1,33 @@
 +/*
 + * arch/ubicom32/include/asm/ioctl.h
@@ -6217,9 +6166,8 @@ diff -ruN linux-2.6.30.10/arch/ubicom32/include/asm/ioctl.h linux-2.6.30.10-ubi/
 +#include <asm-generic/ioctl.h>
 +
 +#endif /* _ASM_UBICOM32_IOCTL_H */
 +#include <asm-generic/ioctl.h>
 +
 +#endif /* _ASM_UBICOM32_IOCTL_H */
-diff -ruN linux-2.6.30.10/arch/ubicom32/include/asm/ioctls.h linux-2.6.30.10-ubi/arch/ubicom32/include/asm/ioctls.h
---- linux-2.6.30.10/arch/ubicom32/include/asm/ioctls.h 1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.30.10-ubi/arch/ubicom32/include/asm/ioctls.h     2009-12-11 11:45:11.000000000 +0200
+--- /dev/null
++++ b/arch/ubicom32/include/asm/ioctls.h
 @@ -0,0 +1,111 @@
 +/*
 + * arch/ubicom32/include/asm/ioctls.h
 @@ -0,0 +1,111 @@
 +/*
 + * arch/ubicom32/include/asm/ioctls.h
@@ -6332,9 +6280,8 @@ diff -ruN linux-2.6.30.10/arch/ubicom32/include/asm/ioctls.h linux-2.6.30.10-ubi
 +#define TIOCSER_TEMT    0x01  /* Transmitter physically empty */
 +
 +#endif /* _ASM_UBICOM32_IOCTLS_H */
 +#define TIOCSER_TEMT    0x01  /* Transmitter physically empty */
 +
 +#endif /* _ASM_UBICOM32_IOCTLS_H */
-diff -ruN linux-2.6.30.10/arch/ubicom32/include/asm/io.h linux-2.6.30.10-ubi/arch/ubicom32/include/asm/io.h
---- linux-2.6.30.10/arch/ubicom32/include/asm/io.h     1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.30.10-ubi/arch/ubicom32/include/asm/io.h 2009-12-11 11:45:11.000000000 +0200
+--- /dev/null
++++ b/arch/ubicom32/include/asm/io.h
 @@ -0,0 +1,313 @@
 +/*
 + * arch/ubicom32/include/asm/io.h
 @@ -0,0 +1,313 @@
 +/*
 + * arch/ubicom32/include/asm/io.h
@@ -6649,9 +6596,8 @@ diff -ruN linux-2.6.30.10/arch/ubicom32/include/asm/io.h linux-2.6.30.10-ubi/arc
 +#endif /* __KERNEL__ */
 +
 +#endif /* _ASM_UBICOM32_IO_H */
 +#endif /* __KERNEL__ */
 +
 +#endif /* _ASM_UBICOM32_IO_H */
-diff -ruN linux-2.6.30.10/arch/ubicom32/include/asm/ip5000-asm.h linux-2.6.30.10-ubi/arch/ubicom32/include/asm/ip5000-asm.h
---- linux-2.6.30.10/arch/ubicom32/include/asm/ip5000-asm.h     1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.30.10-ubi/arch/ubicom32/include/asm/ip5000-asm.h 2009-12-11 11:45:11.000000000 +0200
+--- /dev/null
++++ b/arch/ubicom32/include/asm/ip5000-asm.h
 @@ -0,0 +1,156 @@
 +/*
 + * arch/ubicom32/include/asm/ip5000-asm.h
 @@ -0,0 +1,156 @@
 +/*
 + * arch/ubicom32/include/asm/ip5000-asm.h
@@ -6809,9 +6755,8 @@ diff -ruN linux-2.6.30.10/arch/ubicom32/include/asm/ip5000-asm.h linux-2.6.30.10
 +
 +#endif /* !defined(__LINKER__) */
 +#endif /* defined _ASM_UBICOM32_IP5000_ASM_H */
 +
 +#endif /* !defined(__LINKER__) */
 +#endif /* defined _ASM_UBICOM32_IP5000_ASM_H */
-diff -ruN linux-2.6.30.10/arch/ubicom32/include/asm/ip5000.h linux-2.6.30.10-ubi/arch/ubicom32/include/asm/ip5000.h
---- linux-2.6.30.10/arch/ubicom32/include/asm/ip5000.h 1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.30.10-ubi/arch/ubicom32/include/asm/ip5000.h     2009-12-11 11:45:11.000000000 +0200
+--- /dev/null
++++ b/arch/ubicom32/include/asm/ip5000.h
 @@ -0,0 +1,845 @@
 +/*
 + * arch/ubicom32/include/asm/ip5000.h
 @@ -0,0 +1,845 @@
 +/*
 + * arch/ubicom32/include/asm/ip5000.h
@@ -7658,9 +7603,8 @@ diff -ruN linux-2.6.30.10/arch/ubicom32/include/asm/ip5000.h linux-2.6.30.10-ubi
 +
 +#endif /* __ASSEMBLY__ */
 +#endif /* _ASM_UBICOM32_IP5000_H */
 +
 +#endif /* __ASSEMBLY__ */
 +#endif /* _ASM_UBICOM32_IP5000_H */
-diff -ruN linux-2.6.30.10/arch/ubicom32/include/asm/ipcbuf.h linux-2.6.30.10-ubi/arch/ubicom32/include/asm/ipcbuf.h
---- linux-2.6.30.10/arch/ubicom32/include/asm/ipcbuf.h 1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.30.10-ubi/arch/ubicom32/include/asm/ipcbuf.h     2009-12-11 11:45:11.000000000 +0200
+--- /dev/null
++++ b/arch/ubicom32/include/asm/ipcbuf.h
 @@ -0,0 +1,55 @@
 +/*
 + * arch/ubicom32/include/asm/ipcbuf.h
 @@ -0,0 +1,55 @@
 +/*
 + * arch/ubicom32/include/asm/ipcbuf.h
@@ -7717,9 +7661,8 @@ diff -ruN linux-2.6.30.10/arch/ubicom32/include/asm/ipcbuf.h linux-2.6.30.10-ubi
 +};
 +
 +#endif /* _ASM_UBICOM32_IPCBUF_H */
 +};
 +
 +#endif /* _ASM_UBICOM32_IPCBUF_H */
-diff -ruN linux-2.6.30.10/arch/ubicom32/include/asm/irqflags.h linux-2.6.30.10-ubi/arch/ubicom32/include/asm/irqflags.h
---- linux-2.6.30.10/arch/ubicom32/include/asm/irqflags.h       1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.30.10-ubi/arch/ubicom32/include/asm/irqflags.h   2009-12-11 11:45:11.000000000 +0200
+--- /dev/null
++++ b/arch/ubicom32/include/asm/irqflags.h
 @@ -0,0 +1,96 @@
 +/*
 + * arch/ubicom32/include/asm/irqflags.h
 @@ -0,0 +1,96 @@
 +/*
 + * arch/ubicom32/include/asm/irqflags.h
@@ -7817,9 +7760,8 @@ diff -ruN linux-2.6.30.10/arch/ubicom32/include/asm/irqflags.h linux-2.6.30.10-u
 +}
 +
 +#endif /* _ASM_UBICOM32_IRQFLAGS_H */
 +}
 +
 +#endif /* _ASM_UBICOM32_IRQFLAGS_H */
-diff -ruN linux-2.6.30.10/arch/ubicom32/include/asm/irq.h linux-2.6.30.10-ubi/arch/ubicom32/include/asm/irq.h
---- linux-2.6.30.10/arch/ubicom32/include/asm/irq.h    1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.30.10-ubi/arch/ubicom32/include/asm/irq.h        2009-12-11 11:45:11.000000000 +0200
+--- /dev/null
++++ b/arch/ubicom32/include/asm/irq.h
 @@ -0,0 +1,45 @@
 +/*
 + * arch/ubicom32/include/asm/irq.h
 @@ -0,0 +1,45 @@
 +/*
 + * arch/ubicom32/include/asm/irq.h
@@ -7866,9 +7808,8 @@ diff -ruN linux-2.6.30.10/arch/ubicom32/include/asm/irq.h linux-2.6.30.10-ubi/ar
 +extern void do_IRQ(int irq, struct pt_regs *fp);
 +
 +#endif /* _ASM_UBICOM32_IRQ_H */
 +extern void do_IRQ(int irq, struct pt_regs *fp);
 +
 +#endif /* _ASM_UBICOM32_IRQ_H */
-diff -ruN linux-2.6.30.10/arch/ubicom32/include/asm/irq_regs.h linux-2.6.30.10-ubi/arch/ubicom32/include/asm/irq_regs.h
---- linux-2.6.30.10/arch/ubicom32/include/asm/irq_regs.h       1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.30.10-ubi/arch/ubicom32/include/asm/irq_regs.h   2009-12-11 11:45:11.000000000 +0200
+--- /dev/null
++++ b/arch/ubicom32/include/asm/irq_regs.h
 @@ -0,0 +1,33 @@
 +/*
 + * arch/ubicom32/include/asm/irq_regs.h
 @@ -0,0 +1,33 @@
 +/*
 + * arch/ubicom32/include/asm/irq_regs.h
@@ -7903,14 +7844,12 @@ diff -ruN linux-2.6.30.10/arch/ubicom32/include/asm/irq_regs.h linux-2.6.30.10-u
 +#include <asm-generic/irq_regs.h>
 +
 +#endif /* _ASM_UBICOM32_IRQ_REGS_H */
 +#include <asm-generic/irq_regs.h>
 +
 +#endif /* _ASM_UBICOM32_IRQ_REGS_H */
-diff -ruN linux-2.6.30.10/arch/ubicom32/include/asm/Kbuild linux-2.6.30.10-ubi/arch/ubicom32/include/asm/Kbuild
---- linux-2.6.30.10/arch/ubicom32/include/asm/Kbuild   1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.30.10-ubi/arch/ubicom32/include/asm/Kbuild       2009-12-11 11:45:11.000000000 +0200
+--- /dev/null
++++ b/arch/ubicom32/include/asm/Kbuild
 @@ -0,0 +1 @@
 +include include/asm-generic/Kbuild.asm
 @@ -0,0 +1 @@
 +include include/asm-generic/Kbuild.asm
-diff -ruN linux-2.6.30.10/arch/ubicom32/include/asm/kdebug.h linux-2.6.30.10-ubi/arch/ubicom32/include/asm/kdebug.h
---- linux-2.6.30.10/arch/ubicom32/include/asm/kdebug.h 1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.30.10-ubi/arch/ubicom32/include/asm/kdebug.h     2009-12-11 11:45:11.000000000 +0200
+--- /dev/null
++++ b/arch/ubicom32/include/asm/kdebug.h
 @@ -0,0 +1,33 @@
 +/*
 + * arch/ubicom32/include/asm/kdebug.h
 @@ -0,0 +1,33 @@
 +/*
 + * arch/ubicom32/include/asm/kdebug.h
@@ -7945,9 +7884,8 @@ diff -ruN linux-2.6.30.10/arch/ubicom32/include/asm/kdebug.h linux-2.6.30.10-ubi
 +#include <asm-generic/kdebug.h>
 +
 +#endif /* _ASM_UBICOM32_KDEBUG_H */
 +#include <asm-generic/kdebug.h>
 +
 +#endif /* _ASM_UBICOM32_KDEBUG_H */
-diff -ruN linux-2.6.30.10/arch/ubicom32/include/asm/kmap_types.h linux-2.6.30.10-ubi/arch/ubicom32/include/asm/kmap_types.h
---- linux-2.6.30.10/arch/ubicom32/include/asm/kmap_types.h     1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.30.10-ubi/arch/ubicom32/include/asm/kmap_types.h 2009-12-11 11:45:11.000000000 +0200
+--- /dev/null
++++ b/arch/ubicom32/include/asm/kmap_types.h
 @@ -0,0 +1,48 @@
 +/*
 + * arch/ubicom32/include/asm/kmap_types.h
 @@ -0,0 +1,48 @@
 +/*
 + * arch/ubicom32/include/asm/kmap_types.h
@@ -7997,9 +7935,8 @@ diff -ruN linux-2.6.30.10/arch/ubicom32/include/asm/kmap_types.h linux-2.6.30.10
 +};
 +
 +#endif /* _ASM_UBICOM32_KMAP_TYPES_H */
 +};
 +
 +#endif /* _ASM_UBICOM32_KMAP_TYPES_H */
-diff -ruN linux-2.6.30.10/arch/ubicom32/include/asm/ldsr.h linux-2.6.30.10-ubi/arch/ubicom32/include/asm/ldsr.h
---- linux-2.6.30.10/arch/ubicom32/include/asm/ldsr.h   1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.30.10-ubi/arch/ubicom32/include/asm/ldsr.h       2009-12-11 11:45:11.000000000 +0200
+--- /dev/null
++++ b/arch/ubicom32/include/asm/ldsr.h
 @@ -0,0 +1,186 @@
 +/*
 + * arch/ubicom32/include/asm/ldsr.h
 @@ -0,0 +1,186 @@
 +/*
 + * arch/ubicom32/include/asm/ldsr.h
@@ -8187,9 +8124,8 @@ diff -ruN linux-2.6.30.10/arch/ubicom32/include/asm/ldsr.h linux-2.6.30.10-ubi/a
 +extern thread_t ldsr_get_threadid(void);
 +
 +#endif /* _ASM_UBICOM32_LDSR_H */
 +extern thread_t ldsr_get_threadid(void);
 +
 +#endif /* _ASM_UBICOM32_LDSR_H */
-diff -ruN linux-2.6.30.10/arch/ubicom32/include/asm/linkage.h linux-2.6.30.10-ubi/arch/ubicom32/include/asm/linkage.h
---- linux-2.6.30.10/arch/ubicom32/include/asm/linkage.h        1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.30.10-ubi/arch/ubicom32/include/asm/linkage.h    2009-12-11 11:45:11.000000000 +0200
+--- /dev/null
++++ b/arch/ubicom32/include/asm/linkage.h
 @@ -0,0 +1,34 @@
 +/*
 + * arch/ubicom32/include/asm/linkage.h
 @@ -0,0 +1,34 @@
 +/*
 + * arch/ubicom32/include/asm/linkage.h
@@ -8225,9 +8161,8 @@ diff -ruN linux-2.6.30.10/arch/ubicom32/include/asm/linkage.h linux-2.6.30.10-ub
 +#define __ocm_data __section(.ocm_data)
 +
 +#endif        /* _ASM_UBICOM32_LINKAGE_H */
 +#define __ocm_data __section(.ocm_data)
 +
 +#endif        /* _ASM_UBICOM32_LINKAGE_H */
-diff -ruN linux-2.6.30.10/arch/ubicom32/include/asm/local.h linux-2.6.30.10-ubi/arch/ubicom32/include/asm/local.h
---- linux-2.6.30.10/arch/ubicom32/include/asm/local.h  1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.30.10-ubi/arch/ubicom32/include/asm/local.h      2009-12-11 11:45:11.000000000 +0200
+--- /dev/null
++++ b/arch/ubicom32/include/asm/local.h
 @@ -0,0 +1,33 @@
 +/*
 + * arch/ubicom32/include/asm/local.h
 @@ -0,0 +1,33 @@
 +/*
 + * arch/ubicom32/include/asm/local.h
@@ -8262,9 +8197,8 @@ diff -ruN linux-2.6.30.10/arch/ubicom32/include/asm/local.h linux-2.6.30.10-ubi/
 +#include <asm-generic/local.h>
 +
 +#endif /* _ASM_UBICOM32_LOCAL_H */
 +#include <asm-generic/local.h>
 +
 +#endif /* _ASM_UBICOM32_LOCAL_H */
-diff -ruN linux-2.6.30.10/arch/ubicom32/include/asm/machdep.h linux-2.6.30.10-ubi/arch/ubicom32/include/asm/machdep.h
---- linux-2.6.30.10/arch/ubicom32/include/asm/machdep.h        1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.30.10-ubi/arch/ubicom32/include/asm/machdep.h    2009-12-11 11:45:11.000000000 +0200
+--- /dev/null
++++ b/arch/ubicom32/include/asm/machdep.h
 @@ -0,0 +1,43 @@
 +/*
 + * arch/ubicom32/include/asm/machdep.h
 @@ -0,0 +1,43 @@
 +/*
 + * arch/ubicom32/include/asm/machdep.h
@@ -8309,9 +8243,8 @@ diff -ruN linux-2.6.30.10/arch/ubicom32/include/asm/machdep.h linux-2.6.30.10-ub
 +extern void config_BSP(char *command, int len);
 +
 +#endif /* _ASM_UBICOM32_MACHDEP_H */
 +extern void config_BSP(char *command, int len);
 +
 +#endif /* _ASM_UBICOM32_MACHDEP_H */
-diff -ruN linux-2.6.30.10/arch/ubicom32/include/asm/mc146818rtc.h linux-2.6.30.10-ubi/arch/ubicom32/include/asm/mc146818rtc.h
---- linux-2.6.30.10/arch/ubicom32/include/asm/mc146818rtc.h    1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.30.10-ubi/arch/ubicom32/include/asm/mc146818rtc.h        2009-12-11 11:45:11.000000000 +0200
+--- /dev/null
++++ b/arch/ubicom32/include/asm/mc146818rtc.h
 @@ -0,0 +1,36 @@
 +/*
 + * arch/ubicom32/include/asm/mc146818rtc.h
 @@ -0,0 +1,36 @@
 +/*
 + * arch/ubicom32/include/asm/mc146818rtc.h
@@ -8349,9 +8282,8 @@ diff -ruN linux-2.6.30.10/arch/ubicom32/include/asm/mc146818rtc.h linux-2.6.30.1
 +/* empty include file to satisfy the include in genrtc.c/ide-geometry.c */
 +
 +#endif /* _ASM_UBICOM32_MC146818RTC_H */
 +/* empty include file to satisfy the include in genrtc.c/ide-geometry.c */
 +
 +#endif /* _ASM_UBICOM32_MC146818RTC_H */
-diff -ruN linux-2.6.30.10/arch/ubicom32/include/asm/memory_map.h linux-2.6.30.10-ubi/arch/ubicom32/include/asm/memory_map.h
---- linux-2.6.30.10/arch/ubicom32/include/asm/memory_map.h     1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.30.10-ubi/arch/ubicom32/include/asm/memory_map.h 2009-12-11 11:45:11.000000000 +0200
+--- /dev/null
++++ b/arch/ubicom32/include/asm/memory_map.h
 @@ -0,0 +1,66 @@
 +/*
 + * arch/ubicom32/include/asm/memory_map.h
 @@ -0,0 +1,66 @@
 +/*
 + * arch/ubicom32/include/asm/memory_map.h
@@ -8419,9 +8351,8 @@ diff -ruN linux-2.6.30.10/arch/ubicom32/include/asm/memory_map.h linux-2.6.30.10
 +#define OS_SYSCALL_END         (OS_SYSCALL_BEGIN + OS_SYSCALL_SIZE)
 +
 +#endif /* _ASM_UBICOM32_MEMORY_MAP_H */
 +#define OS_SYSCALL_END         (OS_SYSCALL_BEGIN + OS_SYSCALL_SIZE)
 +
 +#endif /* _ASM_UBICOM32_MEMORY_MAP_H */
-diff -ruN linux-2.6.30.10/arch/ubicom32/include/asm/mman.h linux-2.6.30.10-ubi/arch/ubicom32/include/asm/mman.h
---- linux-2.6.30.10/arch/ubicom32/include/asm/mman.h   1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.30.10-ubi/arch/ubicom32/include/asm/mman.h       2009-12-11 11:45:11.000000000 +0200
+--- /dev/null
++++ b/arch/ubicom32/include/asm/mman.h
 @@ -0,0 +1,44 @@
 +/*
 + * arch/ubicom32/include/asm/mman.h
 @@ -0,0 +1,44 @@
 +/*
 + * arch/ubicom32/include/asm/mman.h
@@ -8467,9 +8398,8 @@ diff -ruN linux-2.6.30.10/arch/ubicom32/include/asm/mman.h linux-2.6.30.10-ubi/a
 +#define MCL_FUTURE    2               /* lock all future mappings */
 +
 +#endif /* _ASM_UBICOM32_MMAN_H */
 +#define MCL_FUTURE    2               /* lock all future mappings */
 +
 +#endif /* _ASM_UBICOM32_MMAN_H */
-diff -ruN linux-2.6.30.10/arch/ubicom32/include/asm/mmu_context.h linux-2.6.30.10-ubi/arch/ubicom32/include/asm/mmu_context.h
---- linux-2.6.30.10/arch/ubicom32/include/asm/mmu_context.h    1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.30.10-ubi/arch/ubicom32/include/asm/mmu_context.h        2009-12-11 11:45:11.000000000 +0200
+--- /dev/null
++++ b/arch/ubicom32/include/asm/mmu_context.h
 @@ -0,0 +1,60 @@
 +/*
 + * arch/ubicom32/include/asm/mmu_context.h
 @@ -0,0 +1,60 @@
 +/*
 + * arch/ubicom32/include/asm/mmu_context.h
@@ -8531,9 +8461,8 @@ diff -ruN linux-2.6.30.10/arch/ubicom32/include/asm/mmu_context.h linux-2.6.30.1
 +}
 +
 +#endif /* _ASM_UBICOM32_MMU_CONTEXT_H */
 +}
 +
 +#endif /* _ASM_UBICOM32_MMU_CONTEXT_H */
-diff -ruN linux-2.6.30.10/arch/ubicom32/include/asm/mmu.h linux-2.6.30.10-ubi/arch/ubicom32/include/asm/mmu.h
---- linux-2.6.30.10/arch/ubicom32/include/asm/mmu.h    1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.30.10-ubi/arch/ubicom32/include/asm/mmu.h        2009-12-11 11:45:11.000000000 +0200
+--- /dev/null
++++ b/arch/ubicom32/include/asm/mmu.h
 @@ -0,0 +1,41 @@
 +/*
 + * arch/ubicom32/include/asm/mmu.h
 @@ -0,0 +1,41 @@
 +/*
 + * arch/ubicom32/include/asm/mmu.h
@@ -8576,9 +8505,8 @@ diff -ruN linux-2.6.30.10/arch/ubicom32/include/asm/mmu.h linux-2.6.30.10-ubi/ar
 +} mm_context_t;
 +
 +#endif /* _ASM_UBICOM32_MMU_H */
 +} mm_context_t;
 +
 +#endif /* _ASM_UBICOM32_MMU_H */
-diff -ruN linux-2.6.30.10/arch/ubicom32/include/asm/module.h linux-2.6.30.10-ubi/arch/ubicom32/include/asm/module.h
---- linux-2.6.30.10/arch/ubicom32/include/asm/module.h 1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.30.10-ubi/arch/ubicom32/include/asm/module.h     2009-12-11 11:45:11.000000000 +0200
+--- /dev/null
++++ b/arch/ubicom32/include/asm/module.h
 @@ -0,0 +1,48 @@
 +/*
 + * arch/ubicom32/include/asm/module.h
 @@ -0,0 +1,48 @@
 +/*
 + * arch/ubicom32/include/asm/module.h
@@ -8628,9 +8556,8 @@ diff -ruN linux-2.6.30.10/arch/ubicom32/include/asm/module.h linux-2.6.30.10-ubi
 +              (mod)->module_core, (mod)->core_size, \
 +              (mod)->arch.ocm_inst, (mod)->arch.ocm_inst_size)
 +#endif /* _ASM_UBICOM32_MODULE_H */
 +              (mod)->module_core, (mod)->core_size, \
 +              (mod)->arch.ocm_inst, (mod)->arch.ocm_inst_size)
 +#endif /* _ASM_UBICOM32_MODULE_H */
-diff -ruN linux-2.6.30.10/arch/ubicom32/include/asm/msgbuf.h linux-2.6.30.10-ubi/arch/ubicom32/include/asm/msgbuf.h
---- linux-2.6.30.10/arch/ubicom32/include/asm/msgbuf.h 1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.30.10-ubi/arch/ubicom32/include/asm/msgbuf.h     2009-12-11 11:45:11.000000000 +0200
+--- /dev/null
++++ b/arch/ubicom32/include/asm/msgbuf.h
 @@ -0,0 +1,58 @@
 +/*
 + * arch/ubicom32/include/asm/msgbuf.h
 @@ -0,0 +1,58 @@
 +/*
 + * arch/ubicom32/include/asm/msgbuf.h
@@ -8690,9 +8617,8 @@ diff -ruN linux-2.6.30.10/arch/ubicom32/include/asm/msgbuf.h linux-2.6.30.10-ubi
 +};
 +
 +#endif /* _ASM_UBICOM32_MSGBUF_H */
 +};
 +
 +#endif /* _ASM_UBICOM32_MSGBUF_H */
-diff -ruN linux-2.6.30.10/arch/ubicom32/include/asm/mutex.h linux-2.6.30.10-ubi/arch/ubicom32/include/asm/mutex.h
---- linux-2.6.30.10/arch/ubicom32/include/asm/mutex.h  1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.30.10-ubi/arch/ubicom32/include/asm/mutex.h      2009-12-11 11:45:11.000000000 +0200
+--- /dev/null
++++ b/arch/ubicom32/include/asm/mutex.h
 @@ -0,0 +1,41 @@
 +/*
 + * arch/ubicom32/include/asm/mutex.h
 @@ -0,0 +1,41 @@
 +/*
 + * arch/ubicom32/include/asm/mutex.h
@@ -8735,9 +8661,8 @@ diff -ruN linux-2.6.30.10/arch/ubicom32/include/asm/mutex.h linux-2.6.30.10-ubi/
 +#include <asm-generic/mutex-dec.h>
 +
 +#endif /* _ASM_UBICOM32_MUTEX_H */
 +#include <asm-generic/mutex-dec.h>
 +
 +#endif /* _ASM_UBICOM32_MUTEX_H */
-diff -ruN linux-2.6.30.10/arch/ubicom32/include/asm/namei.h linux-2.6.30.10-ubi/arch/ubicom32/include/asm/namei.h
---- linux-2.6.30.10/arch/ubicom32/include/asm/namei.h  1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.30.10-ubi/arch/ubicom32/include/asm/namei.h      2009-12-11 11:45:11.000000000 +0200
+--- /dev/null
++++ b/arch/ubicom32/include/asm/namei.h
 @@ -0,0 +1,38 @@
 +/*
 + * arch/ubicom32/include/asm/namei.h
 @@ -0,0 +1,38 @@
 +/*
 + * arch/ubicom32/include/asm/namei.h
@@ -8777,9 +8702,8 @@ diff -ruN linux-2.6.30.10/arch/ubicom32/include/asm/namei.h linux-2.6.30.10-ubi/
 +#define __emul_prefix() NULL
 +
 +#endif /* _ASM_UBICOM32_NAMEI_H */
 +#define __emul_prefix() NULL
 +
 +#endif /* _ASM_UBICOM32_NAMEI_H */
-diff -ruN linux-2.6.30.10/arch/ubicom32/include/asm/ocm-alloc.h linux-2.6.30.10-ubi/arch/ubicom32/include/asm/ocm-alloc.h
---- linux-2.6.30.10/arch/ubicom32/include/asm/ocm-alloc.h      1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.30.10-ubi/arch/ubicom32/include/asm/ocm-alloc.h  2009-12-11 11:45:11.000000000 +0200
+--- /dev/null
++++ b/arch/ubicom32/include/asm/ocm-alloc.h
 @@ -0,0 +1,36 @@
 +/*
 + * arch/ubicom32/include/asm/ocm-alloc.h
 @@ -0,0 +1,36 @@
 +/*
 + * arch/ubicom32/include/asm/ocm-alloc.h
@@ -8817,16 +8741,14 @@ diff -ruN linux-2.6.30.10/arch/ubicom32/include/asm/ocm-alloc.h linux-2.6.30.10-
 +extern int ocm_inst_free(const void *ptr);
 +
 +#endif /* _ASM_UBICOM32_OCM_ALLOC_H */
 +extern int ocm_inst_free(const void *ptr);
 +
 +#endif /* _ASM_UBICOM32_OCM_ALLOC_H */
-diff -ruN linux-2.6.30.10/arch/ubicom32/include/asm/ocm_size.h linux-2.6.30.10-ubi/arch/ubicom32/include/asm/ocm_size.h
---- linux-2.6.30.10/arch/ubicom32/include/asm/ocm_size.h       1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.30.10-ubi/arch/ubicom32/include/asm/ocm_size.h   2009-12-14 14:30:27.000000000 +0200
+--- /dev/null
++++ b/arch/ubicom32/include/asm/ocm_size.h
 @@ -0,0 +1,3 @@
 +#define APP_OCM_CODE_SIZE (0x3ffc2e00-0x3ffc0000)
 +#define APP_OCM_DATA_SIZE (0x3ffd3500-0x3ffc8000)
 +
 @@ -0,0 +1,3 @@
 +#define APP_OCM_CODE_SIZE (0x3ffc2e00-0x3ffc0000)
 +#define APP_OCM_DATA_SIZE (0x3ffd3500-0x3ffc8000)
 +
-diff -ruN linux-2.6.30.10/arch/ubicom32/include/asm/ocm_text.lds.inc linux-2.6.30.10-ubi/arch/ubicom32/include/asm/ocm_text.lds.inc
---- linux-2.6.30.10/arch/ubicom32/include/asm/ocm_text.lds.inc 1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.30.10-ubi/arch/ubicom32/include/asm/ocm_text.lds.inc     2009-12-11 11:45:11.000000000 +0200
+--- /dev/null
++++ b/arch/ubicom32/include/asm/ocm_text.lds.inc
 @@ -0,0 +1,175 @@
 +/*
 + * arch/ubicom32/include/asm/ocm_text.lds.inc
 @@ -0,0 +1,175 @@
 +/*
 + * arch/ubicom32/include/asm/ocm_text.lds.inc
@@ -9003,9 +8925,8 @@ diff -ruN linux-2.6.30.10/arch/ubicom32/include/asm/ocm_text.lds.inc linux-2.6.3
 +*(.text._local_bh_enable)
 +*(.text._local_bh_disable)
 +*(.text.get_slab)
 +*(.text._local_bh_enable)
 +*(.text._local_bh_disable)
 +*(.text.get_slab)
-diff -ruN linux-2.6.30.10/arch/ubicom32/include/asm/page.h linux-2.6.30.10-ubi/arch/ubicom32/include/asm/page.h
---- linux-2.6.30.10/arch/ubicom32/include/asm/page.h   1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.30.10-ubi/arch/ubicom32/include/asm/page.h       2009-12-11 11:45:11.000000000 +0200
+--- /dev/null
++++ b/arch/ubicom32/include/asm/page.h
 @@ -0,0 +1,106 @@
 +/*
 + * arch/ubicom32/include/asm/page.h
 @@ -0,0 +1,106 @@
 +/*
 + * arch/ubicom32/include/asm/page.h
@@ -9113,9 +9034,8 @@ diff -ruN linux-2.6.30.10/arch/ubicom32/include/asm/page.h linux-2.6.30.10-ubi/a
 +#endif
 +
 +#endif /* _ASM_UBICOM32_PAGE_H */
 +#endif
 +
 +#endif /* _ASM_UBICOM32_PAGE_H */
-diff -ruN linux-2.6.30.10/arch/ubicom32/include/asm/page_offset.h linux-2.6.30.10-ubi/arch/ubicom32/include/asm/page_offset.h
---- linux-2.6.30.10/arch/ubicom32/include/asm/page_offset.h    1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.30.10-ubi/arch/ubicom32/include/asm/page_offset.h        2009-12-11 11:45:11.000000000 +0200
+--- /dev/null
++++ b/arch/ubicom32/include/asm/page_offset.h
 @@ -0,0 +1,35 @@
 +/*
 + * arch/ubicom32/include/asm/page_offset.h
 @@ -0,0 +1,35 @@
 +/*
 + * arch/ubicom32/include/asm/page_offset.h
@@ -9152,9 +9072,8 @@ diff -ruN linux-2.6.30.10/arch/ubicom32/include/asm/page_offset.h linux-2.6.30.1
 +#define       PAGE_OFFSET_RAW         0x3ffc0000
 +
 +#endif /* _ASM_UBICOM32_PAGE_OFFSET_H */
 +#define       PAGE_OFFSET_RAW         0x3ffc0000
 +
 +#endif /* _ASM_UBICOM32_PAGE_OFFSET_H */
-diff -ruN linux-2.6.30.10/arch/ubicom32/include/asm/param.h linux-2.6.30.10-ubi/arch/ubicom32/include/asm/param.h
---- linux-2.6.30.10/arch/ubicom32/include/asm/param.h  1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.30.10-ubi/arch/ubicom32/include/asm/param.h      2009-12-11 11:45:11.000000000 +0200
+--- /dev/null
++++ b/arch/ubicom32/include/asm/param.h
 @@ -0,0 +1,49 @@
 +/*
 + * arch/ubicom32/include/asm/param.h
 @@ -0,0 +1,49 @@
 +/*
 + * arch/ubicom32/include/asm/param.h
@@ -9205,9 +9124,8 @@ diff -ruN linux-2.6.30.10/arch/ubicom32/include/asm/param.h linux-2.6.30.10-ubi/
 +#define MAXHOSTNAMELEN        64      /* max length of hostname */
 +
 +#endif /* _ASM_UBICOM32_PARAM_H */
 +#define MAXHOSTNAMELEN        64      /* max length of hostname */
 +
 +#endif /* _ASM_UBICOM32_PARAM_H */
-diff -ruN linux-2.6.30.10/arch/ubicom32/include/asm/pci.h linux-2.6.30.10-ubi/arch/ubicom32/include/asm/pci.h
---- linux-2.6.30.10/arch/ubicom32/include/asm/pci.h    1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.30.10-ubi/arch/ubicom32/include/asm/pci.h        2009-12-11 11:45:11.000000000 +0200
+--- /dev/null
++++ b/arch/ubicom32/include/asm/pci.h
 @@ -0,0 +1,210 @@
 +/*
 + * arch/ubicom32/include/asm/pci.h
 @@ -0,0 +1,210 @@
 +/*
 + * arch/ubicom32/include/asm/pci.h
@@ -9419,9 +9337,8 @@ diff -ruN linux-2.6.30.10/arch/ubicom32/include/asm/pci.h linux-2.6.30.10-ubi/ar
 +#endif
 +
 +#endif /* _ASM_UBICOM32_PCI_H */
 +#endif
 +
 +#endif /* _ASM_UBICOM32_PCI_H */
-diff -ruN linux-2.6.30.10/arch/ubicom32/include/asm/pcm_tio.h linux-2.6.30.10-ubi/arch/ubicom32/include/asm/pcm_tio.h
---- linux-2.6.30.10/arch/ubicom32/include/asm/pcm_tio.h        1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.30.10-ubi/arch/ubicom32/include/asm/pcm_tio.h    2009-12-11 11:45:11.000000000 +0200
+--- /dev/null
++++ b/arch/ubicom32/include/asm/pcm_tio.h
 @@ -0,0 +1,84 @@
 +/*
 + * arch/ubicom32/include/asm/pcm_tio.h
 @@ -0,0 +1,84 @@
 +/*
 + * arch/ubicom32/include/asm/pcm_tio.h
@@ -9507,9 +9424,8 @@ diff -ruN linux-2.6.30.10/arch/ubicom32/include/asm/pcm_tio.h linux-2.6.30.10-ub
 +
 +#endif
 +
 +
 +#endif
 +
-diff -ruN linux-2.6.30.10/arch/ubicom32/include/asm/percpu.h linux-2.6.30.10-ubi/arch/ubicom32/include/asm/percpu.h
---- linux-2.6.30.10/arch/ubicom32/include/asm/percpu.h 1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.30.10-ubi/arch/ubicom32/include/asm/percpu.h     2009-12-11 11:45:11.000000000 +0200
+--- /dev/null
++++ b/arch/ubicom32/include/asm/percpu.h
 @@ -0,0 +1,33 @@
 +/*
 + * arch/ubicom32/include/asm/percpu.h
 @@ -0,0 +1,33 @@
 +/*
 + * arch/ubicom32/include/asm/percpu.h
@@ -9544,9 +9460,8 @@ diff -ruN linux-2.6.30.10/arch/ubicom32/include/asm/percpu.h linux-2.6.30.10-ubi
 +#include <asm-generic/percpu.h>
 +
 +#endif /* _ASM_UBICOM32_PERCPU_H */
 +#include <asm-generic/percpu.h>
 +
 +#endif /* _ASM_UBICOM32_PERCPU_H */
-diff -ruN linux-2.6.30.10/arch/ubicom32/include/asm/pgalloc.h linux-2.6.30.10-ubi/arch/ubicom32/include/asm/pgalloc.h
---- linux-2.6.30.10/arch/ubicom32/include/asm/pgalloc.h        1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.30.10-ubi/arch/ubicom32/include/asm/pgalloc.h    2009-12-11 11:45:11.000000000 +0200
+--- /dev/null
++++ b/arch/ubicom32/include/asm/pgalloc.h
 @@ -0,0 +1,36 @@
 +/*
 + * arch/ubicom32/include/asm/pgalloc.h
 @@ -0,0 +1,36 @@
 +/*
 + * arch/ubicom32/include/asm/pgalloc.h
@@ -9584,9 +9499,8 @@ diff -ruN linux-2.6.30.10/arch/ubicom32/include/asm/pgalloc.h linux-2.6.30.10-ub
 +#define check_pgt_cache()     do { } while (0)
 +
 +#endif /* _ASM_UBICOM32_PGALLOC_H */
 +#define check_pgt_cache()     do { } while (0)
 +
 +#endif /* _ASM_UBICOM32_PGALLOC_H */
-diff -ruN linux-2.6.30.10/arch/ubicom32/include/asm/pgtable.h linux-2.6.30.10-ubi/arch/ubicom32/include/asm/pgtable.h
---- linux-2.6.30.10/arch/ubicom32/include/asm/pgtable.h        1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.30.10-ubi/arch/ubicom32/include/asm/pgtable.h    2009-12-11 11:45:11.000000000 +0200
+--- /dev/null
++++ b/arch/ubicom32/include/asm/pgtable.h
 @@ -0,0 +1,124 @@
 +/*
 + * arch/ubicom32/include/asm/pgtable.h
 @@ -0,0 +1,124 @@
 +/*
 + * arch/ubicom32/include/asm/pgtable.h
@@ -9712,9 +9626,8 @@ diff -ruN linux-2.6.30.10/arch/ubicom32/include/asm/pgtable.h linux-2.6.30.10-ub
 +#define arch_flush_lazy_cpu_mode()    do {} while (0)
 +
 +#endif /* _ASM_UBICOM32_PGTABLE_H */
 +#define arch_flush_lazy_cpu_mode()    do {} while (0)
 +
 +#endif /* _ASM_UBICOM32_PGTABLE_H */
-diff -ruN linux-2.6.30.10/arch/ubicom32/include/asm/plio.h linux-2.6.30.10-ubi/arch/ubicom32/include/asm/plio.h
---- linux-2.6.30.10/arch/ubicom32/include/asm/plio.h   1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.30.10-ubi/arch/ubicom32/include/asm/plio.h       2009-12-11 11:45:11.000000000 +0200
+--- /dev/null
++++ b/arch/ubicom32/include/asm/plio.h
 @@ -0,0 +1,313 @@
 +/*
 + * plio.h
 @@ -0,0 +1,313 @@
 +/*
 + * plio.h
@@ -10029,9 +9942,8 @@ diff -ruN linux-2.6.30.10/arch/ubicom32/include/asm/plio.h linux-2.6.30.10-ubi/a
 +extern void plio_init(const plio_fctl_t *plio_fctl, const plio_config_t *plio_config, const plio_sram_t plio_sram_cfg[], int sram_cfg_size);
 +
 +#endif // __PLIO__H__
 +extern void plio_init(const plio_fctl_t *plio_fctl, const plio_config_t *plio_config, const plio_sram_t plio_sram_cfg[], int sram_cfg_size);
 +
 +#endif // __PLIO__H__
-diff -ruN linux-2.6.30.10/arch/ubicom32/include/asm/poll.h linux-2.6.30.10-ubi/arch/ubicom32/include/asm/poll.h
---- linux-2.6.30.10/arch/ubicom32/include/asm/poll.h   1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.30.10-ubi/arch/ubicom32/include/asm/poll.h       2009-12-11 11:45:11.000000000 +0200
+--- /dev/null
++++ b/arch/ubicom32/include/asm/poll.h
 @@ -0,0 +1,36 @@
 +/*
 + * arch/ubicom32/include/asm/poll.h
 @@ -0,0 +1,36 @@
 +/*
 + * arch/ubicom32/include/asm/poll.h
@@ -10069,9 +9981,8 @@ diff -ruN linux-2.6.30.10/arch/ubicom32/include/asm/poll.h linux-2.6.30.10-ubi/a
 +#include <asm-generic/poll.h>
 +
 +#endif /* _ASM_UBICOM32_POLL_H */
 +#include <asm-generic/poll.h>
 +
 +#endif /* _ASM_UBICOM32_POLL_H */
-diff -ruN linux-2.6.30.10/arch/ubicom32/include/asm/posix_types.h linux-2.6.30.10-ubi/arch/ubicom32/include/asm/posix_types.h
---- linux-2.6.30.10/arch/ubicom32/include/asm/posix_types.h    1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.30.10-ubi/arch/ubicom32/include/asm/posix_types.h        2009-12-11 11:45:11.000000000 +0200
+--- /dev/null
++++ b/arch/ubicom32/include/asm/posix_types.h
 @@ -0,0 +1,93 @@
 +/*
 + * arch/ubicom32/include/asm/posix_types.h
 @@ -0,0 +1,93 @@
 +/*
 + * arch/ubicom32/include/asm/posix_types.h
@@ -10166,9 +10077,8 @@ diff -ruN linux-2.6.30.10/arch/ubicom32/include/asm/posix_types.h linux-2.6.30.1
 +#endif /* defined(__KERNEL__) || !defined(__GLIBC__) || (__GLIBC__ < 2) */
 +
 +#endif
 +#endif /* defined(__KERNEL__) || !defined(__GLIBC__) || (__GLIBC__ < 2) */
 +
 +#endif
-diff -ruN linux-2.6.30.10/arch/ubicom32/include/asm/processor.h linux-2.6.30.10-ubi/arch/ubicom32/include/asm/processor.h
---- linux-2.6.30.10/arch/ubicom32/include/asm/processor.h      1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.30.10-ubi/arch/ubicom32/include/asm/processor.h  2009-12-11 11:45:11.000000000 +0200
+--- /dev/null
++++ b/arch/ubicom32/include/asm/processor.h
 @@ -0,0 +1,163 @@
 +/*
 + * arch/ubicom32/include/asm/processor.h
 @@ -0,0 +1,163 @@
 +/*
 + * arch/ubicom32/include/asm/processor.h
@@ -10333,9 +10243,8 @@ diff -ruN linux-2.6.30.10/arch/ubicom32/include/asm/processor.h linux-2.6.30.10-
 +})
 +
 +#endif        /* _ASM_UBICOM32_PROCESSOR_H */
 +})
 +
 +#endif        /* _ASM_UBICOM32_PROCESSOR_H */
-diff -ruN linux-2.6.30.10/arch/ubicom32/include/asm/profilesample.h linux-2.6.30.10-ubi/arch/ubicom32/include/asm/profilesample.h
---- linux-2.6.30.10/arch/ubicom32/include/asm/profilesample.h  1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.30.10-ubi/arch/ubicom32/include/asm/profilesample.h      2009-12-11 11:45:11.000000000 +0200
+--- /dev/null
++++ b/arch/ubicom32/include/asm/profilesample.h
 @@ -0,0 +1,44 @@
 +/*
 + * arch/ubicom32/mach-common/profile.h
 @@ -0,0 +1,44 @@
 +/*
 + * arch/ubicom32/mach-common/profile.h
@@ -10381,9 +10290,8 @@ diff -ruN linux-2.6.30.10/arch/ubicom32/include/asm/profilesample.h linux-2.6.30
 +};
 +
 +#endif
 +};
 +
 +#endif
-diff -ruN linux-2.6.30.10/arch/ubicom32/include/asm/ptrace.h linux-2.6.30.10-ubi/arch/ubicom32/include/asm/ptrace.h
---- linux-2.6.30.10/arch/ubicom32/include/asm/ptrace.h 1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.30.10-ubi/arch/ubicom32/include/asm/ptrace.h     2009-12-11 11:45:11.000000000 +0200
+--- /dev/null
++++ b/arch/ubicom32/include/asm/ptrace.h
 @@ -0,0 +1,177 @@
 +/*
 + * arch/ubicom32/include/asm/ptrace.h
 @@ -0,0 +1,177 @@
 +/*
 + * arch/ubicom32/include/asm/ptrace.h
@@ -10562,9 +10470,8 @@ diff -ruN linux-2.6.30.10/arch/ubicom32/include/asm/ptrace.h linux-2.6.30.10-ubi
 +#endif /* __ASSEMBLY__ */
 +
 +#endif /* _ASM_UBICOM32_PTRACE_H */
 +#endif /* __ASSEMBLY__ */
 +
 +#endif /* _ASM_UBICOM32_PTRACE_H */
-diff -ruN linux-2.6.30.10/arch/ubicom32/include/asm/range-protect-asm.h linux-2.6.30.10-ubi/arch/ubicom32/include/asm/range-protect-asm.h
---- linux-2.6.30.10/arch/ubicom32/include/asm/range-protect-asm.h      1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.30.10-ubi/arch/ubicom32/include/asm/range-protect-asm.h  2009-12-11 11:45:11.000000000 +0200
+--- /dev/null
++++ b/arch/ubicom32/include/asm/range-protect-asm.h
 @@ -0,0 +1,91 @@
 +/*
 + * arch/ubicom32/include/asm/range-protect-asm.h
 @@ -0,0 +1,91 @@
 +/*
 + * arch/ubicom32/include/asm/range-protect-asm.h
@@ -10657,9 +10564,8 @@ diff -ruN linux-2.6.30.10/arch/ubicom32/include/asm/range-protect-asm.h linux-2.
 +#endif
 +
 +#endif  /* _ASM_UBICOM32_RANGE_PROTECT_ASM_H */
 +#endif
 +
 +#endif  /* _ASM_UBICOM32_RANGE_PROTECT_ASM_H */
-diff -ruN linux-2.6.30.10/arch/ubicom32/include/asm/range-protect.h linux-2.6.30.10-ubi/arch/ubicom32/include/asm/range-protect.h
---- linux-2.6.30.10/arch/ubicom32/include/asm/range-protect.h  1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.30.10-ubi/arch/ubicom32/include/asm/range-protect.h      2009-12-11 11:45:11.000000000 +0200
+--- /dev/null
++++ b/arch/ubicom32/include/asm/range-protect.h
 @@ -0,0 +1,62 @@
 +/*
 + * arch/ubicom32/include/asm/range-protect.h
 @@ -0,0 +1,62 @@
 +/*
 + * arch/ubicom32/include/asm/range-protect.h
@@ -10723,9 +10629,8 @@ diff -ruN linux-2.6.30.10/arch/ubicom32/include/asm/range-protect.h linux-2.6.30
 +
 +#endif
 +#endif  /* _ASM_UBICOM32_RANGE_PROTECT_H */
 +
 +#endif
 +#endif  /* _ASM_UBICOM32_RANGE_PROTECT_H */
-diff -ruN linux-2.6.30.10/arch/ubicom32/include/asm/resource.h linux-2.6.30.10-ubi/arch/ubicom32/include/asm/resource.h
---- linux-2.6.30.10/arch/ubicom32/include/asm/resource.h       1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.30.10-ubi/arch/ubicom32/include/asm/resource.h   2009-12-11 11:45:11.000000000 +0200
+--- /dev/null
++++ b/arch/ubicom32/include/asm/resource.h
 @@ -0,0 +1,33 @@
 +/*
 + * arch/ubicom32/include/asm/resource.h
 @@ -0,0 +1,33 @@
 +/*
 + * arch/ubicom32/include/asm/resource.h
@@ -10760,9 +10665,8 @@ diff -ruN linux-2.6.30.10/arch/ubicom32/include/asm/resource.h linux-2.6.30.10-u
 +#include <asm-generic/resource.h>
 +
 +#endif /* _ASM_UBICOM32_RESOURCE_H */
 +#include <asm-generic/resource.h>
 +
 +#endif /* _ASM_UBICOM32_RESOURCE_H */
-diff -ruN linux-2.6.30.10/arch/ubicom32/include/asm/ring_tio.h linux-2.6.30.10-ubi/arch/ubicom32/include/asm/ring_tio.h
---- linux-2.6.30.10/arch/ubicom32/include/asm/ring_tio.h       1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.30.10-ubi/arch/ubicom32/include/asm/ring_tio.h   2009-12-11 11:45:11.000000000 +0200
+--- /dev/null
++++ b/arch/ubicom32/include/asm/ring_tio.h
 @@ -0,0 +1,42 @@
 +/*
 + * arch/ubicom32/include/asm/ring_tio.h
 @@ -0,0 +1,42 @@
 +/*
 + * arch/ubicom32/include/asm/ring_tio.h
@@ -10806,9 +10710,8 @@ diff -ruN linux-2.6.30.10/arch/ubicom32/include/asm/ring_tio.h linux-2.6.30.10-u
 +extern void ring_tio_init(const char *node_name);
 +
 +#endif /* _ASM_UBICOM32_RING_TIO_H */
 +extern void ring_tio_init(const char *node_name);
 +
 +#endif /* _ASM_UBICOM32_RING_TIO_H */
-diff -ruN linux-2.6.30.10/arch/ubicom32/include/asm/scatterlist.h linux-2.6.30.10-ubi/arch/ubicom32/include/asm/scatterlist.h
---- linux-2.6.30.10/arch/ubicom32/include/asm/scatterlist.h    1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.30.10-ubi/arch/ubicom32/include/asm/scatterlist.h        2009-12-11 11:45:11.000000000 +0200
+--- /dev/null
++++ b/arch/ubicom32/include/asm/scatterlist.h
 @@ -0,0 +1,49 @@
 +/*
 + * arch/ubicom32/include/asm/scatterlist.h
 @@ -0,0 +1,49 @@
 +/*
 + * arch/ubicom32/include/asm/scatterlist.h
@@ -10859,9 +10762,8 @@ diff -ruN linux-2.6.30.10/arch/ubicom32/include/asm/scatterlist.h linux-2.6.30.1
 +#define ISA_DMA_THRESHOLD     (0xffffffff)
 +
 +#endif /* _ASM_UBICOM32_SCATTERLIST_H */
 +#define ISA_DMA_THRESHOLD     (0xffffffff)
 +
 +#endif /* _ASM_UBICOM32_SCATTERLIST_H */
-diff -ruN linux-2.6.30.10/arch/ubicom32/include/asm/sd_tio.h linux-2.6.30.10-ubi/arch/ubicom32/include/asm/sd_tio.h
---- linux-2.6.30.10/arch/ubicom32/include/asm/sd_tio.h 1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.30.10-ubi/arch/ubicom32/include/asm/sd_tio.h     2009-12-11 11:45:11.000000000 +0200
+--- /dev/null
++++ b/arch/ubicom32/include/asm/sd_tio.h
 @@ -0,0 +1,36 @@
 +/*
 + * arch/ubicom32/include/asm/sd_tio.h
 @@ -0,0 +1,36 @@
 +/*
 + * arch/ubicom32/include/asm/sd_tio.h
@@ -10899,9 +10801,8 @@ diff -ruN linux-2.6.30.10/arch/ubicom32/include/asm/sd_tio.h linux-2.6.30.10-ubi
 +};
 +
 +#endif /* _ASM_UBICOM32_SD_TIO_H */
 +};
 +
 +#endif /* _ASM_UBICOM32_SD_TIO_H */
-diff -ruN linux-2.6.30.10/arch/ubicom32/include/asm/sections.h linux-2.6.30.10-ubi/arch/ubicom32/include/asm/sections.h
---- linux-2.6.30.10/arch/ubicom32/include/asm/sections.h       1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.30.10-ubi/arch/ubicom32/include/asm/sections.h   2009-12-11 11:45:11.000000000 +0200
+--- /dev/null
++++ b/arch/ubicom32/include/asm/sections.h
 @@ -0,0 +1,33 @@
 +/*
 + * arch/ubicom32/include/asm/sections.h
 @@ -0,0 +1,33 @@
 +/*
 + * arch/ubicom32/include/asm/sections.h
@@ -10936,9 +10837,8 @@ diff -ruN linux-2.6.30.10/arch/ubicom32/include/asm/sections.h linux-2.6.30.10-u
 +#include <asm-generic/sections.h>
 +
 +#endif /* _ASM_UBICOM32_SECTIONS_H */
 +#include <asm-generic/sections.h>
 +
 +#endif /* _ASM_UBICOM32_SECTIONS_H */
-diff -ruN linux-2.6.30.10/arch/ubicom32/include/asm/segment.h linux-2.6.30.10-ubi/arch/ubicom32/include/asm/segment.h
---- linux-2.6.30.10/arch/ubicom32/include/asm/segment.h        1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.30.10-ubi/arch/ubicom32/include/asm/segment.h    2009-12-11 11:45:11.000000000 +0200
+--- /dev/null
++++ b/arch/ubicom32/include/asm/segment.h
 @@ -0,0 +1,78 @@
 +/*
 + * arch/ubicom32/include/asm/segment.h
 @@ -0,0 +1,78 @@
 +/*
 + * arch/ubicom32/include/asm/segment.h
@@ -11018,9 +10918,8 @@ diff -ruN linux-2.6.30.10/arch/ubicom32/include/asm/segment.h linux-2.6.30.10-ub
 +#endif /* __ASSEMBLY__ */
 +
 +#endif /* _ASM_UBICOM32_SEGMENT_H */
 +#endif /* __ASSEMBLY__ */
 +
 +#endif /* _ASM_UBICOM32_SEGMENT_H */
-diff -ruN linux-2.6.30.10/arch/ubicom32/include/asm/semaphore.h linux-2.6.30.10-ubi/arch/ubicom32/include/asm/semaphore.h
---- linux-2.6.30.10/arch/ubicom32/include/asm/semaphore.h      1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.30.10-ubi/arch/ubicom32/include/asm/semaphore.h  2009-12-11 11:45:11.000000000 +0200
+--- /dev/null
++++ b/arch/ubicom32/include/asm/semaphore.h
 @@ -0,0 +1,140 @@
 +/*
 + * arch/ubicom32/include/asm/semaphore.h
 @@ -0,0 +1,140 @@
 +/*
 + * arch/ubicom32/include/asm/semaphore.h
@@ -11162,9 +11061,8 @@ diff -ruN linux-2.6.30.10/arch/ubicom32/include/asm/semaphore.h linux-2.6.30.10-
 +#endif /* __ASSEMBLY__ */
 +
 +#endif /* _ASM_UBICOM32_SEMAPHORE_H */
 +#endif /* __ASSEMBLY__ */
 +
 +#endif /* _ASM_UBICOM32_SEMAPHORE_H */
-diff -ruN linux-2.6.30.10/arch/ubicom32/include/asm/semaphore-helper.h linux-2.6.30.10-ubi/arch/ubicom32/include/asm/semaphore-helper.h
---- linux-2.6.30.10/arch/ubicom32/include/asm/semaphore-helper.h       1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.30.10-ubi/arch/ubicom32/include/asm/semaphore-helper.h   2009-12-11 11:45:11.000000000 +0200
+--- /dev/null
++++ b/arch/ubicom32/include/asm/semaphore-helper.h
 @@ -0,0 +1,109 @@
 +/*
 + * arch/ubicom32/include/asm/semaphore-helper.h
 @@ -0,0 +1,109 @@
 +/*
 + * arch/ubicom32/include/asm/semaphore-helper.h
@@ -11275,9 +11173,8 @@ diff -ruN linux-2.6.30.10/arch/ubicom32/include/asm/semaphore-helper.h linux-2.6
 +}
 +
 +#endif /* _ASM_UBICOM32_SEMAPHORE_HELPER_H */
 +}
 +
 +#endif /* _ASM_UBICOM32_SEMAPHORE_HELPER_H */
-diff -ruN linux-2.6.30.10/arch/ubicom32/include/asm/sembuf.h linux-2.6.30.10-ubi/arch/ubicom32/include/asm/sembuf.h
---- linux-2.6.30.10/arch/ubicom32/include/asm/sembuf.h 1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.30.10-ubi/arch/ubicom32/include/asm/sembuf.h     2009-12-11 11:45:11.000000000 +0200
+--- /dev/null
++++ b/arch/ubicom32/include/asm/sembuf.h
 @@ -0,0 +1,52 @@
 +/*
 + * arch/ubicom32/include/asm/sembuf.h
 @@ -0,0 +1,52 @@
 +/*
 + * arch/ubicom32/include/asm/sembuf.h
@@ -11331,9 +11228,8 @@ diff -ruN linux-2.6.30.10/arch/ubicom32/include/asm/sembuf.h linux-2.6.30.10-ubi
 +};
 +
 +#endif /* _ASM_UBICOM32_SEMBUF_H */
 +};
 +
 +#endif /* _ASM_UBICOM32_SEMBUF_H */
-diff -ruN linux-2.6.30.10/arch/ubicom32/include/asm/setup.h linux-2.6.30.10-ubi/arch/ubicom32/include/asm/setup.h
---- linux-2.6.30.10/arch/ubicom32/include/asm/setup.h  1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.30.10-ubi/arch/ubicom32/include/asm/setup.h      2009-12-11 11:45:11.000000000 +0200
+--- /dev/null
++++ b/arch/ubicom32/include/asm/setup.h
 @@ -0,0 +1,35 @@
 +/*
 + * arch/ubicom32/include/asm/setup.h
 @@ -0,0 +1,35 @@
 +/*
 + * arch/ubicom32/include/asm/setup.h
@@ -11370,9 +11266,8 @@ diff -ruN linux-2.6.30.10/arch/ubicom32/include/asm/setup.h linux-2.6.30.10-ubi/
 +#define COMMAND_LINE_SIZE 512
 +
 +#endif /* _ASM_UBICOM32_SETUP_H */
 +#define COMMAND_LINE_SIZE 512
 +
 +#endif /* _ASM_UBICOM32_SETUP_H */
-diff -ruN linux-2.6.30.10/arch/ubicom32/include/asm/shmbuf.h linux-2.6.30.10-ubi/arch/ubicom32/include/asm/shmbuf.h
---- linux-2.6.30.10/arch/ubicom32/include/asm/shmbuf.h 1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.30.10-ubi/arch/ubicom32/include/asm/shmbuf.h     2009-12-11 11:45:11.000000000 +0200
+--- /dev/null
++++ b/arch/ubicom32/include/asm/shmbuf.h
 @@ -0,0 +1,69 @@
 +/*
 + * arch/ubicom32/include/asm/shmbuf.h
 @@ -0,0 +1,69 @@
 +/*
 + * arch/ubicom32/include/asm/shmbuf.h
@@ -11443,9 +11338,8 @@ diff -ruN linux-2.6.30.10/arch/ubicom32/include/asm/shmbuf.h linux-2.6.30.10-ubi
 +};
 +
 +#endif /* _ASM_UBICOM32_SHMBUF_H */
 +};
 +
 +#endif /* _ASM_UBICOM32_SHMBUF_H */
-diff -ruN linux-2.6.30.10/arch/ubicom32/include/asm/shmparam.h linux-2.6.30.10-ubi/arch/ubicom32/include/asm/shmparam.h
---- linux-2.6.30.10/arch/ubicom32/include/asm/shmparam.h       1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.30.10-ubi/arch/ubicom32/include/asm/shmparam.h   2009-12-11 11:45:11.000000000 +0200
+--- /dev/null
++++ b/arch/ubicom32/include/asm/shmparam.h
 @@ -0,0 +1,35 @@
 +/*
 + * arch/ubicom32/include/asm/shmparam.h
 @@ -0,0 +1,35 @@
 +/*
 + * arch/ubicom32/include/asm/shmparam.h
@@ -11482,9 +11376,8 @@ diff -ruN linux-2.6.30.10/arch/ubicom32/include/asm/shmparam.h linux-2.6.30.10-u
 +#define       SHMLBA          PAGE_SIZE       /* attach addr a multiple of this */
 +
 +#endif /* _ASM_UBICOM32_SHMPARAM_H */
 +#define       SHMLBA          PAGE_SIZE       /* attach addr a multiple of this */
 +
 +#endif /* _ASM_UBICOM32_SHMPARAM_H */
-diff -ruN linux-2.6.30.10/arch/ubicom32/include/asm/sigcontext.h linux-2.6.30.10-ubi/arch/ubicom32/include/asm/sigcontext.h
---- linux-2.6.30.10/arch/ubicom32/include/asm/sigcontext.h     1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.30.10-ubi/arch/ubicom32/include/asm/sigcontext.h 2009-12-11 11:45:11.000000000 +0200
+--- /dev/null
++++ b/arch/ubicom32/include/asm/sigcontext.h
 @@ -0,0 +1,37 @@
 +/*
 + * arch/ubicom32/include/asm/sigcontext.h
 @@ -0,0 +1,37 @@
 +/*
 + * arch/ubicom32/include/asm/sigcontext.h
@@ -11523,9 +11416,8 @@ diff -ruN linux-2.6.30.10/arch/ubicom32/include/asm/sigcontext.h linux-2.6.30.10
 +};
 +
 +#endif /* _ASM_UBICOM32_SIGCONTEXT_H */
 +};
 +
 +#endif /* _ASM_UBICOM32_SIGCONTEXT_H */
-diff -ruN linux-2.6.30.10/arch/ubicom32/include/asm/siginfo.h linux-2.6.30.10-ubi/arch/ubicom32/include/asm/siginfo.h
---- linux-2.6.30.10/arch/ubicom32/include/asm/siginfo.h        1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.30.10-ubi/arch/ubicom32/include/asm/siginfo.h    2009-12-11 11:45:11.000000000 +0200
+--- /dev/null
++++ b/arch/ubicom32/include/asm/siginfo.h
 @@ -0,0 +1,33 @@
 +/*
 + * arch/ubicom32/include/asm/siginfo.h
 @@ -0,0 +1,33 @@
 +/*
 + * arch/ubicom32/include/asm/siginfo.h
@@ -11560,9 +11452,8 @@ diff -ruN linux-2.6.30.10/arch/ubicom32/include/asm/siginfo.h linux-2.6.30.10-ub
 +#include <asm-generic/siginfo.h>
 +
 +#endif /* _ASM_UBICOM32_SIGINFO_H */
 +#include <asm-generic/siginfo.h>
 +
 +#endif /* _ASM_UBICOM32_SIGINFO_H */
-diff -ruN linux-2.6.30.10/arch/ubicom32/include/asm/signal.h linux-2.6.30.10-ubi/arch/ubicom32/include/asm/signal.h
---- linux-2.6.30.10/arch/ubicom32/include/asm/signal.h 1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.30.10-ubi/arch/ubicom32/include/asm/signal.h     2009-12-11 11:45:11.000000000 +0200
+--- /dev/null
++++ b/arch/ubicom32/include/asm/signal.h
 @@ -0,0 +1,180 @@
 +/*
 + * arch/ubicom32/include/asm/signal.h
 @@ -0,0 +1,180 @@
 +/*
 + * arch/ubicom32/include/asm/signal.h
@@ -11744,9 +11635,8 @@ diff -ruN linux-2.6.30.10/arch/ubicom32/include/asm/signal.h linux-2.6.30.10-ubi
 +#endif /* __KERNEL__ */
 +
 +#endif /* _ASM_UBICOM32_SIGNAL_H */
 +#endif /* __KERNEL__ */
 +
 +#endif /* _ASM_UBICOM32_SIGNAL_H */
-diff -ruN linux-2.6.30.10/arch/ubicom32/include/asm/smp.h linux-2.6.30.10-ubi/arch/ubicom32/include/asm/smp.h
---- linux-2.6.30.10/arch/ubicom32/include/asm/smp.h    1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.30.10-ubi/arch/ubicom32/include/asm/smp.h        2009-12-11 11:45:11.000000000 +0200
+--- /dev/null
++++ b/arch/ubicom32/include/asm/smp.h
 @@ -0,0 +1,87 @@
 +/*
 + * arch/ubicom32/include/asm/smp.h
 @@ -0,0 +1,87 @@
 +/*
 + * arch/ubicom32/include/asm/smp.h
@@ -11835,9 +11725,8 @@ diff -ruN linux-2.6.30.10/arch/ubicom32/include/asm/smp.h linux-2.6.30.10-ubi/ar
 +
 +#endif /* !ASSEMBLY */
 +#endif /*  _ASM_UBICOM32_SMP_H */
 +
 +#endif /* !ASSEMBLY */
 +#endif /*  _ASM_UBICOM32_SMP_H */
-diff -ruN linux-2.6.30.10/arch/ubicom32/include/asm/socket.h linux-2.6.30.10-ubi/arch/ubicom32/include/asm/socket.h
---- linux-2.6.30.10/arch/ubicom32/include/asm/socket.h 1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.30.10-ubi/arch/ubicom32/include/asm/socket.h     2009-12-11 11:45:11.000000000 +0200
+--- /dev/null
++++ b/arch/ubicom32/include/asm/socket.h
 @@ -0,0 +1,87 @@
 +/*
 + * arch/ubicom32/include/asm/socket.h
 @@ -0,0 +1,87 @@
 +/*
 + * arch/ubicom32/include/asm/socket.h
@@ -11926,9 +11815,8 @@ diff -ruN linux-2.6.30.10/arch/ubicom32/include/asm/socket.h linux-2.6.30.10-ubi
 +#define SCM_TIMESTAMPING      SO_TIMESTAMPING
 +
 +#endif /* _ASM_UBICOM32_SOCKET_H */
 +#define SCM_TIMESTAMPING      SO_TIMESTAMPING
 +
 +#endif /* _ASM_UBICOM32_SOCKET_H */
-diff -ruN linux-2.6.30.10/arch/ubicom32/include/asm/sockios.h linux-2.6.30.10-ubi/arch/ubicom32/include/asm/sockios.h
---- linux-2.6.30.10/arch/ubicom32/include/asm/sockios.h        1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.30.10-ubi/arch/ubicom32/include/asm/sockios.h    2009-12-11 11:45:11.000000000 +0200
+--- /dev/null
++++ b/arch/ubicom32/include/asm/sockios.h
 @@ -0,0 +1,40 @@
 +/*
 + * arch/ubicom32/include/asm/sockios.h
 @@ -0,0 +1,40 @@
 +/*
 + * arch/ubicom32/include/asm/sockios.h
@@ -11970,9 +11858,8 @@ diff -ruN linux-2.6.30.10/arch/ubicom32/include/asm/sockios.h linux-2.6.30.10-ub
 +#define SIOCGSTAMPNS  0x8907          /* Get stamp (timespec) */
 +
 +#endif /* _ASM_UBICOM32_SOCKIOS_H */
 +#define SIOCGSTAMPNS  0x8907          /* Get stamp (timespec) */
 +
 +#endif /* _ASM_UBICOM32_SOCKIOS_H */
-diff -ruN linux-2.6.30.10/arch/ubicom32/include/asm/spinlock.h linux-2.6.30.10-ubi/arch/ubicom32/include/asm/spinlock.h
---- linux-2.6.30.10/arch/ubicom32/include/asm/spinlock.h       1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.30.10-ubi/arch/ubicom32/include/asm/spinlock.h   2009-12-11 11:45:11.000000000 +0200
+--- /dev/null
++++ b/arch/ubicom32/include/asm/spinlock.h
 @@ -0,0 +1,296 @@
 +/*
 + * arch/ubicom32/include/asm/spinlock.h
 @@ -0,0 +1,296 @@
 +/*
 + * arch/ubicom32/include/asm/spinlock.h
@@ -12270,9 +12157,8 @@ diff -ruN linux-2.6.30.10/arch/ubicom32/include/asm/spinlock.h linux-2.6.30.10-u
 +#define _raw_write_relax(lock)        cpu_relax()
 +
 +#endif /* _ASM_UBICOM32_SPINLOCK_H */
 +#define _raw_write_relax(lock)        cpu_relax()
 +
 +#endif /* _ASM_UBICOM32_SPINLOCK_H */
-diff -ruN linux-2.6.30.10/arch/ubicom32/include/asm/spinlock_types.h linux-2.6.30.10-ubi/arch/ubicom32/include/asm/spinlock_types.h
---- linux-2.6.30.10/arch/ubicom32/include/asm/spinlock_types.h 1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.30.10-ubi/arch/ubicom32/include/asm/spinlock_types.h     2009-12-11 11:45:11.000000000 +0200
+--- /dev/null
++++ b/arch/ubicom32/include/asm/spinlock_types.h
 @@ -0,0 +1,43 @@
 +/*
 + * arch/ubicom32/include/asm/spinlock_types.h
 @@ -0,0 +1,43 @@
 +/*
 + * arch/ubicom32/include/asm/spinlock_types.h
@@ -12317,9 +12203,8 @@ diff -ruN linux-2.6.30.10/arch/ubicom32/include/asm/spinlock_types.h linux-2.6.3
 +#define __RAW_RW_LOCK_UNLOCKED                { __RAW_SPIN_LOCK_UNLOCKED, 0 }
 +
 +#endif /* _ASM_UBICOM32_SPINLOCK_TYPES_H */
 +#define __RAW_RW_LOCK_UNLOCKED                { __RAW_SPIN_LOCK_UNLOCKED, 0 }
 +
 +#endif /* _ASM_UBICOM32_SPINLOCK_TYPES_H */
-diff -ruN linux-2.6.30.10/arch/ubicom32/include/asm/stacktrace.h linux-2.6.30.10-ubi/arch/ubicom32/include/asm/stacktrace.h
---- linux-2.6.30.10/arch/ubicom32/include/asm/stacktrace.h     1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.30.10-ubi/arch/ubicom32/include/asm/stacktrace.h 2009-12-11 11:45:11.000000000 +0200
+--- /dev/null
++++ b/arch/ubicom32/include/asm/stacktrace.h
 @@ -0,0 +1,72 @@
 +/*
 + * arch/ubicom32/include/asm/stacktrace.h
 @@ -0,0 +1,72 @@
 +/*
 + * arch/ubicom32/include/asm/stacktrace.h
@@ -12393,9 +12278,8 @@ diff -ruN linux-2.6.30.10/arch/ubicom32/include/asm/stacktrace.h linux-2.6.30.10
 +void stacktrace_save_entries(struct task_struct *tsk, struct stack_trace *trace, unsigned long sp);
 +#endif
 +#endif /* _ASM_UBICOM32_STACKTRACE_H */
 +void stacktrace_save_entries(struct task_struct *tsk, struct stack_trace *trace, unsigned long sp);
 +#endif
 +#endif /* _ASM_UBICOM32_STACKTRACE_H */
-diff -ruN linux-2.6.30.10/arch/ubicom32/include/asm/statfs.h linux-2.6.30.10-ubi/arch/ubicom32/include/asm/statfs.h
---- linux-2.6.30.10/arch/ubicom32/include/asm/statfs.h 1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.30.10-ubi/arch/ubicom32/include/asm/statfs.h     2009-12-11 11:45:11.000000000 +0200
+--- /dev/null
++++ b/arch/ubicom32/include/asm/statfs.h
 @@ -0,0 +1,33 @@
 +/*
 + * arch/ubicom32/include/asm/statfs.h
 @@ -0,0 +1,33 @@
 +/*
 + * arch/ubicom32/include/asm/statfs.h
@@ -12430,9 +12314,8 @@ diff -ruN linux-2.6.30.10/arch/ubicom32/include/asm/statfs.h linux-2.6.30.10-ubi
 +#include <asm-generic/statfs.h>
 +
 +#endif /* _ASM_UBICOM32_STATFS_H */
 +#include <asm-generic/statfs.h>
 +
 +#endif /* _ASM_UBICOM32_STATFS_H */
-diff -ruN linux-2.6.30.10/arch/ubicom32/include/asm/stat.h linux-2.6.30.10-ubi/arch/ubicom32/include/asm/stat.h
---- linux-2.6.30.10/arch/ubicom32/include/asm/stat.h   1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.30.10-ubi/arch/ubicom32/include/asm/stat.h       2009-12-11 11:45:11.000000000 +0200
+--- /dev/null
++++ b/arch/ubicom32/include/asm/stat.h
 @@ -0,0 +1,104 @@
 +/*
 + * arch/ubicom32/include/asm/stat.h
 @@ -0,0 +1,104 @@
 +/*
 + * arch/ubicom32/include/asm/stat.h
@@ -12538,9 +12421,8 @@ diff -ruN linux-2.6.30.10/arch/ubicom32/include/asm/stat.h linux-2.6.30.10-ubi/a
 +};
 +
 +#endif /* _ASM_UBICOM32_STAT_H */
 +};
 +
 +#endif /* _ASM_UBICOM32_STAT_H */
-diff -ruN linux-2.6.30.10/arch/ubicom32/include/asm/string.h linux-2.6.30.10-ubi/arch/ubicom32/include/asm/string.h
---- linux-2.6.30.10/arch/ubicom32/include/asm/string.h 1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.30.10-ubi/arch/ubicom32/include/asm/string.h     2009-12-11 11:45:11.000000000 +0200
+--- /dev/null
++++ b/arch/ubicom32/include/asm/string.h
 @@ -0,0 +1,40 @@
 +/*
 + * arch/ubicom32/include/asm/string.h
 @@ -0,0 +1,40 @@
 +/*
 + * arch/ubicom32/include/asm/string.h
@@ -12582,9 +12464,8 @@ diff -ruN linux-2.6.30.10/arch/ubicom32/include/asm/string.h linux-2.6.30.10-ubi
 +extern void * memmove(void *to, const void *from, size_t len);
 +
 +#endif /* _ASM_UBICOM32_STRING_H */
 +extern void * memmove(void *to, const void *from, size_t len);
 +
 +#endif /* _ASM_UBICOM32_STRING_H */
-diff -ruN linux-2.6.30.10/arch/ubicom32/include/asm/swab.h linux-2.6.30.10-ubi/arch/ubicom32/include/asm/swab.h
---- linux-2.6.30.10/arch/ubicom32/include/asm/swab.h   1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.30.10-ubi/arch/ubicom32/include/asm/swab.h       2009-12-11 11:45:11.000000000 +0200
+--- /dev/null
++++ b/arch/ubicom32/include/asm/swab.h
 @@ -0,0 +1,45 @@
 +/*
 + * arch/ubicom32/include/asm/byteorder.h
 @@ -0,0 +1,45 @@
 +/*
 + * arch/ubicom32/include/asm/byteorder.h
@@ -12631,9 +12512,8 @@ diff -ruN linux-2.6.30.10/arch/ubicom32/include/asm/swab.h linux-2.6.30.10-ubi/a
 +#endif /* IP7000 */
 +
 +#endif /* _ASM_UBICOM32_BYTEORDER_H */
 +#endif /* IP7000 */
 +
 +#endif /* _ASM_UBICOM32_BYTEORDER_H */
-diff -ruN linux-2.6.30.10/arch/ubicom32/include/asm/switch-dev.h linux-2.6.30.10-ubi/arch/ubicom32/include/asm/switch-dev.h
---- linux-2.6.30.10/arch/ubicom32/include/asm/switch-dev.h     1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.30.10-ubi/arch/ubicom32/include/asm/switch-dev.h 2009-12-11 11:45:11.000000000 +0200
+--- /dev/null
++++ b/arch/ubicom32/include/asm/switch-dev.h
 @@ -0,0 +1,51 @@
 +/*
 + * arch/ubicom32/include/asm/switch-dev.h
 @@ -0,0 +1,51 @@
 +/*
 + * arch/ubicom32/include/asm/switch-dev.h
@@ -12686,9 +12566,8 @@ diff -ruN linux-2.6.30.10/arch/ubicom32/include/asm/switch-dev.h linux-2.6.30.10
 +};
 +
 +#endif /* _ASM_UBICOM32_SWITCH_DEV_H */
 +};
 +
 +#endif /* _ASM_UBICOM32_SWITCH_DEV_H */
-diff -ruN linux-2.6.30.10/arch/ubicom32/include/asm/system.h linux-2.6.30.10-ubi/arch/ubicom32/include/asm/system.h
---- linux-2.6.30.10/arch/ubicom32/include/asm/system.h 1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.30.10-ubi/arch/ubicom32/include/asm/system.h     2009-12-11 11:45:11.000000000 +0200
+--- /dev/null
++++ b/arch/ubicom32/include/asm/system.h
 @@ -0,0 +1,101 @@
 +/*
 + * arch/ubicom32/include/asm/system.h
 @@ -0,0 +1,101 @@
 +/*
 + * arch/ubicom32/include/asm/system.h
@@ -12791,9 +12670,8 @@ diff -ruN linux-2.6.30.10/arch/ubicom32/include/asm/system.h linux-2.6.30.10-ubi
 +// #define __ARCH_WANT_INTERRUPTS_ON_CTXSW
 +
 +#endif /* _ASM_UBICOM32_SYSTEM_H */
 +// #define __ARCH_WANT_INTERRUPTS_ON_CTXSW
 +
 +#endif /* _ASM_UBICOM32_SYSTEM_H */
-diff -ruN linux-2.6.30.10/arch/ubicom32/include/asm/termbits.h linux-2.6.30.10-ubi/arch/ubicom32/include/asm/termbits.h
---- linux-2.6.30.10/arch/ubicom32/include/asm/termbits.h       1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.30.10-ubi/arch/ubicom32/include/asm/termbits.h   2009-12-11 11:45:11.000000000 +0200
+--- /dev/null
++++ b/arch/ubicom32/include/asm/termbits.h
 @@ -0,0 +1,227 @@
 +/*
 + * arch/ubicom32/include/asm/termbits.h
 @@ -0,0 +1,227 @@
 +/*
 + * arch/ubicom32/include/asm/termbits.h
@@ -13022,9 +12900,8 @@ diff -ruN linux-2.6.30.10/arch/ubicom32/include/asm/termbits.h linux-2.6.30.10-u
 +#define       TCSAFLUSH       2
 +
 +#endif /* _ASM_UBICOM32_TERMBITS_H */
 +#define       TCSAFLUSH       2
 +
 +#endif /* _ASM_UBICOM32_TERMBITS_H */
-diff -ruN linux-2.6.30.10/arch/ubicom32/include/asm/termios.h linux-2.6.30.10-ubi/arch/ubicom32/include/asm/termios.h
---- linux-2.6.30.10/arch/ubicom32/include/asm/termios.h        1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.30.10-ubi/arch/ubicom32/include/asm/termios.h    2009-12-11 11:45:11.000000000 +0200
+--- /dev/null
++++ b/arch/ubicom32/include/asm/termios.h
 @@ -0,0 +1,119 @@
 +/*
 + * arch/ubicom32/include/asm/termios.h
 @@ -0,0 +1,119 @@
 +/*
 + * arch/ubicom32/include/asm/termios.h
@@ -13145,9 +13022,8 @@ diff -ruN linux-2.6.30.10/arch/ubicom32/include/asm/termios.h linux-2.6.30.10-ub
 +#endif        /* __KERNEL__ */
 +
 +#endif /* _ASM_UBICOM32_TERMIOS_H */
 +#endif        /* __KERNEL__ */
 +
 +#endif /* _ASM_UBICOM32_TERMIOS_H */
-diff -ruN linux-2.6.30.10/arch/ubicom32/include/asm/thread-asm.h linux-2.6.30.10-ubi/arch/ubicom32/include/asm/thread-asm.h
---- linux-2.6.30.10/arch/ubicom32/include/asm/thread-asm.h     1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.30.10-ubi/arch/ubicom32/include/asm/thread-asm.h 2009-12-11 11:45:11.000000000 +0200
+--- /dev/null
++++ b/arch/ubicom32/include/asm/thread-asm.h
 @@ -0,0 +1,51 @@
 +/*
 + * arch/ubicom32/include/asm/thread-asm.h
 @@ -0,0 +1,51 @@
 +/*
 + * arch/ubicom32/include/asm/thread-asm.h
@@ -13200,9 +13076,8 @@ diff -ruN linux-2.6.30.10/arch/ubicom32/include/asm/thread-asm.h linux-2.6.30.10
 +.endm
 +
 +#endif /* _ASM_UBICOM32_THREAD_ASM_H */
 +.endm
 +
 +#endif /* _ASM_UBICOM32_THREAD_ASM_H */
-diff -ruN linux-2.6.30.10/arch/ubicom32/include/asm/thread.h linux-2.6.30.10-ubi/arch/ubicom32/include/asm/thread.h
---- linux-2.6.30.10/arch/ubicom32/include/asm/thread.h 1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.30.10-ubi/arch/ubicom32/include/asm/thread.h     2009-12-11 11:45:11.000000000 +0200
+--- /dev/null
++++ b/arch/ubicom32/include/asm/thread.h
 @@ -0,0 +1,320 @@
 +/*
 + * arch/ubicom32/include/asm/thread.h
 @@ -0,0 +1,320 @@
 +/*
 + * arch/ubicom32/include/asm/thread.h
@@ -13524,9 +13399,8 @@ diff -ruN linux-2.6.30.10/arch/ubicom32/include/asm/thread.h linux-2.6.30.10-ubi
 +
 +#endif /* __ASSEMBLY__ */
 +#endif /* _ASM_UBICOM32_THREAD_H */
 +
 +#endif /* __ASSEMBLY__ */
 +#endif /* _ASM_UBICOM32_THREAD_H */
-diff -ruN linux-2.6.30.10/arch/ubicom32/include/asm/thread_info.h linux-2.6.30.10-ubi/arch/ubicom32/include/asm/thread_info.h
---- linux-2.6.30.10/arch/ubicom32/include/asm/thread_info.h    1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.30.10-ubi/arch/ubicom32/include/asm/thread_info.h        2009-12-11 11:45:11.000000000 +0200
+--- /dev/null
++++ b/arch/ubicom32/include/asm/thread_info.h
 @@ -0,0 +1,134 @@
 +/*
 + * arch/ubicom32/include/asm/thread_info.h
 @@ -0,0 +1,134 @@
 +/*
 + * arch/ubicom32/include/asm/thread_info.h
@@ -13662,9 +13536,8 @@ diff -ruN linux-2.6.30.10/arch/ubicom32/include/asm/thread_info.h linux-2.6.30.1
 +#endif /* __KERNEL__ */
 +
 +#endif /* _ASM_UBICOM32_THREAD_INFO_H */
 +#endif /* __KERNEL__ */
 +
 +#endif /* _ASM_UBICOM32_THREAD_INFO_H */
-diff -ruN linux-2.6.30.10/arch/ubicom32/include/asm/timex.h linux-2.6.30.10-ubi/arch/ubicom32/include/asm/timex.h
---- linux-2.6.30.10/arch/ubicom32/include/asm/timex.h  1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.30.10-ubi/arch/ubicom32/include/asm/timex.h      2009-12-11 11:45:11.000000000 +0200
+--- /dev/null
++++ b/arch/ubicom32/include/asm/timex.h
 @@ -0,0 +1,56 @@
 +/*
 + * arch/ubicom32/include/asm/timex.h
 @@ -0,0 +1,56 @@
 +/*
 + * arch/ubicom32/include/asm/timex.h
@@ -13722,9 +13595,8 @@ diff -ruN linux-2.6.30.10/arch/ubicom32/include/asm/timex.h linux-2.6.30.10-ubi/
 +#endif
 +
 +#endif /* _ASM_UBICOM32_TIMEX_H */
 +#endif
 +
 +#endif /* _ASM_UBICOM32_TIMEX_H */
-diff -ruN linux-2.6.30.10/arch/ubicom32/include/asm/tlbflush.h linux-2.6.30.10-ubi/arch/ubicom32/include/asm/tlbflush.h
---- linux-2.6.30.10/arch/ubicom32/include/asm/tlbflush.h       1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.30.10-ubi/arch/ubicom32/include/asm/tlbflush.h   2009-12-11 11:45:11.000000000 +0200
+--- /dev/null
++++ b/arch/ubicom32/include/asm/tlbflush.h
 @@ -0,0 +1,79 @@
 +/*
 + * arch/ubicom32/include/asm/tlbflush.h
 @@ -0,0 +1,79 @@
 +/*
 + * arch/ubicom32/include/asm/tlbflush.h
@@ -13805,9 +13677,8 @@ diff -ruN linux-2.6.30.10/arch/ubicom32/include/asm/tlbflush.h linux-2.6.30.10-u
 +}
 +
 +#endif /* _ASM_UBICOM32_TLB_FLUSH_H */
 +}
 +
 +#endif /* _ASM_UBICOM32_TLB_FLUSH_H */
-diff -ruN linux-2.6.30.10/arch/ubicom32/include/asm/tlb.h linux-2.6.30.10-ubi/arch/ubicom32/include/asm/tlb.h
---- linux-2.6.30.10/arch/ubicom32/include/asm/tlb.h    1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.30.10-ubi/arch/ubicom32/include/asm/tlb.h        2009-12-11 11:45:11.000000000 +0200
+--- /dev/null
++++ b/arch/ubicom32/include/asm/tlb.h
 @@ -0,0 +1,47 @@
 +/*
 + * arch/ubicom32/include/asm/tlb.h
 @@ -0,0 +1,47 @@
 +/*
 + * arch/ubicom32/include/asm/tlb.h
@@ -13856,9 +13727,8 @@ diff -ruN linux-2.6.30.10/arch/ubicom32/include/asm/tlb.h linux-2.6.30.10-ubi/ar
 +#include <asm-generic/tlb.h>
 +
 +#endif /* _ASM_UBICOM32_TLB_H */
 +#include <asm-generic/tlb.h>
 +
 +#endif /* _ASM_UBICOM32_TLB_H */
-diff -ruN linux-2.6.30.10/arch/ubicom32/include/asm/topology.h linux-2.6.30.10-ubi/arch/ubicom32/include/asm/topology.h
---- linux-2.6.30.10/arch/ubicom32/include/asm/topology.h       1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.30.10-ubi/arch/ubicom32/include/asm/topology.h   2009-12-11 11:45:11.000000000 +0200
+--- /dev/null
++++ b/arch/ubicom32/include/asm/topology.h
 @@ -0,0 +1,33 @@
 +/*
 + * arch/ubicom32/include/asm/topology.h
 @@ -0,0 +1,33 @@
 +/*
 + * arch/ubicom32/include/asm/topology.h
@@ -13893,9 +13763,8 @@ diff -ruN linux-2.6.30.10/arch/ubicom32/include/asm/topology.h linux-2.6.30.10-u
 +#include <asm-generic/topology.h>
 +
 +#endif /* _ASM_UBICOM32_TOPOLOGY_H */
 +#include <asm-generic/topology.h>
 +
 +#endif /* _ASM_UBICOM32_TOPOLOGY_H */
-diff -ruN linux-2.6.30.10/arch/ubicom32/include/asm/traps.h linux-2.6.30.10-ubi/arch/ubicom32/include/asm/traps.h
---- linux-2.6.30.10/arch/ubicom32/include/asm/traps.h  1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.30.10-ubi/arch/ubicom32/include/asm/traps.h      2009-12-11 11:45:11.000000000 +0200
+--- /dev/null
++++ b/arch/ubicom32/include/asm/traps.h
 @@ -0,0 +1,55 @@
 +/*
 + * arch/ubicom32/include/asm/traps.h
 @@ -0,0 +1,55 @@
 +/*
 + * arch/ubicom32/include/asm/traps.h
@@ -13952,9 +13821,8 @@ diff -ruN linux-2.6.30.10/arch/ubicom32/include/asm/traps.h linux-2.6.30.10-ubi/
 +extern int unaligned_only(unsigned int cause);
 +
 +#endif /* _ASM_UBICOM32_TRAPS_H */
 +extern int unaligned_only(unsigned int cause);
 +
 +#endif /* _ASM_UBICOM32_TRAPS_H */
-diff -ruN linux-2.6.30.10/arch/ubicom32/include/asm/types.h linux-2.6.30.10-ubi/arch/ubicom32/include/asm/types.h
---- linux-2.6.30.10/arch/ubicom32/include/asm/types.h  1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.30.10-ubi/arch/ubicom32/include/asm/types.h      2009-12-11 11:45:11.000000000 +0200
+--- /dev/null
++++ b/arch/ubicom32/include/asm/types.h
 @@ -0,0 +1,75 @@
 +/*
 + * arch/ubicom32/include/asm/types.h
 @@ -0,0 +1,75 @@
 +/*
 + * arch/ubicom32/include/asm/types.h
@@ -14031,9 +13899,8 @@ diff -ruN linux-2.6.30.10/arch/ubicom32/include/asm/types.h linux-2.6.30.10-ubi/
 +#endif /* __KERNEL__ */
 +
 +#endif /* _ASM_UBICOM32_TYPES_H */
 +#endif /* __KERNEL__ */
 +
 +#endif /* _ASM_UBICOM32_TYPES_H */
-diff -ruN linux-2.6.30.10/arch/ubicom32/include/asm/uaccess.h linux-2.6.30.10-ubi/arch/ubicom32/include/asm/uaccess.h
---- linux-2.6.30.10/arch/ubicom32/include/asm/uaccess.h        1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.30.10-ubi/arch/ubicom32/include/asm/uaccess.h    2009-12-11 11:45:11.000000000 +0200
+--- /dev/null
++++ b/arch/ubicom32/include/asm/uaccess.h
 @@ -0,0 +1,347 @@
 +/*
 + * arch/ubicom32/include/asm/uaccess.h
 @@ -0,0 +1,347 @@
 +/*
 + * arch/ubicom32/include/asm/uaccess.h
@@ -14382,9 +14249,8 @@ diff -ruN linux-2.6.30.10/arch/ubicom32/include/asm/uaccess.h linux-2.6.30.10-ub
 +}
 +
 +#endif /* _ASM_UBICOM32_UACCESS_H */
 +}
 +
 +#endif /* _ASM_UBICOM32_UACCESS_H */
-diff -ruN linux-2.6.30.10/arch/ubicom32/include/asm/uart_tio.h linux-2.6.30.10-ubi/arch/ubicom32/include/asm/uart_tio.h
---- linux-2.6.30.10/arch/ubicom32/include/asm/uart_tio.h       1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.30.10-ubi/arch/ubicom32/include/asm/uart_tio.h   2009-12-11 11:45:11.000000000 +0200
+--- /dev/null
++++ b/arch/ubicom32/include/asm/uart_tio.h
 @@ -0,0 +1,126 @@
 +/*
 + * arch/ubicom32/include/asm/uart_tio.h
 @@ -0,0 +1,126 @@
 +/*
 + * arch/ubicom32/include/asm/uart_tio.h
@@ -14512,9 +14378,8 @@ diff -ruN linux-2.6.30.10/arch/ubicom32/include/asm/uart_tio.h linux-2.6.30.10-u
 +};
 +
 +#endif /* _ASM_UBICOM32_UART_TIO_H */
 +};
 +
 +#endif /* _ASM_UBICOM32_UART_TIO_H */
-diff -ruN linux-2.6.30.10/arch/ubicom32/include/asm/ubi32-cs4384.h linux-2.6.30.10-ubi/arch/ubicom32/include/asm/ubi32-cs4384.h
---- linux-2.6.30.10/arch/ubicom32/include/asm/ubi32-cs4384.h   1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.30.10-ubi/arch/ubicom32/include/asm/ubi32-cs4384.h       2009-12-11 11:45:11.000000000 +0200
+--- /dev/null
++++ b/arch/ubicom32/include/asm/ubi32-cs4384.h
 @@ -0,0 +1,52 @@
 +/*
 + * arch/ubicom32/include/asm/ubi32-cs4384.h
 @@ -0,0 +1,52 @@
 +/*
 + * arch/ubicom32/include/asm/ubi32-cs4384.h
@@ -14568,9 +14433,8 @@ diff -ruN linux-2.6.30.10/arch/ubicom32/include/asm/ubi32-cs4384.h linux-2.6.30.
 +      struct ubi32_cs4384_mclk_entry  *mclk_entries;
 +};
 +#endif /* _ASM_UBICOM32_UBI32_CS4384_H */
 +      struct ubi32_cs4384_mclk_entry  *mclk_entries;
 +};
 +#endif /* _ASM_UBICOM32_UBI32_CS4384_H */
-diff -ruN linux-2.6.30.10/arch/ubicom32/include/asm/ubi32-pcm.h linux-2.6.30.10-ubi/arch/ubicom32/include/asm/ubi32-pcm.h
---- linux-2.6.30.10/arch/ubicom32/include/asm/ubi32-pcm.h      1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.30.10-ubi/arch/ubicom32/include/asm/ubi32-pcm.h  2009-12-11 11:45:11.000000000 +0200
+--- /dev/null
++++ b/arch/ubicom32/include/asm/ubi32-pcm.h
 @@ -0,0 +1,54 @@
 +/*
 + * arch/ubicom32/include/asm/ubi32-pcm.h
 @@ -0,0 +1,54 @@
 +/*
 + * arch/ubicom32/include/asm/ubi32-pcm.h
@@ -14626,9 +14490,8 @@ diff -ruN linux-2.6.30.10/arch/ubicom32/include/asm/ubi32-pcm.h linux-2.6.30.10-
 +      void                    *priv_data;
 +};
 +#endif /* _ASM_UBICOM32_UBI32_PCM_H */
 +      void                    *priv_data;
 +};
 +#endif /* _ASM_UBICOM32_UBI32_PCM_H */
-diff -ruN linux-2.6.30.10/arch/ubicom32/include/asm/ubicom32bl.h linux-2.6.30.10-ubi/arch/ubicom32/include/asm/ubicom32bl.h
---- linux-2.6.30.10/arch/ubicom32/include/asm/ubicom32bl.h     1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.30.10-ubi/arch/ubicom32/include/asm/ubicom32bl.h 2009-12-11 11:45:11.000000000 +0200
+--- /dev/null
++++ b/arch/ubicom32/include/asm/ubicom32bl.h
 @@ -0,0 +1,84 @@
 +/*
 + * arch/ubicom32/include/asm/ubicom32bl.h
 @@ -0,0 +1,84 @@
 +/*
 + * arch/ubicom32/include/asm/ubicom32bl.h
@@ -14714,9 +14577,8 @@ diff -ruN linux-2.6.30.10/arch/ubicom32/include/asm/ubicom32bl.h linux-2.6.30.10
 +};
 +
 +#endif /* _ASM_UBICOM32_UBICOM32_BL_H */
 +};
 +
 +#endif /* _ASM_UBICOM32_UBICOM32_BL_H */
-diff -ruN linux-2.6.30.10/arch/ubicom32/include/asm/ubicom32-common-asm.h linux-2.6.30.10-ubi/arch/ubicom32/include/asm/ubicom32-common-asm.h
---- linux-2.6.30.10/arch/ubicom32/include/asm/ubicom32-common-asm.h    1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.30.10-ubi/arch/ubicom32/include/asm/ubicom32-common-asm.h        2009-12-11 11:45:11.000000000 +0200
+--- /dev/null
++++ b/arch/ubicom32/include/asm/ubicom32-common-asm.h
 @@ -0,0 +1,49 @@
 +/*
 + * arch/ubicom32/include/asm/ubicom32-common-asm.h
 @@ -0,0 +1,49 @@
 +/*
 + * arch/ubicom32/include/asm/ubicom32-common-asm.h
@@ -14767,9 +14629,8 @@ diff -ruN linux-2.6.30.10/arch/ubicom32/include/asm/ubicom32-common-asm.h linux-
 +.endm
 +
 +#endif /* _ASM_UBICOM32_UBICOM32_COMMON_ASM_H */
 +.endm
 +
 +#endif /* _ASM_UBICOM32_UBICOM32_COMMON_ASM_H */
-diff -ruN linux-2.6.30.10/arch/ubicom32/include/asm/ubicom32-common.h linux-2.6.30.10-ubi/arch/ubicom32/include/asm/ubicom32-common.h
---- linux-2.6.30.10/arch/ubicom32/include/asm/ubicom32-common.h        1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.30.10-ubi/arch/ubicom32/include/asm/ubicom32-common.h    2009-12-11 11:45:11.000000000 +0200
+--- /dev/null
++++ b/arch/ubicom32/include/asm/ubicom32-common.h
 @@ -0,0 +1,128 @@
 +/*
 + * arch/ubicom32/include/asm/ubicom32-common.h
 @@ -0,0 +1,128 @@
 +/*
 + * arch/ubicom32/include/asm/ubicom32-common.h
@@ -14899,9 +14760,8 @@ diff -ruN linux-2.6.30.10/arch/ubicom32/include/asm/ubicom32-common.h linux-2.6.
 +
 +#endif /* __ASSEMBLY__ */
 +#endif /* _ASM_UBICOM32_UBICOM32_COMMON_H */
 +
 +#endif /* __ASSEMBLY__ */
 +#endif /* _ASM_UBICOM32_UBICOM32_COMMON_H */
-diff -ruN linux-2.6.30.10/arch/ubicom32/include/asm/ubicom32fb.h linux-2.6.30.10-ubi/arch/ubicom32/include/asm/ubicom32fb.h
---- linux-2.6.30.10/arch/ubicom32/include/asm/ubicom32fb.h     1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.30.10-ubi/arch/ubicom32/include/asm/ubicom32fb.h 2009-12-11 11:45:11.000000000 +0200
+--- /dev/null
++++ b/arch/ubicom32/include/asm/ubicom32fb.h
 @@ -0,0 +1,56 @@
 +/*
 + * arch/ubicom32/include/asm/ubicom32fb.h
 @@ -0,0 +1,56 @@
 +/*
 + * arch/ubicom32/include/asm/ubicom32fb.h
@@ -14959,9 +14819,8 @@ diff -ruN linux-2.6.30.10/arch/ubicom32/include/asm/ubicom32fb.h linux-2.6.30.10
 +#define UBICOM32FB_IOCTL_SET_MODE_FLAG_SCALE_ENABLE   (1 << 0)
 +
 +#endif /* _ASM_UBICOM32_UBICOM32FB_H */
 +#define UBICOM32FB_IOCTL_SET_MODE_FLAG_SCALE_ENABLE   (1 << 0)
 +
 +#endif /* _ASM_UBICOM32_UBICOM32FB_H */
-diff -ruN linux-2.6.30.10/arch/ubicom32/include/asm/ubicom32hid.h linux-2.6.30.10-ubi/arch/ubicom32/include/asm/ubicom32hid.h
---- linux-2.6.30.10/arch/ubicom32/include/asm/ubicom32hid.h    1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.30.10-ubi/arch/ubicom32/include/asm/ubicom32hid.h        2009-12-11 11:45:11.000000000 +0200
+--- /dev/null
++++ b/arch/ubicom32/include/asm/ubicom32hid.h
 @@ -0,0 +1,133 @@
 +/*
 + * arch/ubicom32/include/asm/ubicom32hid.h
 @@ -0,0 +1,133 @@
 +/*
 + * arch/ubicom32/include/asm/ubicom32hid.h
@@ -15096,9 +14955,8 @@ diff -ruN linux-2.6.30.10/arch/ubicom32/include/asm/ubicom32hid.h linux-2.6.30.1
 +};
 +
 +#endif /* _ASM_UBICOM32_UBICOM32_HID_H */
 +};
 +
 +#endif /* _ASM_UBICOM32_UBICOM32_HID_H */
-diff -ruN linux-2.6.30.10/arch/ubicom32/include/asm/ubicom32input.h linux-2.6.30.10-ubi/arch/ubicom32/include/asm/ubicom32input.h
---- linux-2.6.30.10/arch/ubicom32/include/asm/ubicom32input.h  1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.30.10-ubi/arch/ubicom32/include/asm/ubicom32input.h      2009-12-11 11:45:11.000000000 +0200
+--- /dev/null
++++ b/arch/ubicom32/include/asm/ubicom32input.h
 @@ -0,0 +1,76 @@
 +/*
 + * arch/ubicom32/include/asm/ubicom32input.h
 @@ -0,0 +1,76 @@
 +/*
 + * arch/ubicom32/include/asm/ubicom32input.h
@@ -15176,9 +15034,8 @@ diff -ruN linux-2.6.30.10/arch/ubicom32/include/asm/ubicom32input.h linux-2.6.30
 +};
 +
 +#endif /* _ASM_UBICOM32_UBICOM32_INPUT_H */
 +};
 +
 +#endif /* _ASM_UBICOM32_UBICOM32_INPUT_H */
-diff -ruN linux-2.6.30.10/arch/ubicom32/include/asm/ubicom32input_i2c.h linux-2.6.30.10-ubi/arch/ubicom32/include/asm/ubicom32input_i2c.h
---- linux-2.6.30.10/arch/ubicom32/include/asm/ubicom32input_i2c.h      1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.30.10-ubi/arch/ubicom32/include/asm/ubicom32input_i2c.h  2009-12-11 11:45:11.000000000 +0200
+--- /dev/null
++++ b/arch/ubicom32/include/asm/ubicom32input_i2c.h
 @@ -0,0 +1,71 @@
 +/*
 + * arch/ubicom32/include/asm/ubicom32input_i2c.h
 @@ -0,0 +1,71 @@
 +/*
 + * arch/ubicom32/include/asm/ubicom32input_i2c.h
@@ -15251,9 +15108,8 @@ diff -ruN linux-2.6.30.10/arch/ubicom32/include/asm/ubicom32input_i2c.h linux-2.
 +};
 +
 +#endif /* _ASM_UBICOM32_UBICOM32_INPUT_I2C_H */
 +};
 +
 +#endif /* _ASM_UBICOM32_UBICOM32_INPUT_I2C_H */
-diff -ruN linux-2.6.30.10/arch/ubicom32/include/asm/ubicom32lcd.h linux-2.6.30.10-ubi/arch/ubicom32/include/asm/ubicom32lcd.h
---- linux-2.6.30.10/arch/ubicom32/include/asm/ubicom32lcd.h    1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.30.10-ubi/arch/ubicom32/include/asm/ubicom32lcd.h        2009-12-11 11:45:11.000000000 +0200
+--- /dev/null
++++ b/arch/ubicom32/include/asm/ubicom32lcd.h
 @@ -0,0 +1,38 @@
 +/*
 + * arch/ubicom32/include/asm/ubicom32lcd.h
 @@ -0,0 +1,38 @@
 +/*
 + * arch/ubicom32/include/asm/ubicom32lcd.h
@@ -15293,9 +15149,8 @@ diff -ruN linux-2.6.30.10/arch/ubicom32/include/asm/ubicom32lcd.h linux-2.6.30.1
 +};
 +
 +#endif /* _ASM_UBICOM32_UBICOM32_LCD_H */
 +};
 +
 +#endif /* _ASM_UBICOM32_UBICOM32_LCD_H */
-diff -ruN linux-2.6.30.10/arch/ubicom32/include/asm/ubicom32lcdpower.h linux-2.6.30.10-ubi/arch/ubicom32/include/asm/ubicom32lcdpower.h
---- linux-2.6.30.10/arch/ubicom32/include/asm/ubicom32lcdpower.h       1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.30.10-ubi/arch/ubicom32/include/asm/ubicom32lcdpower.h   2009-12-11 11:45:11.000000000 +0200
+--- /dev/null
++++ b/arch/ubicom32/include/asm/ubicom32lcdpower.h
 @@ -0,0 +1,39 @@
 +/*
 + * arch/ubicom32/include/asm/ubicom32lcdpower.h
 @@ -0,0 +1,39 @@
 +/*
 + * arch/ubicom32/include/asm/ubicom32lcdpower.h
@@ -15336,9 +15191,8 @@ diff -ruN linux-2.6.30.10/arch/ubicom32/include/asm/ubicom32lcdpower.h linux-2.6
 +};
 +
 +#endif /* _ASM_UBICOM32_UBICOM32_LCDPOWER_H */
 +};
 +
 +#endif /* _ASM_UBICOM32_UBICOM32_LCDPOWER_H */
-diff -ruN linux-2.6.30.10/arch/ubicom32/include/asm/ubicom32ring.h linux-2.6.30.10-ubi/arch/ubicom32/include/asm/ubicom32ring.h
---- linux-2.6.30.10/arch/ubicom32/include/asm/ubicom32ring.h   1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.30.10-ubi/arch/ubicom32/include/asm/ubicom32ring.h       2009-12-11 11:45:11.000000000 +0200
+--- /dev/null
++++ b/arch/ubicom32/include/asm/ubicom32ring.h
 @@ -0,0 +1,103 @@
 +/*
 + * arch/ubicom32/include/asm/ubicom32ring.h
 @@ -0,0 +1,103 @@
 +/*
 + * arch/ubicom32/include/asm/ubicom32ring.h
@@ -15443,9 +15297,8 @@ diff -ruN linux-2.6.30.10/arch/ubicom32/include/asm/ubicom32ring.h linux-2.6.30.
 +}
 +
 +#endif /* _ASM_UBICOM32_UBICOM32RING_H */
 +}
 +
 +#endif /* _ASM_UBICOM32_UBICOM32RING_H */
-diff -ruN linux-2.6.30.10/arch/ubicom32/include/asm/ubicom32sd.h linux-2.6.30.10-ubi/arch/ubicom32/include/asm/ubicom32sd.h
---- linux-2.6.30.10/arch/ubicom32/include/asm/ubicom32sd.h     1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.30.10-ubi/arch/ubicom32/include/asm/ubicom32sd.h 2009-12-11 11:45:11.000000000 +0200
+--- /dev/null
++++ b/arch/ubicom32/include/asm/ubicom32sd.h
 @@ -0,0 +1,45 @@
 +/*
 + * arch/ubicom32/include/asm/ubicom32sd.h
 @@ -0,0 +1,45 @@
 +/*
 + * arch/ubicom32/include/asm/ubicom32sd.h
@@ -15492,9 +15345,8 @@ diff -ruN linux-2.6.30.10/arch/ubicom32/include/asm/ubicom32sd.h linux-2.6.30.10
 +};
 +
 +#endif /* _ASM_UBICOM32_UBICOM32_SD_H */
 +};
 +
 +#endif /* _ASM_UBICOM32_UBICOM32_SD_H */
-diff -ruN linux-2.6.30.10/arch/ubicom32/include/asm/ubicom32-spi-gpio.h linux-2.6.30.10-ubi/arch/ubicom32/include/asm/ubicom32-spi-gpio.h
---- linux-2.6.30.10/arch/ubicom32/include/asm/ubicom32-spi-gpio.h      1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.30.10-ubi/arch/ubicom32/include/asm/ubicom32-spi-gpio.h  2009-12-11 11:45:11.000000000 +0200
+--- /dev/null
++++ b/arch/ubicom32/include/asm/ubicom32-spi-gpio.h
 @@ -0,0 +1,62 @@
 +/*
 + * arch/ubicom32/include/asm/ubicom32-spi-gpio.h
 @@ -0,0 +1,62 @@
 +/*
 + * arch/ubicom32/include/asm/ubicom32-spi-gpio.h
@@ -15558,9 +15410,8 @@ diff -ruN linux-2.6.30.10/arch/ubicom32/include/asm/ubicom32-spi-gpio.h linux-2.
 +};
 +
 +#endif /* _ASM_UBICOM32_UBICOM32_SPI_GPIO_H */
 +};
 +
 +#endif /* _ASM_UBICOM32_UBICOM32_SPI_GPIO_H */
-diff -ruN linux-2.6.30.10/arch/ubicom32/include/asm/ubicom32suart.h linux-2.6.30.10-ubi/arch/ubicom32/include/asm/ubicom32suart.h
---- linux-2.6.30.10/arch/ubicom32/include/asm/ubicom32suart.h  1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.30.10-ubi/arch/ubicom32/include/asm/ubicom32suart.h      2009-12-11 11:45:11.000000000 +0200
+--- /dev/null
++++ b/arch/ubicom32/include/asm/ubicom32suart.h
 @@ -0,0 +1,36 @@
 +/*
 + * arch/ubicom32/include/asm/ubicom32suart.h
 @@ -0,0 +1,36 @@
 +/*
 + * arch/ubicom32/include/asm/ubicom32suart.h
@@ -15598,9 +15449,8 @@ diff -ruN linux-2.6.30.10/arch/ubicom32/include/asm/ubicom32suart.h linux-2.6.30
 +#define UBICOM32_SUART_IORESOURCE_CLOCK               (1)
 +
 +#endif /* _ASM_UBICOM32_UBICOM32_SUART_H */
 +#define UBICOM32_SUART_IORESOURCE_CLOCK               (1)
 +
 +#endif /* _ASM_UBICOM32_UBICOM32_SUART_H */
-diff -ruN linux-2.6.30.10/arch/ubicom32/include/asm/ubicom32-tio.h linux-2.6.30.10-ubi/arch/ubicom32/include/asm/ubicom32-tio.h
---- linux-2.6.30.10/arch/ubicom32/include/asm/ubicom32-tio.h   1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.30.10-ubi/arch/ubicom32/include/asm/ubicom32-tio.h       2009-12-11 11:45:11.000000000 +0200
+--- /dev/null
++++ b/arch/ubicom32/include/asm/ubicom32-tio.h
 @@ -0,0 +1,42 @@
 +/*
 + * arch/ubicom32/include/asm/ubicom32-tio.h
 @@ -0,0 +1,42 @@
 +/*
 + * arch/ubicom32/include/asm/ubicom32-tio.h
@@ -15644,9 +15494,8 @@ diff -ruN linux-2.6.30.10/arch/ubicom32/include/asm/ubicom32-tio.h linux-2.6.30.
 +extern void usb_tio_read_int_status(u8_t *int_usb, u16_t *int_tx, u16_t *int_rx);
 +
 +#endif /* _ASM_UBICOM32_UBICOM32_TIO_H */
 +extern void usb_tio_read_int_status(u8_t *int_usb, u16_t *int_tx, u16_t *int_rx);
 +
 +#endif /* _ASM_UBICOM32_UBICOM32_TIO_H */
-diff -ruN linux-2.6.30.10/arch/ubicom32/include/asm/ucontext.h linux-2.6.30.10-ubi/arch/ubicom32/include/asm/ucontext.h
---- linux-2.6.30.10/arch/ubicom32/include/asm/ucontext.h       1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.30.10-ubi/arch/ubicom32/include/asm/ucontext.h   2009-12-11 11:45:11.000000000 +0200
+--- /dev/null
++++ b/arch/ubicom32/include/asm/ucontext.h
 @@ -0,0 +1,39 @@
 +/*
 + * arch/ubicom32/include/asm/ucontext.h
 @@ -0,0 +1,39 @@
 +/*
 + * arch/ubicom32/include/asm/ucontext.h
@@ -15687,9 +15536,8 @@ diff -ruN linux-2.6.30.10/arch/ubicom32/include/asm/ucontext.h linux-2.6.30.10-u
 +};
 +
 +#endif /* _ASM_UBICOM32_UCONTEXT_H */
 +};
 +
 +#endif /* _ASM_UBICOM32_UCONTEXT_H */
-diff -ruN linux-2.6.30.10/arch/ubicom32/include/asm/unaligned.h linux-2.6.30.10-ubi/arch/ubicom32/include/asm/unaligned.h
---- linux-2.6.30.10/arch/ubicom32/include/asm/unaligned.h      1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.30.10-ubi/arch/ubicom32/include/asm/unaligned.h  2009-12-11 11:45:11.000000000 +0200
+--- /dev/null
++++ b/arch/ubicom32/include/asm/unaligned.h
 @@ -0,0 +1,44 @@
 +/*
 + * arch/ubicom32/include/asm/unaligned.h
 @@ -0,0 +1,44 @@
 +/*
 + * arch/ubicom32/include/asm/unaligned.h
@@ -15735,9 +15583,8 @@ diff -ruN linux-2.6.30.10/arch/ubicom32/include/asm/unaligned.h linux-2.6.30.10-
 +#define put_unaligned __put_unaligned_be
 +
 +#endif /* _ASM_UBICOM32_UNALIGNED_H */
 +#define put_unaligned __put_unaligned_be
 +
 +#endif /* _ASM_UBICOM32_UNALIGNED_H */
-diff -ruN linux-2.6.30.10/arch/ubicom32/include/asm/unistd.h linux-2.6.30.10-ubi/arch/ubicom32/include/asm/unistd.h
---- linux-2.6.30.10/arch/ubicom32/include/asm/unistd.h 1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.30.10-ubi/arch/ubicom32/include/asm/unistd.h     2009-12-11 11:45:11.000000000 +0200
+--- /dev/null
++++ b/arch/ubicom32/include/asm/unistd.h
 @@ -0,0 +1,400 @@
 +/*
 + * arch/ubicom32/include/asm/unistd.h
 @@ -0,0 +1,400 @@
 +/*
 + * arch/ubicom32/include/asm/unistd.h
@@ -16139,9 +15986,8 @@ diff -ruN linux-2.6.30.10/arch/ubicom32/include/asm/unistd.h linux-2.6.30.10-ubi
 +#endif /* __KERNEL__ */
 +
 +#endif /* _ASM_UBICOM32_UNISTD_H */
 +#endif /* __KERNEL__ */
 +
 +#endif /* _ASM_UBICOM32_UNISTD_H */
-diff -ruN linux-2.6.30.10/arch/ubicom32/include/asm/user.h linux-2.6.30.10-ubi/arch/ubicom32/include/asm/user.h
---- linux-2.6.30.10/arch/ubicom32/include/asm/user.h   1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.30.10-ubi/arch/ubicom32/include/asm/user.h       2009-12-11 11:45:11.000000000 +0200
+--- /dev/null
++++ b/arch/ubicom32/include/asm/user.h
 @@ -0,0 +1,82 @@
 +/*
 + * arch/ubicom32/include/asm/user.h
 @@ -0,0 +1,82 @@
 +/*
 + * arch/ubicom32/include/asm/user.h
@@ -16225,9 +16071,8 @@ diff -ruN linux-2.6.30.10/arch/ubicom32/include/asm/user.h linux-2.6.30.10-ubi/a
 +#define HOST_STACK_END_ADDR   (u.start_stack + u.u_ssize * NBPG)
 +
 +#endif        /* _ASM_UBICOM32_USER_H */
 +#define HOST_STACK_END_ADDR   (u.start_stack + u.u_ssize * NBPG)
 +
 +#endif        /* _ASM_UBICOM32_USER_H */
-diff -ruN linux-2.6.30.10/arch/ubicom32/include/asm/vdc_tio.h linux-2.6.30.10-ubi/arch/ubicom32/include/asm/vdc_tio.h
---- linux-2.6.30.10/arch/ubicom32/include/asm/vdc_tio.h        1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.30.10-ubi/arch/ubicom32/include/asm/vdc_tio.h    2009-12-11 11:45:11.000000000 +0200
+--- /dev/null
++++ b/arch/ubicom32/include/asm/vdc_tio.h
 @@ -0,0 +1,129 @@
 +/*
 + * arch/ubicom32/include/asm/vdc_tio.h
 @@ -0,0 +1,129 @@
 +/*
 + * arch/ubicom32/include/asm/vdc_tio.h
@@ -16358,9 +16203,8 @@ diff -ruN linux-2.6.30.10/arch/ubicom32/include/asm/vdc_tio.h linux-2.6.30.10-ub
 +extern void vdc_tio_init(void);
 +
 +#endif /* _ASM_UBICOM32_VDC_TIO_H */
 +extern void vdc_tio_init(void);
 +
 +#endif /* _ASM_UBICOM32_VDC_TIO_H */
-diff -ruN linux-2.6.30.10/arch/ubicom32/include/asm/vga.h linux-2.6.30.10-ubi/arch/ubicom32/include/asm/vga.h
---- linux-2.6.30.10/arch/ubicom32/include/asm/vga.h    1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.30.10-ubi/arch/ubicom32/include/asm/vga.h        2009-12-11 11:45:11.000000000 +0200
+--- /dev/null
++++ b/arch/ubicom32/include/asm/vga.h
 @@ -0,0 +1,71 @@
 +/*
 + * arch/ubicom32/include/asm/vga.h
 @@ -0,0 +1,71 @@
 +/*
 + * arch/ubicom32/include/asm/vga.h
@@ -16433,9 +16277,8 @@ diff -ruN linux-2.6.30.10/arch/ubicom32/include/asm/vga.h linux-2.6.30.10-ubi/ar
 +#define VT_BUF_HAVE_MEMMOVEW
 +
 +#endif /* _ASM_UBICOM32_VGA_H */
 +#define VT_BUF_HAVE_MEMMOVEW
 +
 +#endif /* _ASM_UBICOM32_VGA_H */
-diff -ruN linux-2.6.30.10/arch/ubicom32/include/asm/xor.h linux-2.6.30.10-ubi/arch/ubicom32/include/asm/xor.h
---- linux-2.6.30.10/arch/ubicom32/include/asm/xor.h    1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.30.10-ubi/arch/ubicom32/include/asm/xor.h        2009-12-11 11:45:11.000000000 +0200
+--- /dev/null
++++ b/arch/ubicom32/include/asm/xor.h
 @@ -0,0 +1,33 @@
 +/*
 + * arch/ubicom32/include/asm/xor.h
 @@ -0,0 +1,33 @@
 +/*
 + * arch/ubicom32/include/asm/xor.h
@@ -16470,9 +16313,8 @@ diff -ruN linux-2.6.30.10/arch/ubicom32/include/asm/xor.h linux-2.6.30.10-ubi/ar
 +#include <asm-generic/xor.h>
 +
 +#endif /* _ASM_UBICOM32_XOR_H */
 +#include <asm-generic/xor.h>
 +
 +#endif /* _ASM_UBICOM32_XOR_H */
-diff -ruN linux-2.6.30.10/arch/ubicom32/Kconfig linux-2.6.30.10-ubi/arch/ubicom32/Kconfig
---- linux-2.6.30.10/arch/ubicom32/Kconfig      1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.30.10-ubi/arch/ubicom32/Kconfig  2009-12-11 11:45:11.000000000 +0200
+--- /dev/null
++++ b/arch/ubicom32/Kconfig
 @@ -0,0 +1,403 @@
 +#
 +# For a description of the syntax of this configuration file,
 @@ -0,0 +1,403 @@
 +#
 +# For a description of the syntax of this configuration file,
@@ -16877,9 +16719,8 @@ diff -ruN linux-2.6.30.10/arch/ubicom32/Kconfig linux-2.6.30.10-ubi/arch/ubicom3
 +source "security/Kconfig"
 +source "crypto/Kconfig"
 +source "lib/Kconfig"
 +source "security/Kconfig"
 +source "crypto/Kconfig"
 +source "lib/Kconfig"
-diff -ruN linux-2.6.30.10/arch/ubicom32/Kconfig.debug linux-2.6.30.10-ubi/arch/ubicom32/Kconfig.debug
---- linux-2.6.30.10/arch/ubicom32/Kconfig.debug        1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.30.10-ubi/arch/ubicom32/Kconfig.debug    2009-12-11 11:45:11.000000000 +0200
+--- /dev/null
++++ b/arch/ubicom32/Kconfig.debug
 @@ -0,0 +1,129 @@
 +menu "Kernel hacking"
 +
 @@ -0,0 +1,129 @@
 +menu "Kernel hacking"
 +
@@ -17010,9 +16851,8 @@ diff -ruN linux-2.6.30.10/arch/ubicom32/Kconfig.debug linux-2.6.30.10-ubi/arch/u
 +source "lib/Kconfig.debug"
 +
 +endmenu
 +source "lib/Kconfig.debug"
 +
 +endmenu
-diff -ruN linux-2.6.30.10/arch/ubicom32/kernel/asm-offsets.c linux-2.6.30.10-ubi/arch/ubicom32/kernel/asm-offsets.c
---- linux-2.6.30.10/arch/ubicom32/kernel/asm-offsets.c 1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.30.10-ubi/arch/ubicom32/kernel/asm-offsets.c     2009-12-11 11:45:11.000000000 +0200
+--- /dev/null
++++ b/arch/ubicom32/kernel/asm-offsets.c
 @@ -0,0 +1,161 @@
 +/*
 + * arch/ubicom32/kernel/asm-offsets.c
 @@ -0,0 +1,161 @@
 +/*
 + * arch/ubicom32/kernel/asm-offsets.c
@@ -17175,9 +17015,8 @@ diff -ruN linux-2.6.30.10/arch/ubicom32/kernel/asm-offsets.c linux-2.6.30.10-ubi
 +
 +      return 0;
 +}
 +
 +      return 0;
 +}
-diff -ruN linux-2.6.30.10/arch/ubicom32/kernel/devtree.c linux-2.6.30.10-ubi/arch/ubicom32/kernel/devtree.c
---- linux-2.6.30.10/arch/ubicom32/kernel/devtree.c     1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.30.10-ubi/arch/ubicom32/kernel/devtree.c 2009-12-11 11:45:11.000000000 +0200
+--- /dev/null
++++ b/arch/ubicom32/kernel/devtree.c
 @@ -0,0 +1,173 @@
 +/*
 + * arch/ubicom32/kernel/devtree.c
 @@ -0,0 +1,173 @@
 +/*
 + * arch/ubicom32/kernel/devtree.c
@@ -17352,9 +17191,8 @@ diff -ruN linux-2.6.30.10/arch/ubicom32/kernel/devtree.c linux-2.6.30.10-ubi/arc
 +      return NULL;
 +}
 +EXPORT_SYMBOL(devtree_find_node);
 +      return NULL;
 +}
 +EXPORT_SYMBOL(devtree_find_node);
-diff -ruN linux-2.6.30.10/arch/ubicom32/kernel/dma.c linux-2.6.30.10-ubi/arch/ubicom32/kernel/dma.c
---- linux-2.6.30.10/arch/ubicom32/kernel/dma.c 1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.30.10-ubi/arch/ubicom32/kernel/dma.c     2009-12-11 11:45:11.000000000 +0200
+--- /dev/null
++++ b/arch/ubicom32/kernel/dma.c
 @@ -0,0 +1,60 @@
 +/*
 + * arch/ubicom32/kernel/dma.c
 @@ -0,0 +1,60 @@
 +/*
 + * arch/ubicom32/kernel/dma.c
@@ -17416,9 +17254,8 @@ diff -ruN linux-2.6.30.10/arch/ubicom32/kernel/dma.c linux-2.6.30.10-ubi/arch/ub
 +{
 +      free_pages((unsigned long)vaddr, get_order(size));
 +}
 +{
 +      free_pages((unsigned long)vaddr, get_order(size));
 +}
-diff -ruN linux-2.6.30.10/arch/ubicom32/kernel/flat.c linux-2.6.30.10-ubi/arch/ubicom32/kernel/flat.c
---- linux-2.6.30.10/arch/ubicom32/kernel/flat.c        1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.30.10-ubi/arch/ubicom32/kernel/flat.c    2009-12-11 11:45:11.000000000 +0200
+--- /dev/null
++++ b/arch/ubicom32/kernel/flat.c
 @@ -0,0 +1,206 @@
 +/*
 + * arch/ubicom32/kernel/flat.c
 @@ -0,0 +1,206 @@
 +/*
 + * arch/ubicom32/kernel/flat.c
@@ -17626,9 +17463,8 @@ diff -ruN linux-2.6.30.10/arch/ubicom32/kernel/flat.c linux-2.6.30.10-ubi/arch/u
 +              *persistent = 0;
 +      }
 +}
 +              *persistent = 0;
 +      }
 +}
-diff -ruN linux-2.6.30.10/arch/ubicom32/kernel/head.S linux-2.6.30.10-ubi/arch/ubicom32/kernel/head.S
---- linux-2.6.30.10/arch/ubicom32/kernel/head.S        1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.30.10-ubi/arch/ubicom32/kernel/head.S    2009-12-11 11:45:11.000000000 +0200
+--- /dev/null
++++ b/arch/ubicom32/kernel/head.S
 @@ -0,0 +1,273 @@
 +/*
 + * arch/ubicom32/kernel/head.S
 @@ -0,0 +1,273 @@
 +/*
 + * arch/ubicom32/kernel/head.S
@@ -17903,9 +17739,8 @@ diff -ruN linux-2.6.30.10/arch/ubicom32/kernel/head.S linux-2.6.30.10-ubi/arch/u
 +      moveai          SRC_AN, #%hi(start_kernel)
 +      lea.4           SRC_AN, %lo(start_kernel)(SRC_AN)
 +      ret             SRC_AN
 +      moveai          SRC_AN, #%hi(start_kernel)
 +      lea.4           SRC_AN, %lo(start_kernel)(SRC_AN)
 +      ret             SRC_AN
-diff -ruN linux-2.6.30.10/arch/ubicom32/kernel/init_task.c linux-2.6.30.10-ubi/arch/ubicom32/kernel/init_task.c
---- linux-2.6.30.10/arch/ubicom32/kernel/init_task.c   1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.30.10-ubi/arch/ubicom32/kernel/init_task.c       2009-12-11 11:45:11.000000000 +0200
+--- /dev/null
++++ b/arch/ubicom32/kernel/init_task.c
 @@ -0,0 +1,62 @@
 +/*
 + * arch/ubicom32/kernel/init_task.c
 @@ -0,0 +1,62 @@
 +/*
 + * arch/ubicom32/kernel/init_task.c
@@ -17969,9 +17804,8 @@ diff -ruN linux-2.6.30.10/arch/ubicom32/kernel/init_task.c linux-2.6.30.10-ubi/a
 +union thread_union init_thread_union
 +      __attribute__((__section__(".data.init_task"))) =
 +              { INIT_THREAD_INFO(init_task) };
 +union thread_union init_thread_union
 +      __attribute__((__section__(".data.init_task"))) =
 +              { INIT_THREAD_INFO(init_task) };
-diff -ruN linux-2.6.30.10/arch/ubicom32/kernel/irq.c linux-2.6.30.10-ubi/arch/ubicom32/kernel/irq.c
---- linux-2.6.30.10/arch/ubicom32/kernel/irq.c 1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.30.10-ubi/arch/ubicom32/kernel/irq.c     2009-12-11 11:45:11.000000000 +0200
+--- /dev/null
++++ b/arch/ubicom32/kernel/irq.c
 @@ -0,0 +1,597 @@
 +/*
 + * arch/ubicom32/kernel/irq.c
 @@ -0,0 +1,597 @@
 +/*
 + * arch/ubicom32/kernel/irq.c
@@ -18570,9 +18404,8 @@ diff -ruN linux-2.6.30.10/arch/ubicom32/kernel/irq.c linux-2.6.30.10-ubi/arch/ub
 +       */
 +      trap_init_interrupt();
 +}
 +       */
 +      trap_init_interrupt();
 +}
-diff -ruN linux-2.6.30.10/arch/ubicom32/kernel/ldsr.c linux-2.6.30.10-ubi/arch/ubicom32/kernel/ldsr.c
---- linux-2.6.30.10/arch/ubicom32/kernel/ldsr.c        1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.30.10-ubi/arch/ubicom32/kernel/ldsr.c    2009-12-11 11:45:11.000000000 +0200
+--- /dev/null
++++ b/arch/ubicom32/kernel/ldsr.c
 @@ -0,0 +1,1185 @@
 +/*
 + * arch/ubicom32/kernel/ldsr.c
 @@ -0,0 +1,1185 @@
 +/*
 + * arch/ubicom32/kernel/ldsr.c
@@ -19759,9 +19592,8 @@ diff -ruN linux-2.6.30.10/arch/ubicom32/kernel/ldsr.c linux-2.6.30.10-ubi/arch/u
 +      thread_start(ldsr_tid, ldsr_thread, NULL,
 +                   stack_high, THREAD_TYPE_NORMAL);
 +}
 +      thread_start(ldsr_tid, ldsr_thread, NULL,
 +                   stack_high, THREAD_TYPE_NORMAL);
 +}
-diff -ruN linux-2.6.30.10/arch/ubicom32/kernel/Makefile linux-2.6.30.10-ubi/arch/ubicom32/kernel/Makefile
---- linux-2.6.30.10/arch/ubicom32/kernel/Makefile      1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.30.10-ubi/arch/ubicom32/kernel/Makefile  2009-12-11 11:45:11.000000000 +0200
+--- /dev/null
++++ b/arch/ubicom32/kernel/Makefile
 @@ -0,0 +1,64 @@
 +#
 +# arch/ubicom32/kernel/Makefile
 @@ -0,0 +1,64 @@
 +#
 +# arch/ubicom32/kernel/Makefile
@@ -19827,9 +19659,8 @@ diff -ruN linux-2.6.30.10/arch/ubicom32/kernel/Makefile linux-2.6.30.10-ubi/arch
 +ifndef CONFIG_GENERIC_CLOCKEVENTS
 +obj-y                 += timer_tick.o
 +endif
 +ifndef CONFIG_GENERIC_CLOCKEVENTS
 +obj-y                 += timer_tick.o
 +endif
-diff -ruN linux-2.6.30.10/arch/ubicom32/kernel/module.c linux-2.6.30.10-ubi/arch/ubicom32/kernel/module.c
---- linux-2.6.30.10/arch/ubicom32/kernel/module.c      1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.30.10-ubi/arch/ubicom32/kernel/module.c  2009-12-11 11:45:11.000000000 +0200
+--- /dev/null
++++ b/arch/ubicom32/kernel/module.c
 @@ -0,0 +1,463 @@
 +/*
 + * arch/ubicom32/kernel/module.c
 @@ -0,0 +1,463 @@
 +/*
 + * arch/ubicom32/kernel/module.c
@@ -20294,9 +20125,8 @@ diff -ruN linux-2.6.30.10/arch/ubicom32/kernel/module.c linux-2.6.30.10-ubi/arch
 +{
 +      module_bug_cleanup(mod);
 +}
 +{
 +      module_bug_cleanup(mod);
 +}
-diff -ruN linux-2.6.30.10/arch/ubicom32/kernel/os_node.c linux-2.6.30.10-ubi/arch/ubicom32/kernel/os_node.c
---- linux-2.6.30.10/arch/ubicom32/kernel/os_node.c     1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.30.10-ubi/arch/ubicom32/kernel/os_node.c 2009-12-11 11:45:11.000000000 +0200
+--- /dev/null
++++ b/arch/ubicom32/kernel/os_node.c
 @@ -0,0 +1,88 @@
 +/*
 + * arch/ubicom32/kernel/os_node.c
 @@ -0,0 +1,88 @@
 +/*
 + * arch/ubicom32/kernel/os_node.c
@@ -20386,9 +20216,8 @@ diff -ruN linux-2.6.30.10/arch/ubicom32/kernel/os_node.c linux-2.6.30.10-ubi/arc
 +
 +
 +};
 +
 +
 +};
-diff -ruN linux-2.6.30.10/arch/ubicom32/kernel/process.c linux-2.6.30.10-ubi/arch/ubicom32/kernel/process.c
---- linux-2.6.30.10/arch/ubicom32/kernel/process.c     1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.30.10-ubi/arch/ubicom32/kernel/process.c 2009-12-11 11:45:11.000000000 +0200
+--- /dev/null
++++ b/arch/ubicom32/kernel/process.c
 @@ -0,0 +1,634 @@
 +/*
 + * arch/ubicom32/kernel/process.c
 @@ -0,0 +1,634 @@
 +/*
 + * arch/ubicom32/kernel/process.c
@@ -21024,9 +20853,8 @@ diff -ruN linux-2.6.30.10/arch/ubicom32/kernel/process.c linux-2.6.30.10-ubi/arc
 +                           struct thread_struct *prev_switch,
 +                           struct thread_struct *next_switch)
 +      __attribute__((naked));
 +                           struct thread_struct *prev_switch,
 +                           struct thread_struct *next_switch)
 +      __attribute__((naked));
-diff -ruN linux-2.6.30.10/arch/ubicom32/kernel/processor.c linux-2.6.30.10-ubi/arch/ubicom32/kernel/processor.c
---- linux-2.6.30.10/arch/ubicom32/kernel/processor.c   1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.30.10-ubi/arch/ubicom32/kernel/processor.c       2009-12-11 11:45:11.000000000 +0200
+--- /dev/null
++++ b/arch/ubicom32/kernel/processor.c
 @@ -0,0 +1,348 @@
 +/*
 + * arch/ubicom32/kernel/processor.c
 @@ -0,0 +1,348 @@
 +/*
 + * arch/ubicom32/kernel/processor.c
@@ -21376,9 +21204,8 @@ diff -ruN linux-2.6.30.10/arch/ubicom32/kernel/processor.c linux-2.6.30.10-ubi/a
 +      }
 +
 +}
 +      }
 +
 +}
-diff -ruN linux-2.6.30.10/arch/ubicom32/kernel/ptrace.c linux-2.6.30.10-ubi/arch/ubicom32/kernel/ptrace.c
---- linux-2.6.30.10/arch/ubicom32/kernel/ptrace.c      1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.30.10-ubi/arch/ubicom32/kernel/ptrace.c  2009-12-11 11:45:11.000000000 +0200
+--- /dev/null
++++ b/arch/ubicom32/kernel/ptrace.c
 @@ -0,0 +1,275 @@
 +/*
 + * arch/ubicom32/kernel/ptrace.c
 @@ -0,0 +1,275 @@
 +/*
 + * arch/ubicom32/kernel/ptrace.c
@@ -21655,9 +21482,8 @@ diff -ruN linux-2.6.30.10/arch/ubicom32/kernel/ptrace.c linux-2.6.30.10-ubi/arch
 +              current->exit_code = 0;
 +      }
 +}
 +              current->exit_code = 0;
 +      }
 +}
-diff -ruN linux-2.6.30.10/arch/ubicom32/kernel/semaphore.c linux-2.6.30.10-ubi/arch/ubicom32/kernel/semaphore.c
---- linux-2.6.30.10/arch/ubicom32/kernel/semaphore.c   1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.30.10-ubi/arch/ubicom32/kernel/semaphore.c       2009-12-11 11:45:11.000000000 +0200
+--- /dev/null
++++ b/arch/ubicom32/kernel/semaphore.c
 @@ -0,0 +1,159 @@
 +/*
 + * arch/ubicom32/kernel/semaphore.c
 @@ -0,0 +1,159 @@
 +/*
 + * arch/ubicom32/kernel/semaphore.c
@@ -21818,9 +21644,8 @@ diff -ruN linux-2.6.30.10/arch/ubicom32/kernel/semaphore.c linux-2.6.30.10-ubi/a
 +{
 +      return waking_non_zero_trylock(sem);
 +}
 +{
 +      return waking_non_zero_trylock(sem);
 +}
-diff -ruN linux-2.6.30.10/arch/ubicom32/kernel/setup.c linux-2.6.30.10-ubi/arch/ubicom32/kernel/setup.c
---- linux-2.6.30.10/arch/ubicom32/kernel/setup.c       1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.30.10-ubi/arch/ubicom32/kernel/setup.c   2009-12-11 11:45:11.000000000 +0200
+--- /dev/null
++++ b/arch/ubicom32/kernel/setup.c
 @@ -0,0 +1,194 @@
 +/*
 + * arch/ubicom32/kernel/setup.c
 @@ -0,0 +1,194 @@
 +/*
 + * arch/ubicom32/kernel/setup.c
@@ -22016,9 +21841,8 @@ diff -ruN linux-2.6.30.10/arch/ubicom32/kernel/setup.c linux-2.6.30.10-ubi/arch/
 +      sw_ksp[thread_get_self()] = (unsigned int) current_thread_info();
 +      thread_set_mainline(thread_get_self());
 +}
 +      sw_ksp[thread_get_self()] = (unsigned int) current_thread_info();
 +      thread_set_mainline(thread_get_self());
 +}
-diff -ruN linux-2.6.30.10/arch/ubicom32/kernel/signal.c linux-2.6.30.10-ubi/arch/ubicom32/kernel/signal.c
---- linux-2.6.30.10/arch/ubicom32/kernel/signal.c      1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.30.10-ubi/arch/ubicom32/kernel/signal.c  2009-12-11 11:45:11.000000000 +0200
+--- /dev/null
++++ b/arch/ubicom32/kernel/signal.c
 @@ -0,0 +1,458 @@
 +/*
 + * arch/ubicom32/kernel/signal.c
 @@ -0,0 +1,458 @@
 +/*
 + * arch/ubicom32/kernel/signal.c
@@ -22478,9 +22302,8 @@ diff -ruN linux-2.6.30.10/arch/ubicom32/kernel/signal.c linux-2.6.30.10-ubi/arch
 +{
 +      return -ENOSYS;
 +}
 +{
 +      return -ENOSYS;
 +}
-diff -ruN linux-2.6.30.10/arch/ubicom32/kernel/smp.c linux-2.6.30.10-ubi/arch/ubicom32/kernel/smp.c
---- linux-2.6.30.10/arch/ubicom32/kernel/smp.c 1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.30.10-ubi/arch/ubicom32/kernel/smp.c     2009-12-11 11:45:11.000000000 +0200
+--- /dev/null
++++ b/arch/ubicom32/kernel/smp.c
 @@ -0,0 +1,806 @@
 +/*
 + * arch/ubicom32/kernel/smp.c
 @@ -0,0 +1,806 @@
 +/*
 + * arch/ubicom32/kernel/smp.c
@@ -23288,9 +23111,8 @@ diff -ruN linux-2.6.30.10/arch/ubicom32/kernel/smp.c linux-2.6.30.10-ubi/arch/ub
 +      current_thread_info()->cpu = 0;
 +      p->tid = thread_get_self();
 +}
 +      current_thread_info()->cpu = 0;
 +      p->tid = thread_get_self();
 +}
-diff -ruN linux-2.6.30.10/arch/ubicom32/kernel/stacktrace.c linux-2.6.30.10-ubi/arch/ubicom32/kernel/stacktrace.c
---- linux-2.6.30.10/arch/ubicom32/kernel/stacktrace.c  1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.30.10-ubi/arch/ubicom32/kernel/stacktrace.c      2009-12-11 11:45:11.000000000 +0200
+--- /dev/null
++++ b/arch/ubicom32/kernel/stacktrace.c
 @@ -0,0 +1,244 @@
 +/*
 + * arch/ubicom32/kernel/stacktrace.c
 @@ -0,0 +1,244 @@
 +/*
 + * arch/ubicom32/kernel/stacktrace.c
@@ -23536,9 +23358,8 @@ diff -ruN linux-2.6.30.10/arch/ubicom32/kernel/stacktrace.c linux-2.6.30.10-ubi/
 +}
 +EXPORT_SYMBOL_GPL(save_stack_trace_tsk);
 +#endif /* CONFIG_STACKTRACE */
 +}
 +EXPORT_SYMBOL_GPL(save_stack_trace_tsk);
 +#endif /* CONFIG_STACKTRACE */
-diff -ruN linux-2.6.30.10/arch/ubicom32/kernel/syscalltable.S linux-2.6.30.10-ubi/arch/ubicom32/kernel/syscalltable.S
---- linux-2.6.30.10/arch/ubicom32/kernel/syscalltable.S        1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.30.10-ubi/arch/ubicom32/kernel/syscalltable.S    2009-12-11 11:45:11.000000000 +0200
+--- /dev/null
++++ b/arch/ubicom32/kernel/syscalltable.S
 @@ -0,0 +1,376 @@
 +/*
 + * arch/ubicom32/kernel/syscalltable.S
 @@ -0,0 +1,376 @@
 +/*
 + * arch/ubicom32/kernel/syscalltable.S
@@ -23916,9 +23737,8 @@ diff -ruN linux-2.6.30.10/arch/ubicom32/kernel/syscalltable.S linux-2.6.30.10-ub
 +      .rept NR_syscalls-(.-sys_call_table)/4
 +              .long sys_ni_syscall
 +      .endr
 +      .rept NR_syscalls-(.-sys_call_table)/4
 +              .long sys_ni_syscall
 +      .endr
-diff -ruN linux-2.6.30.10/arch/ubicom32/kernel/sys_ubicom32.c linux-2.6.30.10-ubi/arch/ubicom32/kernel/sys_ubicom32.c
---- linux-2.6.30.10/arch/ubicom32/kernel/sys_ubicom32.c        1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.30.10-ubi/arch/ubicom32/kernel/sys_ubicom32.c    2009-12-11 11:45:11.000000000 +0200
+--- /dev/null
++++ b/arch/ubicom32/kernel/sys_ubicom32.c
 @@ -0,0 +1,237 @@
 +/*
 + * arch/ubicom32/kernel/sys_ubicom32.c
 @@ -0,0 +1,237 @@
 +/*
 + * arch/ubicom32/kernel/sys_ubicom32.c
@@ -24157,9 +23977,8 @@ diff -ruN linux-2.6.30.10/arch/ubicom32/kernel/sys_ubicom32.c linux-2.6.30.10-ub
 +{
 +      return PAGE_SIZE;
 +}
 +{
 +      return PAGE_SIZE;
 +}
-diff -ruN linux-2.6.30.10/arch/ubicom32/kernel/thread.c linux-2.6.30.10-ubi/arch/ubicom32/kernel/thread.c
---- linux-2.6.30.10/arch/ubicom32/kernel/thread.c      1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.30.10-ubi/arch/ubicom32/kernel/thread.c  2009-12-11 11:45:11.000000000 +0200
+--- /dev/null
++++ b/arch/ubicom32/kernel/thread.c
 @@ -0,0 +1,228 @@
 +/*
 + * arch/ubicom32/kernel/thread.c
 @@ -0,0 +1,228 @@
 +/*
 + * arch/ubicom32/kernel/thread.c
@@ -24389,9 +24208,8 @@ diff -ruN linux-2.6.30.10/arch/ubicom32/kernel/thread.c linux-2.6.30.10-ubi/arch
 +
 +      return (thread_t)-1;
 +}
 +
 +      return (thread_t)-1;
 +}
-diff -ruN linux-2.6.30.10/arch/ubicom32/kernel/time.c linux-2.6.30.10-ubi/arch/ubicom32/kernel/time.c
---- linux-2.6.30.10/arch/ubicom32/kernel/time.c        1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.30.10-ubi/arch/ubicom32/kernel/time.c    2009-12-11 11:45:11.000000000 +0200
+--- /dev/null
++++ b/arch/ubicom32/kernel/time.c
 @@ -0,0 +1,212 @@
 +/*
 + * arch/ubicom32/kernel/time.c
 @@ -0,0 +1,212 @@
 +/*
 + * arch/ubicom32/kernel/time.c
@@ -24605,9 +24423,8 @@ diff -ruN linux-2.6.30.10/arch/ubicom32/kernel/time.c linux-2.6.30.10-ubi/arch/u
 +      timer_tick_init();
 +#endif
 +}
 +      timer_tick_init();
 +#endif
 +}
-diff -ruN linux-2.6.30.10/arch/ubicom32/kernel/timer_broadcast.c linux-2.6.30.10-ubi/arch/ubicom32/kernel/timer_broadcast.c
---- linux-2.6.30.10/arch/ubicom32/kernel/timer_broadcast.c     1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.30.10-ubi/arch/ubicom32/kernel/timer_broadcast.c 2009-12-11 11:45:11.000000000 +0200
+--- /dev/null
++++ b/arch/ubicom32/kernel/timer_broadcast.c
 @@ -0,0 +1,102 @@
 +/*
 + * arch/ubicom32/kernel/timer_broadcast.c
 @@ -0,0 +1,102 @@
 +/*
 + * arch/ubicom32/kernel/timer_broadcast.c
@@ -24711,9 +24528,8 @@ diff -ruN linux-2.6.30.10/arch/ubicom32/kernel/timer_broadcast.c linux-2.6.30.10
 +      clockevents_register_device(dev);
 +      return 0;
 +}
 +      clockevents_register_device(dev);
 +      return 0;
 +}
-diff -ruN linux-2.6.30.10/arch/ubicom32/kernel/timer_device.c linux-2.6.30.10-ubi/arch/ubicom32/kernel/timer_device.c
---- linux-2.6.30.10/arch/ubicom32/kernel/timer_device.c        1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.30.10-ubi/arch/ubicom32/kernel/timer_device.c    2009-12-11 11:45:11.000000000 +0200
+--- /dev/null
++++ b/arch/ubicom32/kernel/timer_device.c
 @@ -0,0 +1,301 @@
 +/*
 + * arch/ubicom32/kernel/timer_device.c
 @@ -0,0 +1,301 @@
 +/*
 + * arch/ubicom32/kernel/timer_device.c
@@ -25016,9 +24832,8 @@ diff -ruN linux-2.6.30.10/arch/ubicom32/kernel/timer_device.c linux-2.6.30.10-ub
 +              timer_device_alloc_event("timer-extra", -1, CPU_MASK_ALL_PTR);
 +      }
 +}
 +              timer_device_alloc_event("timer-extra", -1, CPU_MASK_ALL_PTR);
 +      }
 +}
-diff -ruN linux-2.6.30.10/arch/ubicom32/kernel/timer_tick.c linux-2.6.30.10-ubi/arch/ubicom32/kernel/timer_tick.c
---- linux-2.6.30.10/arch/ubicom32/kernel/timer_tick.c  1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.30.10-ubi/arch/ubicom32/kernel/timer_tick.c      2009-12-11 11:45:11.000000000 +0200
+--- /dev/null
++++ b/arch/ubicom32/kernel/timer_tick.c
 @@ -0,0 +1,109 @@
 +/*
 + * arch/ubicom32/kernel/timer_tick.c
 @@ -0,0 +1,109 @@
 +/*
 + * arch/ubicom32/kernel/timer_tick.c
@@ -25129,9 +24944,8 @@ diff -ruN linux-2.6.30.10/arch/ubicom32/kernel/timer_tick.c linux-2.6.30.10-ubi/
 +      printk(KERN_NOTICE "timer will interrupt every: %d cycles\n", frequency);
 +      timer_set(timervector, frequency);
 +}
 +      printk(KERN_NOTICE "timer will interrupt every: %d cycles\n", frequency);
 +      timer_set(timervector, frequency);
 +}
-diff -ruN linux-2.6.30.10/arch/ubicom32/kernel/topology.c linux-2.6.30.10-ubi/arch/ubicom32/kernel/topology.c
---- linux-2.6.30.10/arch/ubicom32/kernel/topology.c    1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.30.10-ubi/arch/ubicom32/kernel/topology.c        2009-12-11 11:45:11.000000000 +0200
+--- /dev/null
++++ b/arch/ubicom32/kernel/topology.c
 @@ -0,0 +1,47 @@
 +/*
 + * arch/ubicom32/kernel/topology.c
 @@ -0,0 +1,47 @@
 +/*
 + * arch/ubicom32/kernel/topology.c
@@ -25180,9 +24994,8 @@ diff -ruN linux-2.6.30.10/arch/ubicom32/kernel/topology.c linux-2.6.30.10-ubi/ar
 +}
 +
 +subsys_initcall(topology_init);
 +}
 +
 +subsys_initcall(topology_init);
-diff -ruN linux-2.6.30.10/arch/ubicom32/kernel/traps.c linux-2.6.30.10-ubi/arch/ubicom32/kernel/traps.c
---- linux-2.6.30.10/arch/ubicom32/kernel/traps.c       1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.30.10-ubi/arch/ubicom32/kernel/traps.c   2009-12-11 11:45:11.000000000 +0200
+--- /dev/null
++++ b/arch/ubicom32/kernel/traps.c
 @@ -0,0 +1,514 @@
 +/*
 + * arch/ubicom32/kernel/traps.c
 @@ -0,0 +1,514 @@
 +/*
 + * arch/ubicom32/kernel/traps.c
@@ -25698,9 +25511,8 @@ diff -ruN linux-2.6.30.10/arch/ubicom32/kernel/traps.c linux-2.6.30.10-ubi/arch/
 +              return;
 +      }
 +}
 +              return;
 +      }
 +}
-diff -ruN linux-2.6.30.10/arch/ubicom32/kernel/uaccess.c linux-2.6.30.10-ubi/arch/ubicom32/kernel/uaccess.c
---- linux-2.6.30.10/arch/ubicom32/kernel/uaccess.c     1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.30.10-ubi/arch/ubicom32/kernel/uaccess.c 2009-12-11 11:45:11.000000000 +0200
+--- /dev/null
++++ b/arch/ubicom32/kernel/uaccess.c
 @@ -0,0 +1,109 @@
 +/*
 + * arch/ubicom32/include/asm/uaccess.c
 @@ -0,0 +1,109 @@
 +/*
 + * arch/ubicom32/include/asm/uaccess.c
@@ -25811,9 +25623,8 @@ diff -ruN linux-2.6.30.10/arch/ubicom32/kernel/uaccess.c linux-2.6.30.10-ubi/arc
 +}
 +
 +EXPORT_SYMBOL(__access_ok);
 +}
 +
 +EXPORT_SYMBOL(__access_ok);
-diff -ruN linux-2.6.30.10/arch/ubicom32/kernel/ubicom32_context_switch.S linux-2.6.30.10-ubi/arch/ubicom32/kernel/ubicom32_context_switch.S
---- linux-2.6.30.10/arch/ubicom32/kernel/ubicom32_context_switch.S     1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.30.10-ubi/arch/ubicom32/kernel/ubicom32_context_switch.S 2009-12-11 11:45:11.000000000 +0200
+--- /dev/null
++++ b/arch/ubicom32/kernel/ubicom32_context_switch.S
 @@ -0,0 +1,359 @@
 +/*
 + * arch/ubicom32/kernel/ubicom32_context_switch.S
 @@ -0,0 +1,359 @@
 +/*
 + * arch/ubicom32/kernel/ubicom32_context_switch.S
@@ -26174,9 +25985,8 @@ diff -ruN linux-2.6.30.10/arch/ubicom32/kernel/ubicom32_context_switch.S linux-2
 +      move.4  16(a3), mac_rc16
 +      ret     a5
 +      .size ubicom32_emulate_insn, . - ubicom32_emulate_insn
 +      move.4  16(a3), mac_rc16
 +      ret     a5
 +      .size ubicom32_emulate_insn, . - ubicom32_emulate_insn
-diff -ruN linux-2.6.30.10/arch/ubicom32/kernel/ubicom32_ksyms.c linux-2.6.30.10-ubi/arch/ubicom32/kernel/ubicom32_ksyms.c
---- linux-2.6.30.10/arch/ubicom32/kernel/ubicom32_ksyms.c      1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.30.10-ubi/arch/ubicom32/kernel/ubicom32_ksyms.c  2009-12-11 11:45:11.000000000 +0200
+--- /dev/null
++++ b/arch/ubicom32/kernel/ubicom32_ksyms.c
 @@ -0,0 +1,98 @@
 +/*
 + * arch/ubicom32/kernel/ubicom32_ksyms.c
 @@ -0,0 +1,98 @@
 +/*
 + * arch/ubicom32/kernel/ubicom32_ksyms.c
@@ -26276,9 +26086,8 @@ diff -ruN linux-2.6.30.10/arch/ubicom32/kernel/ubicom32_ksyms.c linux-2.6.30.10-
 +EXPORT_SYMBOL(__libgcc_udivmodsi);
 +EXPORT_SYMBOL(__libgcc_divmodsi);
 +#endif
 +EXPORT_SYMBOL(__libgcc_udivmodsi);
 +EXPORT_SYMBOL(__libgcc_divmodsi);
 +#endif
-diff -ruN linux-2.6.30.10/arch/ubicom32/kernel/ubicom32_syscall.S linux-2.6.30.10-ubi/arch/ubicom32/kernel/ubicom32_syscall.S
---- linux-2.6.30.10/arch/ubicom32/kernel/ubicom32_syscall.S    1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.30.10-ubi/arch/ubicom32/kernel/ubicom32_syscall.S        2009-12-11 11:45:11.000000000 +0200
+--- /dev/null
++++ b/arch/ubicom32/kernel/ubicom32_syscall.S
 @@ -0,0 +1,694 @@
 +/*
 + * arch/ubicom32/kernel/ubicom32_syscall.S
 @@ -0,0 +1,694 @@
 +/*
 + * arch/ubicom32/kernel/ubicom32_syscall.S
@@ -26974,9 +26783,8 @@ diff -ruN linux-2.6.30.10/arch/ubicom32/kernel/ubicom32_syscall.S linux-2.6.30.1
 +      call    a3, do_sys_sigaltstack
 +
 +      .size sys_sigaltstack, . - sys_sigaltstack
 +      call    a3, do_sys_sigaltstack
 +
 +      .size sys_sigaltstack, . - sys_sigaltstack
-diff -ruN linux-2.6.30.10/arch/ubicom32/kernel/unaligned_trap.c linux-2.6.30.10-ubi/arch/ubicom32/kernel/unaligned_trap.c
---- linux-2.6.30.10/arch/ubicom32/kernel/unaligned_trap.c      1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.30.10-ubi/arch/ubicom32/kernel/unaligned_trap.c  2009-12-11 11:45:11.000000000 +0200
+--- /dev/null
++++ b/arch/ubicom32/kernel/unaligned_trap.c
 @@ -0,0 +1,698 @@
 +/*
 + * arch/ubicom32/kernel/unaligned_trap.c
 @@ -0,0 +1,698 @@
 +/*
 + * arch/ubicom32/kernel/unaligned_trap.c
@@ -27676,9 +27484,8 @@ diff -ruN linux-2.6.30.10/arch/ubicom32/kernel/unaligned_trap.c linux-2.6.30.10-
 +      BUG_ON(cause == 0);
 +      return (cause & unaligned_cause_mask) == cause;
 +}
 +      BUG_ON(cause == 0);
 +      return (cause & unaligned_cause_mask) == cause;
 +}
-diff -ruN linux-2.6.30.10/arch/ubicom32/kernel/vmlinux.lds.S linux-2.6.30.10-ubi/arch/ubicom32/kernel/vmlinux.lds.S
---- linux-2.6.30.10/arch/ubicom32/kernel/vmlinux.lds.S 1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.30.10-ubi/arch/ubicom32/kernel/vmlinux.lds.S     2009-12-11 11:45:11.000000000 +0200
+--- /dev/null
++++ b/arch/ubicom32/kernel/vmlinux.lds.S
 @@ -0,0 +1,370 @@
 +/*
 + * arch/ubicom32/kernel/vmlinux.lds.S
 @@ -0,0 +1,370 @@
 +/*
 + * arch/ubicom32/kernel/vmlinux.lds.S
@@ -28050,9 +27857,8 @@ diff -ruN linux-2.6.30.10/arch/ubicom32/kernel/vmlinux.lds.S linux-2.6.30.10-ubi
 +      NOTES > BSS
 +
 +}
 +      NOTES > BSS
 +
 +}
-diff -ruN linux-2.6.30.10/arch/ubicom32/lib/checksum.c linux-2.6.30.10-ubi/arch/ubicom32/lib/checksum.c
---- linux-2.6.30.10/arch/ubicom32/lib/checksum.c       1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.30.10-ubi/arch/ubicom32/lib/checksum.c   2009-12-11 11:45:11.000000000 +0200
+--- /dev/null
++++ b/arch/ubicom32/lib/checksum.c
 @@ -0,0 +1,250 @@
 +/*
 + * arch/ubicom32/lib/checksum.c
 @@ -0,0 +1,250 @@
 +/*
 + * arch/ubicom32/lib/checksum.c
@@ -28304,9 +28110,8 @@ diff -ruN linux-2.6.30.10/arch/ubicom32/lib/checksum.c linux-2.6.30.10-ubi/arch/
 +      memcpy(dst, src, len);
 +      return csum_partial(dst, len, sum);
 +}
 +      memcpy(dst, src, len);
 +      return csum_partial(dst, len, sum);
 +}
-diff -ruN linux-2.6.30.10/arch/ubicom32/lib/delay.c linux-2.6.30.10-ubi/arch/ubicom32/lib/delay.c
---- linux-2.6.30.10/arch/ubicom32/lib/delay.c  1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.30.10-ubi/arch/ubicom32/lib/delay.c      2009-12-11 11:45:11.000000000 +0200
+--- /dev/null
++++ b/arch/ubicom32/lib/delay.c
 @@ -0,0 +1,49 @@
 +/*
 + * arch/ubicom32/lib/delay.c
 @@ -0,0 +1,49 @@
 +/*
 + * arch/ubicom32/lib/delay.c
@@ -28357,9 +28162,8 @@ diff -ruN linux-2.6.30.10/arch/ubicom32/lib/delay.c linux-2.6.30.10-ubi/arch/ubi
 +      _udelay(usecs);
 +}
 +EXPORT_SYMBOL(udelay);
 +      _udelay(usecs);
 +}
 +EXPORT_SYMBOL(udelay);
-diff -ruN linux-2.6.30.10/arch/ubicom32/lib/Makefile linux-2.6.30.10-ubi/arch/ubicom32/lib/Makefile
---- linux-2.6.30.10/arch/ubicom32/lib/Makefile 1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.30.10-ubi/arch/ubicom32/lib/Makefile     2009-12-11 11:45:11.000000000 +0200
+--- /dev/null
++++ b/arch/ubicom32/lib/Makefile
 @@ -0,0 +1,32 @@
 +#
 +# arch/ubicom32/lib/Makefile
 @@ -0,0 +1,32 @@
 +#
 +# arch/ubicom32/lib/Makefile
@@ -28393,9 +28197,8 @@ diff -ruN linux-2.6.30.10/arch/ubicom32/lib/Makefile linux-2.6.30.10-ubi/arch/ub
 +#
 +
 +lib-y := checksum.o delay.o mem_ubicom32.o
 +#
 +
 +lib-y := checksum.o delay.o mem_ubicom32.o
-diff -ruN linux-2.6.30.10/arch/ubicom32/lib/mem_ubicom32.c linux-2.6.30.10-ubi/arch/ubicom32/lib/mem_ubicom32.c
---- linux-2.6.30.10/arch/ubicom32/lib/mem_ubicom32.c   1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.30.10-ubi/arch/ubicom32/lib/mem_ubicom32.c       2009-12-11 11:45:11.000000000 +0200
+--- /dev/null
++++ b/arch/ubicom32/lib/mem_ubicom32.c
 @@ -0,0 +1,343 @@
 +/*
 + * arch/ubicom32/lib/mem_ubicom32.c
 @@ -0,0 +1,343 @@
 +/*
 + * arch/ubicom32/lib/mem_ubicom32.c
@@ -28740,9 +28543,8 @@ diff -ruN linux-2.6.30.10/arch/ubicom32/lib/mem_ubicom32.c linux-2.6.30.10-ubi/a
 +      }
 +      return dest;
 +}
 +      }
 +      return dest;
 +}
-diff -ruN linux-2.6.30.10/arch/ubicom32/mach-common/audio.c linux-2.6.30.10-ubi/arch/ubicom32/mach-common/audio.c
---- linux-2.6.30.10/arch/ubicom32/mach-common/audio.c  1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.30.10-ubi/arch/ubicom32/mach-common/audio.c      2009-12-11 11:45:11.000000000 +0200
+--- /dev/null
++++ b/arch/ubicom32/mach-common/audio.c
 @@ -0,0 +1,134 @@
 +/*
 + * arch/ubicom32/mach-common/audio.c
 @@ -0,0 +1,134 @@
 +/*
 + * arch/ubicom32/mach-common/audio.c
@@ -28878,9 +28680,8 @@ diff -ruN linux-2.6.30.10/arch/ubicom32/mach-common/audio.c linux-2.6.30.10-ubi/
 +
 +      return pdev;
 +}
 +
 +      return pdev;
 +}
-diff -ruN linux-2.6.30.10/arch/ubicom32/mach-common/board.c linux-2.6.30.10-ubi/arch/ubicom32/mach-common/board.c
---- linux-2.6.30.10/arch/ubicom32/mach-common/board.c  1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.30.10-ubi/arch/ubicom32/mach-common/board.c      2009-12-11 11:45:11.000000000 +0200
+--- /dev/null
++++ b/arch/ubicom32/mach-common/board.c
 @@ -0,0 +1,63 @@
 +/*
 + * arch/ubicom32/mach-common/board.c
 @@ -0,0 +1,63 @@
 +/*
 + * arch/ubicom32/mach-common/board.c
@@ -28945,9 +28746,8 @@ diff -ruN linux-2.6.30.10/arch/ubicom32/mach-common/board.c linux-2.6.30.10-ubi/
 +              return;
 +      }
 +}
 +              return;
 +      }
 +}
-diff -ruN linux-2.6.30.10/arch/ubicom32/mach-common/bootargs.c linux-2.6.30.10-ubi/arch/ubicom32/mach-common/bootargs.c
---- linux-2.6.30.10/arch/ubicom32/mach-common/bootargs.c       1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.30.10-ubi/arch/ubicom32/mach-common/bootargs.c   2009-12-11 11:45:11.000000000 +0200
+--- /dev/null
++++ b/arch/ubicom32/mach-common/bootargs.c
 @@ -0,0 +1,63 @@
 +/*
 + * arch/ubicom32/mach-common/bootargs.c
 @@ -0,0 +1,63 @@
 +/*
 + * arch/ubicom32/mach-common/bootargs.c
@@ -29012,9 +28812,8 @@ diff -ruN linux-2.6.30.10/arch/ubicom32/mach-common/bootargs.c linux-2.6.30.10-u
 +              return;
 +      }
 +}
 +              return;
 +      }
 +}
-diff -ruN linux-2.6.30.10/arch/ubicom32/mach-common/cachectl.c linux-2.6.30.10-ubi/arch/ubicom32/mach-common/cachectl.c
---- linux-2.6.30.10/arch/ubicom32/mach-common/cachectl.c       1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.30.10-ubi/arch/ubicom32/mach-common/cachectl.c   2009-12-11 11:45:11.000000000 +0200
+--- /dev/null
++++ b/arch/ubicom32/mach-common/cachectl.c
 @@ -0,0 +1,136 @@
 +/*
 + * arch/ubicom32/mach-common/cachectl.c
 @@ -0,0 +1,136 @@
 +/*
 + * arch/ubicom32/mach-common/cachectl.c
@@ -29152,9 +28951,8 @@ diff -ruN linux-2.6.30.10/arch/ubicom32/mach-common/cachectl.c linux-2.6.30.10-u
 +
 +}
 +EXPORT_SYMBOL(mem_cache_control);
 +
 +}
 +EXPORT_SYMBOL(mem_cache_control);
-diff -ruN linux-2.6.30.10/arch/ubicom32/mach-common/common.c linux-2.6.30.10-ubi/arch/ubicom32/mach-common/common.c
---- linux-2.6.30.10/arch/ubicom32/mach-common/common.c 1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.30.10-ubi/arch/ubicom32/mach-common/common.c     2009-12-11 11:45:11.000000000 +0200
+--- /dev/null
++++ b/arch/ubicom32/mach-common/common.c
 @@ -0,0 +1,64 @@
 +/*
 + * arch/ubicom32/mach-common/common.c
 @@ -0,0 +1,64 @@
 +/*
 + * arch/ubicom32/mach-common/common.c
@@ -29220,9 +29018,8 @@ diff -ruN linux-2.6.30.10/arch/ubicom32/mach-common/common.c linux-2.6.30.10-ubi
 +{
 +}
 +EXPORT_SYMBOL(clk_disable);
 +{
 +}
 +EXPORT_SYMBOL(clk_disable);
-diff -ruN linux-2.6.30.10/arch/ubicom32/mach-common/io.c linux-2.6.30.10-ubi/arch/ubicom32/mach-common/io.c
---- linux-2.6.30.10/arch/ubicom32/mach-common/io.c     1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.30.10-ubi/arch/ubicom32/mach-common/io.c 2009-12-11 11:45:11.000000000 +0200
+--- /dev/null
++++ b/arch/ubicom32/mach-common/io.c
 @@ -0,0 +1,250 @@
 +/*
 + * arch/ubicom32/mach-common/io.c
 @@ -0,0 +1,250 @@
 +/*
 + * arch/ubicom32/mach-common/io.c
@@ -29474,9 +29271,8 @@ diff -ruN linux-2.6.30.10/arch/ubicom32/mach-common/io.c linux-2.6.30.10-ubi/arc
 +EXPORT_SYMBOL(iowrite32_rep);
 +
 +#endif /* CONFIG_PCI */
 +EXPORT_SYMBOL(iowrite32_rep);
 +
 +#endif /* CONFIG_PCI */
-diff -ruN linux-2.6.30.10/arch/ubicom32/mach-common/Kconfig.switch linux-2.6.30.10-ubi/arch/ubicom32/mach-common/Kconfig.switch
---- linux-2.6.30.10/arch/ubicom32/mach-common/Kconfig.switch   1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.30.10-ubi/arch/ubicom32/mach-common/Kconfig.switch       2009-12-11 11:45:11.000000000 +0200
+--- /dev/null
++++ b/arch/ubicom32/mach-common/Kconfig.switch
 @@ -0,0 +1,12 @@
 +menuconfig UBICOM_SWITCH
 +      tristate "Switch devices"
 @@ -0,0 +1,12 @@
 +menuconfig UBICOM_SWITCH
 +      tristate "Switch devices"
@@ -29490,9 +29286,8 @@ diff -ruN linux-2.6.30.10/arch/ubicom32/mach-common/Kconfig.switch linux-2.6.30.
 +      help
 +              Supports Broadcom BCM539X Gigabit Ethernet Switches over SPI
 +endif
 +      help
 +              Supports Broadcom BCM539X Gigabit Ethernet Switches over SPI
 +endif
-diff -ruN linux-2.6.30.10/arch/ubicom32/mach-common/Makefile linux-2.6.30.10-ubi/arch/ubicom32/mach-common/Makefile
---- linux-2.6.30.10/arch/ubicom32/mach-common/Makefile 1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.30.10-ubi/arch/ubicom32/mach-common/Makefile     2009-12-11 11:45:11.000000000 +0200
+--- /dev/null
++++ b/arch/ubicom32/mach-common/Makefile
 @@ -0,0 +1,41 @@
 +#
 +# arch/ubicom32/mach-common/Makefile
 @@ -0,0 +1,41 @@
 +#
 +# arch/ubicom32/mach-common/Makefile
@@ -29535,9 +29330,8 @@ diff -ruN linux-2.6.30.10/arch/ubicom32/mach-common/Makefile linux-2.6.30.10-ubi
 +obj-$(CONFIG_SND_UBI32) += audio.o
 +obj-$(CONFIG_UBICOM32_PLIO) += plio.o
 +
 +obj-$(CONFIG_SND_UBI32) += audio.o
 +obj-$(CONFIG_UBICOM32_PLIO) += plio.o
 +
-diff -ruN linux-2.6.30.10/arch/ubicom32/mach-common/pci.c linux-2.6.30.10-ubi/arch/ubicom32/mach-common/pci.c
---- linux-2.6.30.10/arch/ubicom32/mach-common/pci.c    1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.30.10-ubi/arch/ubicom32/mach-common/pci.c        2009-12-11 11:45:11.000000000 +0200
+--- /dev/null
++++ b/arch/ubicom32/mach-common/pci.c
 @@ -0,0 +1,1157 @@
 +/*
 + * arch/ubicom32/mach-common/pci.c
 @@ -0,0 +1,1157 @@
 +/*
 + * arch/ubicom32/mach-common/pci.c
@@ -30696,9 +30490,8 @@ diff -ruN linux-2.6.30.10/arch/ubicom32/mach-common/pci.c linux-2.6.30.10-ubi/ar
 +      }
 +}
 +EXPORT_SYMBOL(ubi32_pci_int_wr);
 +      }
 +}
 +EXPORT_SYMBOL(ubi32_pci_int_wr);
-diff -ruN linux-2.6.30.10/arch/ubicom32/mach-common/plio.c linux-2.6.30.10-ubi/arch/ubicom32/mach-common/plio.c
---- linux-2.6.30.10/arch/ubicom32/mach-common/plio.c   1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.30.10-ubi/arch/ubicom32/mach-common/plio.c       2009-12-11 11:45:11.000000000 +0200
+--- /dev/null
++++ b/arch/ubicom32/mach-common/plio.c
 @@ -0,0 +1,92 @@
 +/*
 + * plio.c
 @@ -0,0 +1,92 @@
 +/*
 + * plio.c
@@ -30792,9 +30585,8 @@ diff -ruN linux-2.6.30.10/arch/ubicom32/mach-common/plio.c linux-2.6.30.10-ubi/a
 +       */
 +      memcpy(&PLIO_BR->config, plio_config, sizeof(plio_config_t));
 +}
 +       */
 +      memcpy(&PLIO_BR->config, plio_config, sizeof(plio_config_t));
 +}
-diff -ruN linux-2.6.30.10/arch/ubicom32/mach-common/profile.c linux-2.6.30.10-ubi/arch/ubicom32/mach-common/profile.c
---- linux-2.6.30.10/arch/ubicom32/mach-common/profile.c        1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.30.10-ubi/arch/ubicom32/mach-common/profile.c    2009-12-11 11:45:11.000000000 +0200
+--- /dev/null
++++ b/arch/ubicom32/mach-common/profile.c
 @@ -0,0 +1,549 @@
 +/*
 + * arch/ubicom32/mach-common/profile.c
 @@ -0,0 +1,549 @@
 +/*
 + * arch/ubicom32/mach-common/profile.c
@@ -31345,9 +31137,8 @@ diff -ruN linux-2.6.30.10/arch/ubicom32/mach-common/profile.c linux-2.6.30.10-ub
 +
 +MODULE_AUTHOR("David Fotland");
 +MODULE_LICENSE("GPL");
 +
 +MODULE_AUTHOR("David Fotland");
 +MODULE_LICENSE("GPL");
-diff -ruN linux-2.6.30.10/arch/ubicom32/mach-common/profile.h linux-2.6.30.10-ubi/arch/ubicom32/mach-common/profile.h
---- linux-2.6.30.10/arch/ubicom32/mach-common/profile.h        1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.30.10-ubi/arch/ubicom32/mach-common/profile.h    2009-12-11 11:45:11.000000000 +0200
+--- /dev/null
++++ b/arch/ubicom32/mach-common/profile.h
 @@ -0,0 +1,82 @@
 +/*
 + * arch/ubicom32/mach-common/profile.h
 @@ -0,0 +1,82 @@
 +/*
 + * arch/ubicom32/mach-common/profile.h
@@ -31431,9 +31222,8 @@ diff -ruN linux-2.6.30.10/arch/ubicom32/mach-common/profile.h linux-2.6.30.10-ub
 +};
 +
 +#endif
 +};
 +
 +#endif
-diff -ruN linux-2.6.30.10/arch/ubicom32/mach-common/profpkt.h linux-2.6.30.10-ubi/arch/ubicom32/mach-common/profpkt.h
---- linux-2.6.30.10/arch/ubicom32/mach-common/profpkt.h        1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.30.10-ubi/arch/ubicom32/mach-common/profpkt.h    2009-12-11 11:45:11.000000000 +0200
+--- /dev/null
++++ b/arch/ubicom32/mach-common/profpkt.h
 @@ -0,0 +1,158 @@
 +
 +/*
 @@ -0,0 +1,158 @@
 +
 +/*
@@ -31593,9 +31383,8 @@ diff -ruN linux-2.6.30.10/arch/ubicom32/mach-common/profpkt.h linux-2.6.30.10-ub
 +};
 +
 +#define PROFILE_MAX_MAPS (PROFILE_MAX_PACKET_SIZE - sizeof(struct profile_header_maps)) / sizeof(struct profile_map)
 +};
 +
 +#define PROFILE_MAX_MAPS (PROFILE_MAX_PACKET_SIZE - sizeof(struct profile_header_maps)) / sizeof(struct profile_map)
-diff -ruN linux-2.6.30.10/arch/ubicom32/mach-common/ring_tio.c linux-2.6.30.10-ubi/arch/ubicom32/mach-common/ring_tio.c
---- linux-2.6.30.10/arch/ubicom32/mach-common/ring_tio.c       1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.30.10-ubi/arch/ubicom32/mach-common/ring_tio.c   2009-12-11 11:45:11.000000000 +0200
+--- /dev/null
++++ b/arch/ubicom32/mach-common/ring_tio.c
 @@ -0,0 +1,123 @@
 +/*
 + * arch/ubicom32/mach-common/ring_tio.c
 @@ -0,0 +1,123 @@
 +/*
 + * arch/ubicom32/mach-common/ring_tio.c
@@ -31720,9 +31509,8 @@ diff -ruN linux-2.6.30.10/arch/ubicom32/mach-common/ring_tio.c linux-2.6.30.10-u
 +              kfree(res);
 +      }
 +}
 +              kfree(res);
 +      }
 +}
-diff -ruN linux-2.6.30.10/arch/ubicom32/mach-common/switch-bcm539x.c linux-2.6.30.10-ubi/arch/ubicom32/mach-common/switch-bcm539x.c
---- linux-2.6.30.10/arch/ubicom32/mach-common/switch-bcm539x.c 1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.30.10-ubi/arch/ubicom32/mach-common/switch-bcm539x.c     2009-12-11 11:45:11.000000000 +0200
+--- /dev/null
++++ b/arch/ubicom32/mach-common/switch-bcm539x.c
 @@ -0,0 +1,1195 @@
 +/*
 + * arch/ubicom32/mach-common/switch-bcm539x.c
 @@ -0,0 +1,1195 @@
 +/*
 + * arch/ubicom32/mach-common/switch-bcm539x.c
@@ -32919,9 +32707,8 @@ diff -ruN linux-2.6.30.10/arch/ubicom32/mach-common/switch-bcm539x.c linux-2.6.3
 +MODULE_AUTHOR("Pat Tjin");
 +MODULE_LICENSE("GPL v2");
 +MODULE_DESCRIPTION("bcm539x SPI switch chip driver");
 +MODULE_AUTHOR("Pat Tjin");
 +MODULE_LICENSE("GPL v2");
 +MODULE_DESCRIPTION("bcm539x SPI switch chip driver");
-diff -ruN linux-2.6.30.10/arch/ubicom32/mach-common/switch-bcm539x-reg.h linux-2.6.30.10-ubi/arch/ubicom32/mach-common/switch-bcm539x-reg.h
---- linux-2.6.30.10/arch/ubicom32/mach-common/switch-bcm539x-reg.h     1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.30.10-ubi/arch/ubicom32/mach-common/switch-bcm539x-reg.h 2009-12-11 11:45:11.000000000 +0200
+--- /dev/null
++++ b/arch/ubicom32/mach-common/switch-bcm539x-reg.h
 @@ -0,0 +1,221 @@
 +/*
 + * arch/ubicom32/mach-common/switch-bcm539x-reg.h
 @@ -0,0 +1,221 @@
 +/*
 + * arch/ubicom32/mach-common/switch-bcm539x-reg.h
@@ -33144,9 +32931,8 @@ diff -ruN linux-2.6.30.10/arch/ubicom32/mach-common/switch-bcm539x-reg.h linux-2
 +#define REG_SPI_PAGE                  0xff    /* SPI Page register */
 +
 +#endif
 +#define REG_SPI_PAGE                  0xff    /* SPI Page register */
 +
 +#endif
-diff -ruN linux-2.6.30.10/arch/ubicom32/mach-common/switch-core.c linux-2.6.30.10-ubi/arch/ubicom32/mach-common/switch-core.c
---- linux-2.6.30.10/arch/ubicom32/mach-common/switch-core.c    1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.30.10-ubi/arch/ubicom32/mach-common/switch-core.c        2009-12-11 11:45:11.000000000 +0200
+--- /dev/null
++++ b/arch/ubicom32/mach-common/switch-core.c
 @@ -0,0 +1,737 @@
 +/*
 + * arch/ubicom32/mach-common/switch-core.c
 @@ -0,0 +1,737 @@
 +/*
 + * arch/ubicom32/mach-common/switch-core.c
@@ -33885,9 +33671,8 @@ diff -ruN linux-2.6.30.10/arch/ubicom32/mach-common/switch-core.c linux-2.6.30.1
 +MODULE_AUTHOR("Patrick Tjin");
 +MODULE_LICENSE("GPL");
 +MODULE_DESCRIPTION("Ethernet Switch Class Interface");
 +MODULE_AUTHOR("Patrick Tjin");
 +MODULE_LICENSE("GPL");
 +MODULE_DESCRIPTION("Ethernet Switch Class Interface");
-diff -ruN linux-2.6.30.10/arch/ubicom32/mach-common/switch-core.h linux-2.6.30.10-ubi/arch/ubicom32/mach-common/switch-core.h
---- linux-2.6.30.10/arch/ubicom32/mach-common/switch-core.h    1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.30.10-ubi/arch/ubicom32/mach-common/switch-core.h        2009-12-11 11:45:11.000000000 +0200
+--- /dev/null
++++ b/arch/ubicom32/mach-common/switch-core.h
 @@ -0,0 +1,92 @@
 +/*
 + * arch/ubicom32/mach-common/switch-core.h
 @@ -0,0 +1,92 @@
 +/*
 + * arch/ubicom32/mach-common/switch-core.h
@@ -33981,9 +33766,8 @@ diff -ruN linux-2.6.30.10/arch/ubicom32/mach-common/switch-core.h linux-2.6.30.1
 +extern void switch_unregister(struct switch_device *switch_dev);
 +
 +#endif
 +extern void switch_unregister(struct switch_device *switch_dev);
 +
 +#endif
-diff -ruN linux-2.6.30.10/arch/ubicom32/mach-common/ubi32-gpio.c linux-2.6.30.10-ubi/arch/ubicom32/mach-common/ubi32-gpio.c
---- linux-2.6.30.10/arch/ubicom32/mach-common/ubi32-gpio.c     1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.30.10-ubi/arch/ubicom32/mach-common/ubi32-gpio.c 2009-12-11 11:45:11.000000000 +0200
+--- /dev/null
++++ b/arch/ubicom32/mach-common/ubi32-gpio.c
 @@ -0,0 +1,411 @@
 +/*
 + * arch/ubicom32/mach-common/ubi32-gpio.c
 @@ -0,0 +1,411 @@
 +/*
 + * arch/ubicom32/mach-common/ubi32-gpio.c
@@ -34396,9 +34180,8 @@ diff -ruN linux-2.6.30.10/arch/ubicom32/mach-common/ubi32-gpio.c linux-2.6.30.10
 +}
 +device_initcall(ubi_gpio_register_proc);
 +#endif
 +}
 +device_initcall(ubi_gpio_register_proc);
 +#endif
-diff -ruN linux-2.6.30.10/arch/ubicom32/mach-common/ubicom32hid.c linux-2.6.30.10-ubi/arch/ubicom32/mach-common/ubicom32hid.c
---- linux-2.6.30.10/arch/ubicom32/mach-common/ubicom32hid.c    1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.30.10-ubi/arch/ubicom32/mach-common/ubicom32hid.c        2009-12-11 11:45:11.000000000 +0200
+--- /dev/null
++++ b/arch/ubicom32/mach-common/ubicom32hid.c
 @@ -0,0 +1,557 @@
 +/*
 + * arch/ubicom32/mach-common/ubicom32hid.c
 @@ -0,0 +1,557 @@
 +/*
 + * arch/ubicom32/mach-common/ubicom32hid.c
@@ -34957,9 +34740,8 @@ diff -ruN linux-2.6.30.10/arch/ubicom32/mach-common/ubicom32hid.c linux-2.6.30.1
 +MODULE_AUTHOR("Pat Tjin <@ubicom.com>")
 +MODULE_DESCRIPTION("Ubicom HID driver");
 +MODULE_LICENSE("GPL");
 +MODULE_AUTHOR("Pat Tjin <@ubicom.com>")
 +MODULE_DESCRIPTION("Ubicom HID driver");
 +MODULE_LICENSE("GPL");
-diff -ruN linux-2.6.30.10/arch/ubicom32/mach-common/ubicom32input.c linux-2.6.30.10-ubi/arch/ubicom32/mach-common/ubicom32input.c
---- linux-2.6.30.10/arch/ubicom32/mach-common/ubicom32input.c  1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.30.10-ubi/arch/ubicom32/mach-common/ubicom32input.c      2009-12-11 11:45:11.000000000 +0200
+--- /dev/null
++++ b/arch/ubicom32/mach-common/ubicom32input.c
 @@ -0,0 +1,265 @@
 +/*
 + * arch/ubicom32/mach-common/ubicom32input.c
 @@ -0,0 +1,265 @@
 +/*
 + * arch/ubicom32/mach-common/ubicom32input.c
@@ -35226,9 +35008,8 @@ diff -ruN linux-2.6.30.10/arch/ubicom32/mach-common/ubicom32input.c linux-2.6.30
 +MODULE_DESCRIPTION("Ubicom32 Input Driver");
 +MODULE_LICENSE("GPL");
 +MODULE_ALIAS("platform:ubicom32-input");
 +MODULE_DESCRIPTION("Ubicom32 Input Driver");
 +MODULE_LICENSE("GPL");
 +MODULE_ALIAS("platform:ubicom32-input");
-diff -ruN linux-2.6.30.10/arch/ubicom32/mach-common/ubicom32input_i2c.c linux-2.6.30.10-ubi/arch/ubicom32/mach-common/ubicom32input_i2c.c
---- linux-2.6.30.10/arch/ubicom32/mach-common/ubicom32input_i2c.c      1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.30.10-ubi/arch/ubicom32/mach-common/ubicom32input_i2c.c  2009-12-11 11:45:11.000000000 +0200
+--- /dev/null
++++ b/arch/ubicom32/mach-common/ubicom32input_i2c.c
 @@ -0,0 +1,325 @@
 +/*
 + * arch/ubicom32/mach-common/ubicom32input_i2c.c
 @@ -0,0 +1,325 @@
 +/*
 + * arch/ubicom32/mach-common/ubicom32input_i2c.c
@@ -35555,9 +35336,8 @@ diff -ruN linux-2.6.30.10/arch/ubicom32/mach-common/ubicom32input_i2c.c linux-2.
 +MODULE_DESCRIPTION("Ubicom32 Input Driver I2C");
 +MODULE_LICENSE("GPL");
 +MODULE_ALIAS("platform:ubicom32-input");
 +MODULE_DESCRIPTION("Ubicom32 Input Driver I2C");
 +MODULE_LICENSE("GPL");
 +MODULE_ALIAS("platform:ubicom32-input");
-diff -ruN linux-2.6.30.10/arch/ubicom32/mach-common/usb.c linux-2.6.30.10-ubi/arch/ubicom32/mach-common/usb.c
---- linux-2.6.30.10/arch/ubicom32/mach-common/usb.c    1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.30.10-ubi/arch/ubicom32/mach-common/usb.c        2009-12-11 11:45:11.000000000 +0200
+--- /dev/null
++++ b/arch/ubicom32/mach-common/usb.c
 @@ -0,0 +1,132 @@
 +/*
 + * arch/ubicom32/mach-common/ip5k_usb.c
 @@ -0,0 +1,132 @@
 +/*
 + * arch/ubicom32/mach-common/ip5k_usb.c
@@ -35691,9 +35471,8 @@ diff -ruN linux-2.6.30.10/arch/ubicom32/mach-common/usb.c linux-2.6.30.10-ubi/ar
 +{
 +        UBICOM32_IO_PORT(RJ)->int_clr = (1 << 3);
 +}
 +{
 +        UBICOM32_IO_PORT(RJ)->int_clr = (1 << 3);
 +}
-diff -ruN linux-2.6.30.10/arch/ubicom32/mach-common/usb_tio.c linux-2.6.30.10-ubi/arch/ubicom32/mach-common/usb_tio.c
---- linux-2.6.30.10/arch/ubicom32/mach-common/usb_tio.c        1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.30.10-ubi/arch/ubicom32/mach-common/usb_tio.c    2009-12-11 11:45:11.000000000 +0200
+--- /dev/null
++++ b/arch/ubicom32/mach-common/usb_tio.c
 @@ -0,0 +1,356 @@
 +/*
 + * arch/ubicom32/mach-common/usb_tio.c
 @@ -0,0 +1,356 @@
 +/*
 + * arch/ubicom32/mach-common/usb_tio.c
@@ -36051,9 +35830,8 @@ diff -ruN linux-2.6.30.10/arch/ubicom32/mach-common/usb_tio.c linux-2.6.30.10-ub
 +       */
 +      usb_node->usb_vp_control &= 0xfffe;
 +}
 +       */
 +      usb_node->usb_vp_control &= 0xfffe;
 +}
-diff -ruN linux-2.6.30.10/arch/ubicom32/mach-common/usb_tio.h linux-2.6.30.10-ubi/arch/ubicom32/mach-common/usb_tio.h
---- linux-2.6.30.10/arch/ubicom32/mach-common/usb_tio.h        1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.30.10-ubi/arch/ubicom32/mach-common/usb_tio.h    2009-12-11 11:45:11.000000000 +0200
+--- /dev/null
++++ b/arch/ubicom32/mach-common/usb_tio.h
 @@ -0,0 +1,111 @@
 +/*
 + * arch/ubicom32/mach-common/usb_tio.h
 @@ -0,0 +1,111 @@
 +/*
 + * arch/ubicom32/mach-common/usb_tio.h
@@ -36166,9 +35944,8 @@ diff -ruN linux-2.6.30.10/arch/ubicom32/mach-common/usb_tio.h linux-2.6.30.10-ub
 +extern struct usbtio_node *usb_node;
 +extern void ubi32_usb_init(void);
 +#endif
 +extern struct usbtio_node *usb_node;
 +extern void ubi32_usb_init(void);
 +#endif
-diff -ruN linux-2.6.30.10/arch/ubicom32/mach-common/vdc_tio.c linux-2.6.30.10-ubi/arch/ubicom32/mach-common/vdc_tio.c
---- linux-2.6.30.10/arch/ubicom32/mach-common/vdc_tio.c        1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.30.10-ubi/arch/ubicom32/mach-common/vdc_tio.c    2009-12-11 11:45:11.000000000 +0200
+--- /dev/null
++++ b/arch/ubicom32/mach-common/vdc_tio.c
 @@ -0,0 +1,111 @@
 +/*
 + * arch/ubicom32/mach-common/vdc_tio.c
 @@ -0,0 +1,111 @@
 +/*
 + * arch/ubicom32/mach-common/vdc_tio.c
@@ -36281,9 +36058,8 @@ diff -ruN linux-2.6.30.10/arch/ubicom32/mach-common/vdc_tio.c linux-2.6.30.10-ub
 +              printk(KERN_WARNING "VDC failed to register\n");
 +      }
 +}
 +              printk(KERN_WARNING "VDC failed to register\n");
 +      }
 +}
-diff -ruN linux-2.6.30.10/arch/ubicom32/mach-ip5k/board-ip5160dev.c linux-2.6.30.10-ubi/arch/ubicom32/mach-ip5k/board-ip5160dev.c
---- linux-2.6.30.10/arch/ubicom32/mach-ip5k/board-ip5160dev.c  1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.30.10-ubi/arch/ubicom32/mach-ip5k/board-ip5160dev.c      2009-12-11 11:45:11.000000000 +0200
+--- /dev/null
++++ b/arch/ubicom32/mach-ip5k/board-ip5160dev.c
 @@ -0,0 +1,109 @@
 +/*
 + * arch/ubicom32/mach-ip5k/board-ip5160dev.c
 @@ -0,0 +1,109 @@
 +/*
 + * arch/ubicom32/mach-ip5k/board-ip5160dev.c
@@ -36394,9 +36170,8 @@ diff -ruN linux-2.6.30.10/arch/ubicom32/mach-ip5k/board-ip5160dev.c linux-2.6.30
 +}
 +
 +arch_initcall(ip5160dev_init);
 +}
 +
 +arch_initcall(ip5160dev_init);
-diff -ruN linux-2.6.30.10/arch/ubicom32/mach-ip5k/board-ip5160rgw.c linux-2.6.30.10-ubi/arch/ubicom32/mach-ip5k/board-ip5160rgw.c
---- linux-2.6.30.10/arch/ubicom32/mach-ip5k/board-ip5160rgw.c  1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.30.10-ubi/arch/ubicom32/mach-ip5k/board-ip5160rgw.c      2009-12-11 11:45:11.000000000 +0200
+--- /dev/null
++++ b/arch/ubicom32/mach-ip5k/board-ip5160rgw.c
 @@ -0,0 +1,75 @@
 +/*
 + * arch/ubicom32/mach-ip5k/board-ip5160rgw.c
 @@ -0,0 +1,75 @@
 +/*
 + * arch/ubicom32/mach-ip5k/board-ip5160rgw.c
@@ -36473,9 +36248,8 @@ diff -ruN linux-2.6.30.10/arch/ubicom32/mach-ip5k/board-ip5160rgw.c linux-2.6.30
 +}
 +
 +arch_initcall(ip5160rgw_init);
 +}
 +
 +arch_initcall(ip5160rgw_init);
-diff -ruN linux-2.6.30.10/arch/ubicom32/mach-ip5k/board-ip5170dpf.c linux-2.6.30.10-ubi/arch/ubicom32/mach-ip5k/board-ip5170dpf.c
---- linux-2.6.30.10/arch/ubicom32/mach-ip5k/board-ip5170dpf.c  1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.30.10-ubi/arch/ubicom32/mach-ip5k/board-ip5170dpf.c      2009-12-11 11:45:11.000000000 +0200
+--- /dev/null
++++ b/arch/ubicom32/mach-ip5k/board-ip5170dpf.c
 @@ -0,0 +1,279 @@
 +/*
 + * arch/ubicom32/mach-ip5k/board-ip5170dpf.c
 @@ -0,0 +1,279 @@
 +/*
 + * arch/ubicom32/mach-ip5k/board-ip5170dpf.c
@@ -36756,9 +36530,8 @@ diff -ruN linux-2.6.30.10/arch/ubicom32/mach-ip5k/board-ip5170dpf.c linux-2.6.30
 +}
 +
 +arch_initcall(ip5170dpf_init);
 +}
 +
 +arch_initcall(ip5170dpf_init);
-diff -ruN linux-2.6.30.10/arch/ubicom32/mach-ip5k/Kconfig linux-2.6.30.10-ubi/arch/ubicom32/mach-ip5k/Kconfig
---- linux-2.6.30.10/arch/ubicom32/mach-ip5k/Kconfig    1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.30.10-ubi/arch/ubicom32/mach-ip5k/Kconfig        2009-12-11 11:45:11.000000000 +0200
+--- /dev/null
++++ b/arch/ubicom32/mach-ip5k/Kconfig
 @@ -0,0 +1,28 @@
 +
 +config IP5170DPF
 @@ -0,0 +1,28 @@
 +
 +config IP5170DPF
@@ -36788,9 +36561,8 @@ diff -ruN linux-2.6.30.10/arch/ubicom32/mach-ip5k/Kconfig linux-2.6.30.10-ubi/ar
 +      select UBICOM32_V3
 +      help
 +              Ubicom StreamEngine 5000 RGW Evaluation Board, IP5K-RGW-0004-11 v2.2
 +      select UBICOM32_V3
 +      help
 +              Ubicom StreamEngine 5000 RGW Evaluation Board, IP5K-RGW-0004-11 v2.2
-diff -ruN linux-2.6.30.10/arch/ubicom32/mach-ip5k/Makefile linux-2.6.30.10-ubi/arch/ubicom32/mach-ip5k/Makefile
---- linux-2.6.30.10/arch/ubicom32/mach-ip5k/Makefile   1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.30.10-ubi/arch/ubicom32/mach-ip5k/Makefile       2009-12-11 11:45:11.000000000 +0200
+--- /dev/null
++++ b/arch/ubicom32/mach-ip5k/Makefile
 @@ -0,0 +1,31 @@
 +#
 +# arch/ubicom32/mach-ip5k/Makefile
 @@ -0,0 +1,31 @@
 +#
 +# arch/ubicom32/mach-ip5k/Makefile
@@ -36823,9 +36595,8 @@ diff -ruN linux-2.6.30.10/arch/ubicom32/mach-ip5k/Makefile linux-2.6.30.10-ubi/a
 +obj-$(CONFIG_IP5170DPF)               += board-ip5170dpf.o
 +obj-$(CONFIG_IP5160DEV)               += board-ip5160dev.o
 +obj-$(CONFIG_IP5160EVAL)      += board-ip5160rgw.o
 +obj-$(CONFIG_IP5170DPF)               += board-ip5170dpf.o
 +obj-$(CONFIG_IP5160DEV)               += board-ip5160dev.o
 +obj-$(CONFIG_IP5160EVAL)      += board-ip5160rgw.o
-diff -ruN linux-2.6.30.10/arch/ubicom32/mach-ip7k/board-ip7145dpf.c linux-2.6.30.10-ubi/arch/ubicom32/mach-ip7k/board-ip7145dpf.c
---- linux-2.6.30.10/arch/ubicom32/mach-ip7k/board-ip7145dpf.c  1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.30.10-ubi/arch/ubicom32/mach-ip7k/board-ip7145dpf.c      2009-12-11 11:45:11.000000000 +0200
+--- /dev/null
++++ b/arch/ubicom32/mach-ip7k/board-ip7145dpf.c
 @@ -0,0 +1,715 @@
 +/*
 + * arch/ubicom32/mach-ip7k/board-ip7145dpf.c
 @@ -0,0 +1,715 @@
 +/*
 + * arch/ubicom32/mach-ip7k/board-ip7145dpf.c
@@ -37542,9 +37313,8 @@ diff -ruN linux-2.6.30.10/arch/ubicom32/mach-ip7k/board-ip7145dpf.c linux-2.6.30
 +}
 +
 +arch_initcall(ip7145dpf_init);
 +}
 +
 +arch_initcall(ip7145dpf_init);
-diff -ruN linux-2.6.30.10/arch/ubicom32/mach-ip7k/board-ip7160bringup.c linux-2.6.30.10-ubi/arch/ubicom32/mach-ip7k/board-ip7160bringup.c
---- linux-2.6.30.10/arch/ubicom32/mach-ip7k/board-ip7160bringup.c      1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.30.10-ubi/arch/ubicom32/mach-ip7k/board-ip7160bringup.c  2009-12-11 11:45:11.000000000 +0200
+--- /dev/null
++++ b/arch/ubicom32/mach-ip7k/board-ip7160bringup.c
 @@ -0,0 +1,134 @@
 +/*
 + * arch/ubicom32/mach-ip7k/board-ip7160bringup.c
 @@ -0,0 +1,134 @@
 +/*
 + * arch/ubicom32/mach-ip7k/board-ip7160bringup.c
@@ -37680,9 +37450,8 @@ diff -ruN linux-2.6.30.10/arch/ubicom32/mach-ip7k/board-ip7160bringup.c linux-2.
 +}
 +
 +arch_initcall(ip7160bringup_init);
 +}
 +
 +arch_initcall(ip7160bringup_init);
-diff -ruN linux-2.6.30.10/arch/ubicom32/mach-ip7k/board-ip7160dpf.c linux-2.6.30.10-ubi/arch/ubicom32/mach-ip7k/board-ip7160dpf.c
---- linux-2.6.30.10/arch/ubicom32/mach-ip7k/board-ip7160dpf.c  1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.30.10-ubi/arch/ubicom32/mach-ip7k/board-ip7160dpf.c      2009-12-11 11:45:11.000000000 +0200
+--- /dev/null
++++ b/arch/ubicom32/mach-ip7k/board-ip7160dpf.c
 @@ -0,0 +1,326 @@
 +/*
 + * arch/ubicom32/mach-ip7k/board-ip7160dpf.c
 @@ -0,0 +1,326 @@
 +/*
 + * arch/ubicom32/mach-ip7k/board-ip7160dpf.c
@@ -38010,9 +37779,8 @@ diff -ruN linux-2.6.30.10/arch/ubicom32/mach-ip7k/board-ip7160dpf.c linux-2.6.30
 +}
 +
 +arch_initcall(ip7160dpf_init);
 +}
 +
 +arch_initcall(ip7160dpf_init);
-diff -ruN linux-2.6.30.10/arch/ubicom32/mach-ip7k/board-ip7160rgw.c linux-2.6.30.10-ubi/arch/ubicom32/mach-ip7k/board-ip7160rgw.c
---- linux-2.6.30.10/arch/ubicom32/mach-ip7k/board-ip7160rgw.c  1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.30.10-ubi/arch/ubicom32/mach-ip7k/board-ip7160rgw.c      2009-12-11 11:45:11.000000000 +0200
+--- /dev/null
++++ b/arch/ubicom32/mach-ip7k/board-ip7160rgw.c
 @@ -0,0 +1,355 @@
 +/*
 + * arch/ubicom32/mach-ip7k/board-ip7160rgw.c
 @@ -0,0 +1,355 @@
 +/*
 + * arch/ubicom32/mach-ip7k/board-ip7160rgw.c
@@ -38369,9 +38137,8 @@ diff -ruN linux-2.6.30.10/arch/ubicom32/mach-ip7k/board-ip7160rgw.c linux-2.6.30
 +}
 +
 +arch_initcall(ip7160rgw_init);
 +}
 +
 +arch_initcall(ip7160rgw_init);
-diff -ruN linux-2.6.30.10/arch/ubicom32/mach-ip7k/board-ip7500av.c linux-2.6.30.10-ubi/arch/ubicom32/mach-ip7k/board-ip7500av.c
---- linux-2.6.30.10/arch/ubicom32/mach-ip7k/board-ip7500av.c   1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.30.10-ubi/arch/ubicom32/mach-ip7k/board-ip7500av.c       2009-12-11 11:45:11.000000000 +0200
+--- /dev/null
++++ b/arch/ubicom32/mach-ip7k/board-ip7500av.c
 @@ -0,0 +1,273 @@
 +/*
 + * arch/ubicom32/mach-ip7k/board-ip7500av.c
 @@ -0,0 +1,273 @@
 +/*
 + * arch/ubicom32/mach-ip7k/board-ip7500av.c
@@ -38646,9 +38413,8 @@ diff -ruN linux-2.6.30.10/arch/ubicom32/mach-ip7k/board-ip7500av.c linux-2.6.30.
 +      return 0;
 +}
 +arch_initcall(ip7500av_init);
 +      return 0;
 +}
 +arch_initcall(ip7500av_init);
-diff -ruN linux-2.6.30.10/arch/ubicom32/mach-ip7k/board-ip7500iap.c linux-2.6.30.10-ubi/arch/ubicom32/mach-ip7k/board-ip7500iap.c
---- linux-2.6.30.10/arch/ubicom32/mach-ip7k/board-ip7500iap.c  1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.30.10-ubi/arch/ubicom32/mach-ip7k/board-ip7500iap.c      2009-12-11 11:45:11.000000000 +0200
+--- /dev/null
++++ b/arch/ubicom32/mach-ip7k/board-ip7500iap.c
 @@ -0,0 +1,414 @@
 +/*
 + * arch/ubicom32/mach-ip7k/board-ip7500iap.c
 @@ -0,0 +1,414 @@
 +/*
 + * arch/ubicom32/mach-ip7k/board-ip7500iap.c
@@ -39064,9 +38830,8 @@ diff -ruN linux-2.6.30.10/arch/ubicom32/mach-ip7k/board-ip7500iap.c linux-2.6.30
 +}
 +
 +arch_initcall(ip7500iap_init);
 +}
 +
 +arch_initcall(ip7500iap_init);
-diff -ruN linux-2.6.30.10/arch/ubicom32/mach-ip7k/board-ip7500media.c linux-2.6.30.10-ubi/arch/ubicom32/mach-ip7k/board-ip7500media.c
---- linux-2.6.30.10/arch/ubicom32/mach-ip7k/board-ip7500media.c        1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.30.10-ubi/arch/ubicom32/mach-ip7k/board-ip7500media.c    2009-12-11 11:45:11.000000000 +0200
+--- /dev/null
++++ b/arch/ubicom32/mach-ip7k/board-ip7500media.c
 @@ -0,0 +1,732 @@
 +/*
 + * arch/ubicom32/mach-ip7k/board-ip7500media.c
 @@ -0,0 +1,732 @@
 +/*
 + * arch/ubicom32/mach-ip7k/board-ip7500media.c
@@ -39800,9 +39565,8 @@ diff -ruN linux-2.6.30.10/arch/ubicom32/mach-ip7k/board-ip7500media.c linux-2.6.
 +}
 +
 +arch_initcall(ip7500media_init);
 +}
 +
 +arch_initcall(ip7500media_init);
-diff -ruN linux-2.6.30.10/arch/ubicom32/mach-ip7k/board-ip7500module.c linux-2.6.30.10-ubi/arch/ubicom32/mach-ip7k/board-ip7500module.c
---- linux-2.6.30.10/arch/ubicom32/mach-ip7k/board-ip7500module.c       1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.30.10-ubi/arch/ubicom32/mach-ip7k/board-ip7500module.c   2009-12-11 11:45:11.000000000 +0200
+--- /dev/null
++++ b/arch/ubicom32/mach-ip7k/board-ip7500module.c
 @@ -0,0 +1,55 @@
 +/*
 + * arch/ubicom32/mach-ip7k/board-ip7500module.c
 @@ -0,0 +1,55 @@
 +/*
 + * arch/ubicom32/mach-ip7k/board-ip7500module.c
@@ -39859,9 +39623,8 @@ diff -ruN linux-2.6.30.10/arch/ubicom32/mach-ip7k/board-ip7500module.c linux-2.6
 +}
 +
 +arch_initcall(ip7500module_init);
 +}
 +
 +arch_initcall(ip7500module_init);
-diff -ruN linux-2.6.30.10/arch/ubicom32/mach-ip7k/board-ip7500wspkr.c linux-2.6.30.10-ubi/arch/ubicom32/mach-ip7k/board-ip7500wspkr.c
---- linux-2.6.30.10/arch/ubicom32/mach-ip7k/board-ip7500wspkr.c        1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.30.10-ubi/arch/ubicom32/mach-ip7k/board-ip7500wspkr.c    2009-12-11 11:45:11.000000000 +0200
+--- /dev/null
++++ b/arch/ubicom32/mach-ip7k/board-ip7500wspkr.c
 @@ -0,0 +1,101 @@
 +/*
 + * arch/ubicom32/mach-ip7k/board-ip7500wspkr.c
 @@ -0,0 +1,101 @@
 +/*
 + * arch/ubicom32/mach-ip7k/board-ip7500wspkr.c
@@ -39964,9 +39727,8 @@ diff -ruN linux-2.6.30.10/arch/ubicom32/mach-ip7k/board-ip7500wspkr.c linux-2.6.
 +}
 +
 +arch_initcall(ip7500wspkr_init);
 +}
 +
 +arch_initcall(ip7500wspkr_init);
-diff -ruN linux-2.6.30.10/arch/ubicom32/mach-ip7k/Kconfig linux-2.6.30.10-ubi/arch/ubicom32/mach-ip7k/Kconfig
---- linux-2.6.30.10/arch/ubicom32/mach-ip7k/Kconfig    1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.30.10-ubi/arch/ubicom32/mach-ip7k/Kconfig        2009-12-11 11:45:11.000000000 +0200
+--- /dev/null
++++ b/arch/ubicom32/mach-ip7k/Kconfig
 @@ -0,0 +1,205 @@
 +config IP7145DPF
 +      bool "IP7145DPF"
 @@ -0,0 +1,205 @@
 +config IP7145DPF
 +      bool "IP7145DPF"
@@ -40173,9 +39935,8 @@ diff -ruN linux-2.6.30.10/arch/ubicom32/mach-ip7k/Kconfig linux-2.6.30.10-ubi/ar
 +
 +
 +              Please see ip7500media.c for more details.
 +
 +
 +              Please see ip7500media.c for more details.
-diff -ruN linux-2.6.30.10/arch/ubicom32/mach-ip7k/Makefile linux-2.6.30.10-ubi/arch/ubicom32/mach-ip7k/Makefile
---- linux-2.6.30.10/arch/ubicom32/mach-ip7k/Makefile   1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.30.10-ubi/arch/ubicom32/mach-ip7k/Makefile       2009-12-11 11:45:11.000000000 +0200
+--- /dev/null
++++ b/arch/ubicom32/mach-ip7k/Makefile
 @@ -0,0 +1,38 @@
 +#
 +# arch/ubicom32/mach-ip7k/Makefile
 @@ -0,0 +1,38 @@
 +#
 +# arch/ubicom32/mach-ip7k/Makefile
@@ -40215,9 +39976,8 @@ diff -ruN linux-2.6.30.10/arch/ubicom32/mach-ip7k/Makefile linux-2.6.30.10-ubi/a
 +obj-$(CONFIG_IP7500AV)                += board-ip7500av.o
 +obj-$(CONFIG_IP7500WSPKR)     += board-ip7500wspkr.o
 +obj-$(CONFIG_IP7500IAP)               += board-ip7500iap.o
 +obj-$(CONFIG_IP7500AV)                += board-ip7500av.o
 +obj-$(CONFIG_IP7500WSPKR)     += board-ip7500wspkr.o
 +obj-$(CONFIG_IP7500IAP)               += board-ip7500iap.o
-diff -ruN linux-2.6.30.10/arch/ubicom32/Makefile linux-2.6.30.10-ubi/arch/ubicom32/Makefile
---- linux-2.6.30.10/arch/ubicom32/Makefile     1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.30.10-ubi/arch/ubicom32/Makefile 2009-12-11 11:45:11.000000000 +0200
+--- /dev/null
++++ b/arch/ubicom32/Makefile
 @@ -0,0 +1,104 @@
 +#
 +# arch/ubicom32/Makefile
 @@ -0,0 +1,104 @@
 +#
 +# arch/ubicom32/Makefile
@@ -40323,9 +40083,8 @@ diff -ruN linux-2.6.30.10/arch/ubicom32/Makefile linux-2.6.30.10-ubi/arch/ubicom
 +      @echo "options"
 +      @echo "*************************************************"
 +      @exit 1
 +      @echo "options"
 +      @echo "*************************************************"
 +      @exit 1
-diff -ruN linux-2.6.30.10/arch/ubicom32/mm/fault.c linux-2.6.30.10-ubi/arch/ubicom32/mm/fault.c
---- linux-2.6.30.10/arch/ubicom32/mm/fault.c   1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.30.10-ubi/arch/ubicom32/mm/fault.c       2009-12-11 11:45:11.000000000 +0200
+--- /dev/null
++++ b/arch/ubicom32/mm/fault.c
 @@ -0,0 +1,80 @@
 +/*
 + * arch/ubicom32/mm/fault.c
 @@ -0,0 +1,80 @@
 +/*
 + * arch/ubicom32/mm/fault.c
@@ -40407,9 +40166,8 @@ diff -ruN linux-2.6.30.10/arch/ubicom32/mm/fault.c linux-2.6.30.10-ubi/arch/ubic
 +
 +      return 1;
 +}
 +
 +      return 1;
 +}
-diff -ruN linux-2.6.30.10/arch/ubicom32/mm/init.c linux-2.6.30.10-ubi/arch/ubicom32/mm/init.c
---- linux-2.6.30.10/arch/ubicom32/mm/init.c    1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.30.10-ubi/arch/ubicom32/mm/init.c        2009-12-11 11:45:11.000000000 +0200
+--- /dev/null
++++ b/arch/ubicom32/mm/init.c
 @@ -0,0 +1,262 @@
 +/*
 + * arch/ubicom32/mm/init.c
 @@ -0,0 +1,262 @@
 +/*
 + * arch/ubicom32/mm/init.c
@@ -40673,9 +40431,8 @@ diff -ruN linux-2.6.30.10/arch/ubicom32/mm/init.c linux-2.6.30.10-ubi/arch/ubico
 +                      (int)(addr - PAGE_SIZE));
 +#endif
 +}
 +                      (int)(addr - PAGE_SIZE));
 +#endif
 +}
-diff -ruN linux-2.6.30.10/arch/ubicom32/mm/kmap.c linux-2.6.30.10-ubi/arch/ubicom32/mm/kmap.c
---- linux-2.6.30.10/arch/ubicom32/mm/kmap.c    1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.30.10-ubi/arch/ubicom32/mm/kmap.c        2009-12-11 11:45:11.000000000 +0200
+--- /dev/null
++++ b/arch/ubicom32/mm/kmap.c
 @@ -0,0 +1,79 @@
 +/*
 + * arch/ubicom32/mm/kmap.c
 @@ -0,0 +1,79 @@
 +/*
 + * arch/ubicom32/mm/kmap.c
@@ -40756,9 +40513,8 @@ diff -ruN linux-2.6.30.10/arch/ubicom32/mm/kmap.c linux-2.6.30.10-ubi/arch/ubico
 +void kernel_set_cachemode(void *addr, unsigned long size, int cmode)
 +{
 +}
 +void kernel_set_cachemode(void *addr, unsigned long size, int cmode)
 +{
 +}
-diff -ruN linux-2.6.30.10/arch/ubicom32/mm/Makefile linux-2.6.30.10-ubi/arch/ubicom32/mm/Makefile
---- linux-2.6.30.10/arch/ubicom32/mm/Makefile  1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.30.10-ubi/arch/ubicom32/mm/Makefile      2009-12-11 11:45:11.000000000 +0200
+--- /dev/null
++++ b/arch/ubicom32/mm/Makefile
 @@ -0,0 +1,32 @@
 +#
 +# arch/ubicom32/mm/Makefile
 @@ -0,0 +1,32 @@
 +#
 +# arch/ubicom32/mm/Makefile
@@ -40792,9 +40548,8 @@ diff -ruN linux-2.6.30.10/arch/ubicom32/mm/Makefile linux-2.6.30.10-ubi/arch/ubi
 +#
 +
 +obj-y += init.o fault.o memory.o kmap.o ocm-alloc.o
 +#
 +
 +obj-y += init.o fault.o memory.o kmap.o ocm-alloc.o
-diff -ruN linux-2.6.30.10/arch/ubicom32/mm/memory.c linux-2.6.30.10-ubi/arch/ubicom32/mm/memory.c
---- linux-2.6.30.10/arch/ubicom32/mm/memory.c  1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.30.10-ubi/arch/ubicom32/mm/memory.c      2009-12-11 11:45:11.000000000 +0200
+--- /dev/null
++++ b/arch/ubicom32/mm/memory.c
 @@ -0,0 +1,58 @@
 +/*
 + * arch/ubicom32/mm/memory.c
 @@ -0,0 +1,58 @@
 +/*
 + * arch/ubicom32/mm/memory.c
@@ -40854,9 +40609,8 @@ diff -ruN linux-2.6.30.10/arch/ubicom32/mm/memory.c linux-2.6.30.10-ubi/arch/ubi
 +{
 +      return paddr;
 +}
 +{
 +      return paddr;
 +}
-diff -ruN linux-2.6.30.10/arch/ubicom32/mm/ocm-alloc.c linux-2.6.30.10-ubi/arch/ubicom32/mm/ocm-alloc.c
---- linux-2.6.30.10/arch/ubicom32/mm/ocm-alloc.c       1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.30.10-ubi/arch/ubicom32/mm/ocm-alloc.c   2009-12-11 11:45:11.000000000 +0200
+--- /dev/null
++++ b/arch/ubicom32/mm/ocm-alloc.c
 @@ -0,0 +1,487 @@
 +/*
 + * arch/ubicom32/mm/ocm-alloc.c
 @@ -0,0 +1,487 @@
 +/*
 + * arch/ubicom32/mm/ocm-alloc.c
@@ -41345,9 +41099,8 @@ diff -ruN linux-2.6.30.10/arch/ubicom32/mm/ocm-alloc.c linux-2.6.30.10-ubi/arch/
 +}
 +late_initcall(sram_proc_init);
 +#endif
 +}
 +late_initcall(sram_proc_init);
 +#endif
-diff -ruN linux-2.6.30.10/arch/ubicom32/oprofile/ipProf.h linux-2.6.30.10-ubi/arch/ubicom32/oprofile/ipProf.h
---- linux-2.6.30.10/arch/ubicom32/oprofile/ipProf.h    1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.30.10-ubi/arch/ubicom32/oprofile/ipProf.h        2009-12-11 11:45:11.000000000 +0200
+--- /dev/null
++++ b/arch/ubicom32/oprofile/ipProf.h
 @@ -0,0 +1,39 @@
 +#ifndef __IP_PROF_H__
 +#define __IP_PROF_H__
 @@ -0,0 +1,39 @@
 +#ifndef __IP_PROF_H__
 +#define __IP_PROF_H__
@@ -41388,9 +41141,8 @@ diff -ruN linux-2.6.30.10/arch/ubicom32/oprofile/ipProf.h linux-2.6.30.10-ubi/ar
 +};
 +
 +#endif
 +};
 +
 +#endif
-diff -ruN linux-2.6.30.10/arch/ubicom32/oprofile/Makefile linux-2.6.30.10-ubi/arch/ubicom32/oprofile/Makefile
---- linux-2.6.30.10/arch/ubicom32/oprofile/Makefile    1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.30.10-ubi/arch/ubicom32/oprofile/Makefile        2009-12-11 11:45:11.000000000 +0200
+--- /dev/null
++++ b/arch/ubicom32/oprofile/Makefile
 @@ -0,0 +1,37 @@
 +#
 +# arch/ubicom32/Makefile
 @@ -0,0 +1,37 @@
 +#
 +# arch/ubicom32/Makefile
@@ -41429,9 +41181,8 @@ diff -ruN linux-2.6.30.10/arch/ubicom32/oprofile/Makefile linux-2.6.30.10-ubi/ar
 +              timer_int.o )
 +
 +oprofile-y    := $(DRIVER_OBJS) profile.o
 +              timer_int.o )
 +
 +oprofile-y    := $(DRIVER_OBJS) profile.o
-diff -ruN linux-2.6.30.10/arch/ubicom32/oprofile/profile.c linux-2.6.30.10-ubi/arch/ubicom32/oprofile/profile.c
---- linux-2.6.30.10/arch/ubicom32/oprofile/profile.c   1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.30.10-ubi/arch/ubicom32/oprofile/profile.c       2009-12-11 11:45:11.000000000 +0200
+--- /dev/null
++++ b/arch/ubicom32/oprofile/profile.c
 @@ -0,0 +1,221 @@
 +/*
 + * arch/ubicom32/oprofile/profile.c
 @@ -0,0 +1,221 @@
 +/*
 + * arch/ubicom32/oprofile/profile.c
@@ -41654,10 +41405,9 @@ diff -ruN linux-2.6.30.10/arch/ubicom32/oprofile/profile.c linux-2.6.30.10-ubi/a
 +{
 +      BUG_ON(profile_node->enabled);
 +}
 +{
 +      BUG_ON(profile_node->enabled);
 +}
-diff -ruN linux-2.6.30.10/drivers/char/hw_random/Kconfig linux-2.6.30.10-ubi/drivers/char/hw_random/Kconfig
---- linux-2.6.30.10/drivers/char/hw_random/Kconfig     2009-12-04 08:00:07.000000000 +0200
-+++ linux-2.6.30.10-ubi/drivers/char/hw_random/Kconfig 2009-12-11 11:45:13.000000000 +0200
-@@ -148,3 +148,16 @@
+--- a/drivers/char/hw_random/Kconfig
++++ b/drivers/char/hw_random/Kconfig
+@@ -148,3 +148,16 @@ config HW_RANDOM_VIRTIO
  
          To compile this driver as a module, choose M here: the
          module will be called virtio-rng.  If unsure, say N.
  
          To compile this driver as a module, choose M here: the
          module will be called virtio-rng.  If unsure, say N.
@@ -41674,17 +41424,15 @@ diff -ruN linux-2.6.30.10/drivers/char/hw_random/Kconfig linux-2.6.30.10-ubi/dri
 +        module will be called pasemi-rng.
 +
 +        If unsure, say Y.
 +        module will be called pasemi-rng.
 +
 +        If unsure, say Y.
-diff -ruN linux-2.6.30.10/drivers/char/hw_random/Makefile linux-2.6.30.10-ubi/drivers/char/hw_random/Makefile
---- linux-2.6.30.10/drivers/char/hw_random/Makefile    2009-12-04 08:00:07.000000000 +0200
-+++ linux-2.6.30.10-ubi/drivers/char/hw_random/Makefile        2009-12-11 11:45:13.000000000 +0200
-@@ -15,3 +15,4 @@
+--- a/drivers/char/hw_random/Makefile
++++ b/drivers/char/hw_random/Makefile
+@@ -15,3 +15,4 @@ obj-$(CONFIG_HW_RANDOM_IXP4XX) += ixp4xx
  obj-$(CONFIG_HW_RANDOM_OMAP) += omap-rng.o
  obj-$(CONFIG_HW_RANDOM_PASEMI) += pasemi-rng.o
  obj-$(CONFIG_HW_RANDOM_VIRTIO) += virtio-rng.o
 +obj-$(CONFIG_HW_RANDOM_UBICOM32) += ubicom32-rng.o
  obj-$(CONFIG_HW_RANDOM_OMAP) += omap-rng.o
  obj-$(CONFIG_HW_RANDOM_PASEMI) += pasemi-rng.o
  obj-$(CONFIG_HW_RANDOM_VIRTIO) += virtio-rng.o
 +obj-$(CONFIG_HW_RANDOM_UBICOM32) += ubicom32-rng.o
-diff -ruN linux-2.6.30.10/drivers/char/hw_random/ubicom32-rng.c linux-2.6.30.10-ubi/drivers/char/hw_random/ubicom32-rng.c
---- linux-2.6.30.10/drivers/char/hw_random/ubicom32-rng.c      1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.30.10-ubi/drivers/char/hw_random/ubicom32-rng.c  2009-12-11 11:45:13.000000000 +0200
+--- /dev/null
++++ b/drivers/char/hw_random/ubicom32-rng.c
 @@ -0,0 +1,105 @@
 +/*
 + * drivers/net/ubi32-eth.c
 @@ -0,0 +1,105 @@
 +/*
 + * drivers/net/ubi32-eth.c
@@ -41791,10 +41539,9 @@ diff -ruN linux-2.6.30.10/drivers/char/hw_random/ubicom32-rng.c linux-2.6.30.10-
 +MODULE_AUTHOR("Ubicom, Inc.");
 +MODULE_DESCRIPTION("H/W rng driver for ubicom32 processor");
 +MODULE_VERSION("1:1.0.a");
 +MODULE_AUTHOR("Ubicom, Inc.");
 +MODULE_DESCRIPTION("H/W rng driver for ubicom32 processor");
 +MODULE_VERSION("1:1.0.a");
-diff -ruN linux-2.6.30.10/drivers/crypto/Kconfig linux-2.6.30.10-ubi/drivers/crypto/Kconfig
---- linux-2.6.30.10/drivers/crypto/Kconfig     2009-12-04 08:00:07.000000000 +0200
-+++ linux-2.6.30.10-ubi/drivers/crypto/Kconfig 2009-12-11 11:45:13.000000000 +0200
-@@ -61,6 +61,40 @@
+--- a/drivers/crypto/Kconfig
++++ b/drivers/crypto/Kconfig
+@@ -61,6 +61,40 @@ config CRYPTO_DEV_GEODE
          To compile this driver as a module, choose M here: the module
          will be called geode-aes.
  
          To compile this driver as a module, choose M here: the module
          will be called geode-aes.
  
@@ -41835,10 +41582,9 @@ diff -ruN linux-2.6.30.10/drivers/crypto/Kconfig linux-2.6.30.10-ubi/drivers/cry
  config ZCRYPT
        tristate "Support for PCI-attached cryptographic adapters"
        depends on S390
  config ZCRYPT
        tristate "Support for PCI-attached cryptographic adapters"
        depends on S390
-diff -ruN linux-2.6.30.10/drivers/mmc/host/Kconfig linux-2.6.30.10-ubi/drivers/mmc/host/Kconfig
---- linux-2.6.30.10/drivers/mmc/host/Kconfig   2009-12-14 11:15:33.000000000 +0200
-+++ linux-2.6.30.10-ubi/drivers/mmc/host/Kconfig       2009-12-14 11:15:31.000000000 +0200
-@@ -266,3 +266,10 @@
+--- a/drivers/mmc/host/Kconfig
++++ b/drivers/mmc/host/Kconfig
+@@ -266,3 +266,10 @@ config GPIOMMC_CONFIGFS
        help
          This option automatically enables configfs support for gpiommc
          if configfs is available.
        help
          This option automatically enables configfs support for gpiommc
          if configfs is available.
@@ -41849,18 +41595,16 @@ diff -ruN linux-2.6.30.10/drivers/mmc/host/Kconfig linux-2.6.30.10-ubi/drivers/m
 +      help
 +        This provides support for the SD/MMC hardware found on Ubicom32
 +        IP7K processors
 +      help
 +        This provides support for the SD/MMC hardware found on Ubicom32
 +        IP7K processors
-diff -ruN linux-2.6.30.10/drivers/mmc/host/Makefile linux-2.6.30.10-ubi/drivers/mmc/host/Makefile
---- linux-2.6.30.10/drivers/mmc/host/Makefile  2009-12-14 11:37:36.000000000 +0200
-+++ linux-2.6.30.10-ubi/drivers/mmc/host/Makefile      2009-12-14 11:37:35.000000000 +0200
-@@ -30,4 +30,5 @@
+--- a/drivers/mmc/host/Makefile
++++ b/drivers/mmc/host/Makefile
+@@ -30,4 +30,5 @@ obj-$(CONFIG_MMC_S3C)        += s3cmci.o
  obj-$(CONFIG_MMC_SDRICOH_CS)  += sdricoh_cs.o
  obj-$(CONFIG_MMC_TMIO)                += tmio_mmc.o
  obj-$(CONFIG_GPIOMMC)         += gpiommc.o
 +obj-$(CONFIG_MMC_UBICOM32)    += ubicom32sd.o
  
  obj-$(CONFIG_MMC_SDRICOH_CS)  += sdricoh_cs.o
  obj-$(CONFIG_MMC_TMIO)                += tmio_mmc.o
  obj-$(CONFIG_GPIOMMC)         += gpiommc.o
 +obj-$(CONFIG_MMC_UBICOM32)    += ubicom32sd.o
  
-diff -ruN linux-2.6.30.10/drivers/mmc/host/ubicom32sd.c linux-2.6.30.10-ubi/drivers/mmc/host/ubicom32sd.c
---- linux-2.6.30.10/drivers/mmc/host/ubicom32sd.c      1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.30.10-ubi/drivers/mmc/host/ubicom32sd.c  2009-12-11 11:45:16.000000000 +0200
+--- /dev/null
++++ b/drivers/mmc/host/ubicom32sd.c
 @@ -0,0 +1,773 @@
 +/*
 + * drivers/mmc/host/ubicom32sd.c
 @@ -0,0 +1,773 @@
 +/*
 + * drivers/mmc/host/ubicom32sd.c
@@ -42635,10 +42379,9 @@ diff -ruN linux-2.6.30.10/drivers/mmc/host/ubicom32sd.c linux-2.6.30.10-ubi/driv
 +MODULE_AUTHOR("Patrick Tjin");
 +MODULE_DESCRIPTION("Ubicom32 Secure Digital Host Controller Interface driver");
 +MODULE_LICENSE("GPL");
 +MODULE_AUTHOR("Patrick Tjin");
 +MODULE_DESCRIPTION("Ubicom32 Secure Digital Host Controller Interface driver");
 +MODULE_LICENSE("GPL");
-diff -ruN linux-2.6.30.10/drivers/mtd/devices/Kconfig linux-2.6.30.10-ubi/drivers/mtd/devices/Kconfig
---- linux-2.6.30.10/drivers/mtd/devices/Kconfig        2009-12-04 08:00:07.000000000 +0200
-+++ linux-2.6.30.10-ubi/drivers/mtd/devices/Kconfig    2009-12-11 11:45:16.000000000 +0200
-@@ -104,6 +104,31 @@
+--- a/drivers/mtd/devices/Kconfig
++++ b/drivers/mtd/devices/Kconfig
+@@ -104,6 +104,31 @@ config M25PXX_USE_FAST_READ
        help
          This option enables FAST_READ access supported by ST M25Pxx.
  
        help
          This option enables FAST_READ access supported by ST M25Pxx.
  
@@ -42670,19 +42413,17 @@ diff -ruN linux-2.6.30.10/drivers/mtd/devices/Kconfig linux-2.6.30.10-ubi/driver
  config MTD_SLRAM
        tristate "Uncached system RAM"
        help
  config MTD_SLRAM
        tristate "Uncached system RAM"
        help
-diff -ruN linux-2.6.30.10/drivers/mtd/devices/Makefile linux-2.6.30.10-ubi/drivers/mtd/devices/Makefile
---- linux-2.6.30.10/drivers/mtd/devices/Makefile       2009-12-04 08:00:07.000000000 +0200
-+++ linux-2.6.30.10-ubi/drivers/mtd/devices/Makefile   2009-12-11 11:45:16.000000000 +0200
-@@ -16,3 +16,6 @@
+--- a/drivers/mtd/devices/Makefile
++++ b/drivers/mtd/devices/Makefile
+@@ -16,3 +16,6 @@ obj-$(CONFIG_MTD_LART)               += lart.o
  obj-$(CONFIG_MTD_BLOCK2MTD)   += block2mtd.o
  obj-$(CONFIG_MTD_DATAFLASH)   += mtd_dataflash.o
  obj-$(CONFIG_MTD_M25P80)      += m25p80.o
 +obj-$(CONFIG_MTD_UBI32_M25P80)        += ubi32-m25p80.o
 +obj-$(CONFIG_MTD_NAND_SPI_ER) += nand-spi-er.o
 +obj-$(CONFIG_MTD_UBI32_NAND_SPI_ER)   += ubi32-nand-spi-er.o
  obj-$(CONFIG_MTD_BLOCK2MTD)   += block2mtd.o
  obj-$(CONFIG_MTD_DATAFLASH)   += mtd_dataflash.o
  obj-$(CONFIG_MTD_M25P80)      += m25p80.o
 +obj-$(CONFIG_MTD_UBI32_M25P80)        += ubi32-m25p80.o
 +obj-$(CONFIG_MTD_NAND_SPI_ER) += nand-spi-er.o
 +obj-$(CONFIG_MTD_UBI32_NAND_SPI_ER)   += ubi32-nand-spi-er.o
-diff -ruN linux-2.6.30.10/drivers/mtd/devices/nand-spi-er.c linux-2.6.30.10-ubi/drivers/mtd/devices/nand-spi-er.c
---- linux-2.6.30.10/drivers/mtd/devices/nand-spi-er.c  1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.30.10-ubi/drivers/mtd/devices/nand-spi-er.c      2009-12-11 11:45:16.000000000 +0200
+--- /dev/null
++++ b/drivers/mtd/devices/nand-spi-er.c
 @@ -0,0 +1,1017 @@
 +/*
 + * Micron SPI-ER NAND Flash Memory
 @@ -0,0 +1,1017 @@
 +/*
 + * Micron SPI-ER NAND Flash Memory
@@ -43701,9 +43442,8 @@ diff -ruN linux-2.6.30.10/drivers/mtd/devices/nand-spi-er.c linux-2.6.30.10-ubi/
 +MODULE_LICENSE("GPL");
 +MODULE_AUTHOR("Patrick Tjin");
 +MODULE_DESCRIPTION("MTD nand_spi_er driver");
 +MODULE_LICENSE("GPL");
 +MODULE_AUTHOR("Patrick Tjin");
 +MODULE_DESCRIPTION("MTD nand_spi_er driver");
-diff -ruN linux-2.6.30.10/drivers/mtd/devices/ubi32-m25p80.c linux-2.6.30.10-ubi/drivers/mtd/devices/ubi32-m25p80.c
---- linux-2.6.30.10/drivers/mtd/devices/ubi32-m25p80.c 1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.30.10-ubi/drivers/mtd/devices/ubi32-m25p80.c     2009-12-11 11:45:16.000000000 +0200
+--- /dev/null
++++ b/drivers/mtd/devices/ubi32-m25p80.c
 @@ -0,0 +1,1066 @@
 +/*
 + * drivers/mtd/devices/ubi32-m25p80.c
 @@ -0,0 +1,1066 @@
 +/*
 + * drivers/mtd/devices/ubi32-m25p80.c
@@ -44771,9 +44511,8 @@ diff -ruN linux-2.6.30.10/drivers/mtd/devices/ubi32-m25p80.c linux-2.6.30.10-ubi
 +MODULE_LICENSE("GPL");
 +MODULE_AUTHOR("Mike Lavender");
 +MODULE_DESCRIPTION("Ubicom32 MTD SPI driver for ST M25Pxx flash chips");
 +MODULE_LICENSE("GPL");
 +MODULE_AUTHOR("Mike Lavender");
 +MODULE_DESCRIPTION("Ubicom32 MTD SPI driver for ST M25Pxx flash chips");
-diff -ruN linux-2.6.30.10/drivers/mtd/devices/ubi32-nand-spi-er.c linux-2.6.30.10-ubi/drivers/mtd/devices/ubi32-nand-spi-er.c
---- linux-2.6.30.10/drivers/mtd/devices/ubi32-nand-spi-er.c    1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.30.10-ubi/drivers/mtd/devices/ubi32-nand-spi-er.c        2009-12-11 11:45:16.000000000 +0200
+--- /dev/null
++++ b/drivers/mtd/devices/ubi32-nand-spi-er.c
 @@ -0,0 +1,1188 @@
 +/*
 + * Micron SPI-ER NAND Flash Memory
 @@ -0,0 +1,1188 @@
 +/*
 + * Micron SPI-ER NAND Flash Memory
@@ -45963,10 +45702,9 @@ diff -ruN linux-2.6.30.10/drivers/mtd/devices/ubi32-nand-spi-er.c linux-2.6.30.1
 +MODULE_LICENSE("GPL");
 +MODULE_AUTHOR("Patrick Tjin");
 +MODULE_DESCRIPTION("MTD ubi32_nand_spi_er driver for ubicom32 SPI flash controller.");
 +MODULE_LICENSE("GPL");
 +MODULE_AUTHOR("Patrick Tjin");
 +MODULE_DESCRIPTION("MTD ubi32_nand_spi_er driver for ubicom32 SPI flash controller.");
-diff -ruN linux-2.6.30.10/drivers/net/Kconfig linux-2.6.30.10-ubi/drivers/net/Kconfig
---- linux-2.6.30.10/drivers/net/Kconfig        2009-12-14 11:47:19.000000000 +0200
-+++ linux-2.6.30.10-ubi/drivers/net/Kconfig    2009-12-14 11:47:17.000000000 +0200
-@@ -2540,6 +2540,19 @@
+--- a/drivers/net/Kconfig
++++ b/drivers/net/Kconfig
+@@ -2540,6 +2540,19 @@ config JME
          To compile this driver as a module, choose M here. The module
          will be called jme.
  
          To compile this driver as a module, choose M here. The module
          will be called jme.
  
@@ -45986,18 +45724,16 @@ diff -ruN linux-2.6.30.10/drivers/net/Kconfig linux-2.6.30.10-ubi/drivers/net/Kc
  endif # NETDEV_1000
  
  #
  endif # NETDEV_1000
  
  #
-diff -ruN linux-2.6.30.10/drivers/net/Makefile linux-2.6.30.10-ubi/drivers/net/Makefile
---- linux-2.6.30.10/drivers/net/Makefile       2009-12-14 11:48:38.000000000 +0200
-+++ linux-2.6.30.10-ubi/drivers/net/Makefile   2009-12-14 11:48:40.000000000 +0200
-@@ -272,3 +272,5 @@
+--- a/drivers/net/Makefile
++++ b/drivers/net/Makefile
+@@ -272,3 +272,5 @@ obj-$(CONFIG_VIRTIO_NET) += virtio_net.o
  obj-$(CONFIG_SFC) += sfc/
  
  obj-$(CONFIG_WIMAX) += wimax/
 +
 +obj-$(CONFIG_UBICOM32_GMAC) += ubi32-eth.o
  obj-$(CONFIG_SFC) += sfc/
  
  obj-$(CONFIG_WIMAX) += wimax/
 +
 +obj-$(CONFIG_UBICOM32_GMAC) += ubi32-eth.o
-diff -ruN linux-2.6.30.10/drivers/net/ubi32-eth.c linux-2.6.30.10-ubi/drivers/net/ubi32-eth.c
---- linux-2.6.30.10/drivers/net/ubi32-eth.c    1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.30.10-ubi/drivers/net/ubi32-eth.c        2009-12-11 11:45:18.000000000 +0200
+--- /dev/null
++++ b/drivers/net/ubi32-eth.c
 @@ -0,0 +1,760 @@
 +/*
 + * drivers/net/ubi32-eth.c
 @@ -0,0 +1,760 @@
 +/*
 + * drivers/net/ubi32-eth.c
@@ -46759,9 +46495,8 @@ diff -ruN linux-2.6.30.10/drivers/net/ubi32-eth.c linux-2.6.30.10-ubi/drivers/ne
 +
 +MODULE_AUTHOR("Kan Yan, Greg Ren");
 +MODULE_LICENSE("GPL");
 +
 +MODULE_AUTHOR("Kan Yan, Greg Ren");
 +MODULE_LICENSE("GPL");
-diff -ruN linux-2.6.30.10/drivers/net/ubi32-eth.h linux-2.6.30.10-ubi/drivers/net/ubi32-eth.h
---- linux-2.6.30.10/drivers/net/ubi32-eth.h    1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.30.10-ubi/drivers/net/ubi32-eth.h        2009-12-11 11:45:18.000000000 +0200
+--- /dev/null
++++ b/drivers/net/ubi32-eth.h
 @@ -0,0 +1,132 @@
 +/*
 + * drivers/net/ubi32-eth.h
 @@ -0,0 +1,132 @@
 +/*
 + * drivers/net/ubi32-eth.h
@@ -46895,10 +46630,9 @@ diff -ruN linux-2.6.30.10/drivers/net/ubi32-eth.h linux-2.6.30.10-ubi/drivers/ne
 +#define UBI32_RX_BOUND                64
 +#define UBI32_ETH_NAPI_WEIGHT 64              /* for GigE */
 +#endif
 +#define UBI32_RX_BOUND                64
 +#define UBI32_ETH_NAPI_WEIGHT 64              /* for GigE */
 +#endif
-diff -ruN linux-2.6.30.10/drivers/net/usb/asix.c linux-2.6.30.10-ubi/drivers/net/usb/asix.c
---- linux-2.6.30.10/drivers/net/usb/asix.c     2009-12-04 08:00:07.000000000 +0200
-+++ linux-2.6.30.10-ubi/drivers/net/usb/asix.c 2009-12-11 11:45:18.000000000 +0200
-@@ -319,14 +319,33 @@
+--- a/drivers/net/usb/asix.c
++++ b/drivers/net/usb/asix.c
+@@ -319,14 +319,33 @@ static int asix_rx_fixup(struct usbnet *
                /* get the packet length */
                size = (u16) (header & 0x0000ffff);
  
                /* get the packet length */
                size = (u16) (header & 0x0000ffff);
  
@@ -46933,7 +46667,7 @@ diff -ruN linux-2.6.30.10/drivers/net/usb/asix.c linux-2.6.30.10-ubi/drivers/net
                        ax_skb->len = size;
                        ax_skb->data = packet;
                        skb_set_tail_pointer(ax_skb, size);
                        ax_skb->len = size;
                        ax_skb->data = packet;
                        skb_set_tail_pointer(ax_skb, size);
-@@ -1125,13 +1144,19 @@
+@@ -1125,13 +1144,19 @@ static int ax88178_link_reset(struct usb
        mode = AX88178_MEDIUM_DEFAULT;
  
        if (ecmd.speed == SPEED_1000)
        mode = AX88178_MEDIUM_DEFAULT;
  
        if (ecmd.speed == SPEED_1000)
@@ -46953,10 +46687,9 @@ diff -ruN linux-2.6.30.10/drivers/net/usb/asix.c linux-2.6.30.10-ubi/drivers/net
  
        if (ecmd.duplex == DUPLEX_FULL)
                mode |= AX_MEDIUM_FD;
  
        if (ecmd.duplex == DUPLEX_FULL)
                mode |= AX_MEDIUM_FD;
-diff -ruN linux-2.6.30.10/drivers/oprofile/cpu_buffer.c linux-2.6.30.10-ubi/drivers/oprofile/cpu_buffer.c
---- linux-2.6.30.10/drivers/oprofile/cpu_buffer.c      2009-12-04 08:00:07.000000000 +0200
-+++ linux-2.6.30.10-ubi/drivers/oprofile/cpu_buffer.c  2009-12-11 11:45:18.000000000 +0200
-@@ -328,10 +328,10 @@
+--- a/drivers/oprofile/cpu_buffer.c
++++ b/drivers/oprofile/cpu_buffer.c
+@@ -328,10 +328,10 @@ static inline void oprofile_end_trace(st
  }
  
  static inline void
  }
  
  static inline void
@@ -46970,7 +46703,7 @@ diff -ruN linux-2.6.30.10/drivers/oprofile/cpu_buffer.c linux-2.6.30.10-ubi/driv
        unsigned long backtrace = oprofile_backtrace_depth;
  
        /*
        unsigned long backtrace = oprofile_backtrace_depth;
  
        /*
-@@ -353,7 +353,8 @@
+@@ -353,7 +353,8 @@ __oprofile_add_ext_sample(unsigned long 
  void oprofile_add_ext_sample(unsigned long pc, struct pt_regs * const regs,
                             unsigned long event, int is_kernel)
  {
  void oprofile_add_ext_sample(unsigned long pc, struct pt_regs * const regs,
                             unsigned long event, int is_kernel)
  {
@@ -46980,7 +46713,7 @@ diff -ruN linux-2.6.30.10/drivers/oprofile/cpu_buffer.c linux-2.6.30.10-ubi/driv
  }
  
  void oprofile_add_sample(struct pt_regs * const regs, unsigned long event)
  }
  
  void oprofile_add_sample(struct pt_regs * const regs, unsigned long event)
-@@ -361,7 +362,8 @@
+@@ -361,7 +362,8 @@ void oprofile_add_sample(struct pt_regs 
        int is_kernel = !user_mode(regs);
        unsigned long pc = profile_pc(regs);
  
        int is_kernel = !user_mode(regs);
        unsigned long pc = profile_pc(regs);
  
@@ -46990,10 +46723,9 @@ diff -ruN linux-2.6.30.10/drivers/oprofile/cpu_buffer.c linux-2.6.30.10-ubi/driv
  }
  
  /*
  }
  
  /*
-diff -ruN linux-2.6.30.10/drivers/pci/Makefile linux-2.6.30.10-ubi/drivers/pci/Makefile
---- linux-2.6.30.10/drivers/pci/Makefile       2009-12-04 08:00:07.000000000 +0200
-+++ linux-2.6.30.10-ubi/drivers/pci/Makefile   2009-12-11 11:45:18.000000000 +0200
-@@ -44,8 +44,8 @@
+--- a/drivers/pci/Makefile
++++ b/drivers/pci/Makefile
+@@ -44,8 +44,8 @@ obj-$(CONFIG_PPC) += setup-bus.o
  obj-$(CONFIG_MIPS) += setup-bus.o setup-irq.o
  obj-$(CONFIG_X86_VISWS) += setup-irq.o
  obj-$(CONFIG_MN10300) += setup-bus.o
  obj-$(CONFIG_MIPS) += setup-bus.o setup-irq.o
  obj-$(CONFIG_X86_VISWS) += setup-irq.o
  obj-$(CONFIG_MN10300) += setup-bus.o
@@ -47003,10 +46735,9 @@ diff -ruN linux-2.6.30.10/drivers/pci/Makefile linux-2.6.30.10-ubi/drivers/pci/M
  # ACPI Related PCI FW Functions
  #
  obj-$(CONFIG_ACPI)    += pci-acpi.o
  # ACPI Related PCI FW Functions
  #
  obj-$(CONFIG_ACPI)    += pci-acpi.o
-diff -ruN linux-2.6.30.10/drivers/serial/Kconfig linux-2.6.30.10-ubi/drivers/serial/Kconfig
---- linux-2.6.30.10/drivers/serial/Kconfig     2009-12-04 08:00:07.000000000 +0200
-+++ linux-2.6.30.10-ubi/drivers/serial/Kconfig 2009-12-11 11:45:19.000000000 +0200
-@@ -871,6 +871,57 @@
+--- a/drivers/serial/Kconfig
++++ b/drivers/serial/Kconfig
+@@ -871,6 +871,57 @@ config SERIAL_UARTLITE_CONSOLE
          console (the system console is the device which receives all kernel
          messages and warnings and which allows logins in single user mode).
  
          console (the system console is the device which receives all kernel
          messages and warnings and which allows logins in single user mode).
  
@@ -47064,19 +46795,17 @@ diff -ruN linux-2.6.30.10/drivers/serial/Kconfig linux-2.6.30.10-ubi/drivers/ser
  config SERIAL_SUNCORE
        bool
        depends on SPARC
  config SERIAL_SUNCORE
        bool
        depends on SPARC
-diff -ruN linux-2.6.30.10/drivers/serial/Makefile linux-2.6.30.10-ubi/drivers/serial/Makefile
---- linux-2.6.30.10/drivers/serial/Makefile    2009-12-04 08:00:07.000000000 +0200
-+++ linux-2.6.30.10-ubi/drivers/serial/Makefile        2009-12-11 11:45:19.000000000 +0200
-@@ -77,3 +77,6 @@
+--- a/drivers/serial/Makefile
++++ b/drivers/serial/Makefile
+@@ -77,3 +77,6 @@ obj-$(CONFIG_SERIAL_OF_PLATFORM_NWPSERIA
  obj-$(CONFIG_SERIAL_KS8695) += serial_ks8695.o
  obj-$(CONFIG_KGDB_SERIAL_CONSOLE) += kgdboc.o
  obj-$(CONFIG_SERIAL_QE) += ucc_uart.o
 +obj-$(CONFIG_SERIAL_UBI32_SERDES) += ubi32_serdes.o
 +obj-$(CONFIG_SERIAL_UBI32_UARTTIO) += ubi32_uarttio.o
 +obj-$(CONFIG_SERIAL_UBI32_MAILBOX) += ubi32_mailbox.o
  obj-$(CONFIG_SERIAL_KS8695) += serial_ks8695.o
  obj-$(CONFIG_KGDB_SERIAL_CONSOLE) += kgdboc.o
  obj-$(CONFIG_SERIAL_QE) += ucc_uart.o
 +obj-$(CONFIG_SERIAL_UBI32_SERDES) += ubi32_serdes.o
 +obj-$(CONFIG_SERIAL_UBI32_UARTTIO) += ubi32_uarttio.o
 +obj-$(CONFIG_SERIAL_UBI32_MAILBOX) += ubi32_mailbox.o
-diff -ruN linux-2.6.30.10/drivers/serial/ubi32_mailbox.c linux-2.6.30.10-ubi/drivers/serial/ubi32_mailbox.c
---- linux-2.6.30.10/drivers/serial/ubi32_mailbox.c     1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.30.10-ubi/drivers/serial/ubi32_mailbox.c 2009-12-11 11:45:19.000000000 +0200
+--- /dev/null
++++ b/drivers/serial/ubi32_mailbox.c
 @@ -0,0 +1,928 @@
 +/*
 + * drivers/serial/ubi32_mailbox.c
 @@ -0,0 +1,928 @@
 +/*
 + * drivers/serial/ubi32_mailbox.c
@@ -48006,9 +47735,8 @@ diff -ruN linux-2.6.30.10/drivers/serial/ubi32_mailbox.c linux-2.6.30.10-ubi/dri
 +
 +MODULE_ALIAS_CHARDEV_MAJOR(UBI32_MAILBOX_MAJOR);
 +MODULE_ALIAS("platform:ubi32_mailbox");
 +
 +MODULE_ALIAS_CHARDEV_MAJOR(UBI32_MAILBOX_MAJOR);
 +MODULE_ALIAS("platform:ubi32_mailbox");
-diff -ruN linux-2.6.30.10/drivers/serial/ubi32_serdes.c linux-2.6.30.10-ubi/drivers/serial/ubi32_serdes.c
---- linux-2.6.30.10/drivers/serial/ubi32_serdes.c      1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.30.10-ubi/drivers/serial/ubi32_serdes.c  2009-12-11 11:45:19.000000000 +0200
+--- /dev/null
++++ b/drivers/serial/ubi32_serdes.c
 @@ -0,0 +1,817 @@
 +/*
 + * drivers/serial/ubi32_serdes.c
 @@ -0,0 +1,817 @@
 +/*
 + * drivers/serial/ubi32_serdes.c
@@ -48827,9 +48555,8 @@ diff -ruN linux-2.6.30.10/drivers/serial/ubi32_serdes.c linux-2.6.30.10-ubi/driv
 +MODULE_LICENSE("GPL");
 +MODULE_ALIAS_CHARDEV_MAJOR(UBI32_SERDES_MAJOR);
 +MODULE_ALIAS("platform:ubi32_serdes");
 +MODULE_LICENSE("GPL");
 +MODULE_ALIAS_CHARDEV_MAJOR(UBI32_SERDES_MAJOR);
 +MODULE_ALIAS("platform:ubi32_serdes");
-diff -ruN linux-2.6.30.10/drivers/serial/ubi32_uarttio.c linux-2.6.30.10-ubi/drivers/serial/ubi32_uarttio.c
---- linux-2.6.30.10/drivers/serial/ubi32_uarttio.c     1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.30.10-ubi/drivers/serial/ubi32_uarttio.c 2009-12-11 11:45:19.000000000 +0200
+--- /dev/null
++++ b/drivers/serial/ubi32_uarttio.c
 @@ -0,0 +1,1172 @@
 +/*
 + * drivers/serial/ubi32_uarttio.c
 @@ -0,0 +1,1172 @@
 +/*
 + * drivers/serial/ubi32_uarttio.c
@@ -50003,10 +49730,9 @@ diff -ruN linux-2.6.30.10/drivers/serial/ubi32_uarttio.c linux-2.6.30.10-ubi/dri
 +MODULE_LICENSE("GPL");
 +MODULE_ALIAS_CHARDEV_MAJOR(UBI32_UARTTIO_MAJOR);
 +MODULE_ALIAS("platform:" DRIVER_NAME);
 +MODULE_LICENSE("GPL");
 +MODULE_ALIAS_CHARDEV_MAJOR(UBI32_UARTTIO_MAJOR);
 +MODULE_ALIAS("platform:" DRIVER_NAME);
-diff -ruN linux-2.6.30.10/drivers/spi/Kconfig linux-2.6.30.10-ubi/drivers/spi/Kconfig
---- linux-2.6.30.10/drivers/spi/Kconfig        2009-12-14 11:54:29.000000000 +0200
-+++ linux-2.6.30.10-ubi/drivers/spi/Kconfig    2009-12-14 11:54:27.000000000 +0200
-@@ -196,6 +196,15 @@
+--- a/drivers/spi/Kconfig
++++ b/drivers/spi/Kconfig
+@@ -196,6 +196,15 @@ config SPI_S3C24XX
        help
          SPI driver for Samsung S3C24XX series ARM SoCs
  
        help
          SPI driver for Samsung S3C24XX series ARM SoCs
  
@@ -50022,10 +49748,9 @@ diff -ruN linux-2.6.30.10/drivers/spi/Kconfig linux-2.6.30.10-ubi/drivers/spi/Kc
  config SPI_S3C24XX_GPIO
        tristate "Samsung S3C24XX series SPI by GPIO"
        depends on ARCH_S3C2410 && EXPERIMENTAL
  config SPI_S3C24XX_GPIO
        tristate "Samsung S3C24XX series SPI by GPIO"
        depends on ARCH_S3C2410 && EXPERIMENTAL
-diff -ruN linux-2.6.30.10/drivers/spi/Makefile linux-2.6.30.10-ubi/drivers/spi/Makefile
---- linux-2.6.30.10/drivers/spi/Makefile       2009-12-14 11:55:29.000000000 +0200
-+++ linux-2.6.30.10-ubi/drivers/spi/Makefile   2009-12-14 11:55:25.000000000 +0200
-@@ -27,6 +27,7 @@
+--- a/drivers/spi/Makefile
++++ b/drivers/spi/Makefile
+@@ -27,6 +27,7 @@ obj-$(CONFIG_SPI_ORION)                      += orion_spi.o
  obj-$(CONFIG_SPI_MPC52xx_PSC)         += mpc52xx_psc_spi.o
  obj-$(CONFIG_SPI_MPC83xx)             += spi_mpc83xx.o
  obj-$(CONFIG_SPI_S3C24XX_GPIO)                += spi_s3c24xx_gpio.o
  obj-$(CONFIG_SPI_MPC52xx_PSC)         += mpc52xx_psc_spi.o
  obj-$(CONFIG_SPI_MPC83xx)             += spi_mpc83xx.o
  obj-$(CONFIG_SPI_S3C24XX_GPIO)                += spi_s3c24xx_gpio.o
@@ -50033,9 +49758,8 @@ diff -ruN linux-2.6.30.10/drivers/spi/Makefile linux-2.6.30.10-ubi/drivers/spi/M
  obj-$(CONFIG_SPI_S3C24XX)             += spi_s3c24xx.o
  obj-$(CONFIG_SPI_TXX9)                        += spi_txx9.o
  obj-$(CONFIG_SPI_XILINX)              += xilinx_spi.o
  obj-$(CONFIG_SPI_S3C24XX)             += spi_s3c24xx.o
  obj-$(CONFIG_SPI_TXX9)                        += spi_txx9.o
  obj-$(CONFIG_SPI_XILINX)              += xilinx_spi.o
-diff -ruN linux-2.6.30.10/drivers/spi/spi_ubicom32_gpio.c linux-2.6.30.10-ubi/drivers/spi/spi_ubicom32_gpio.c
---- linux-2.6.30.10/drivers/spi/spi_ubicom32_gpio.c    1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.30.10-ubi/drivers/spi/spi_ubicom32_gpio.c        2009-12-11 11:45:19.000000000 +0200
+--- /dev/null
++++ b/drivers/spi/spi_ubicom32_gpio.c
 @@ -0,0 +1,267 @@
 +/*
 + * drivers/spi_spi_ubicom32_gpio.c
 @@ -0,0 +1,267 @@
 +/*
 + * drivers/spi_spi_ubicom32_gpio.c
@@ -50304,10 +50028,9 @@ diff -ruN linux-2.6.30.10/drivers/spi/spi_ubicom32_gpio.c linux-2.6.30.10-ubi/dr
 +MODULE_DESCRIPTION("Ubicom32 SPI-GPIO Driver");
 +MODULE_AUTHOR("Pat Tjin, <@ubicom.com>");
 +MODULE_LICENSE("GPL");
 +MODULE_DESCRIPTION("Ubicom32 SPI-GPIO Driver");
 +MODULE_AUTHOR("Pat Tjin, <@ubicom.com>");
 +MODULE_LICENSE("GPL");
-diff -ruN linux-2.6.30.10/drivers/uio/Kconfig linux-2.6.30.10-ubi/drivers/uio/Kconfig
---- linux-2.6.30.10/drivers/uio/Kconfig        2009-12-04 08:00:07.000000000 +0200
-+++ linux-2.6.30.10-ubi/drivers/uio/Kconfig    2009-12-11 11:45:20.000000000 +0200
-@@ -89,4 +89,12 @@
+--- a/drivers/uio/Kconfig
++++ b/drivers/uio/Kconfig
+@@ -89,4 +89,12 @@ config UIO_SERCOS3
  
          If you compile this as a module, it will be called uio_sercos3.
  
  
          If you compile this as a module, it will be called uio_sercos3.
  
@@ -50320,17 +50043,15 @@ diff -ruN linux-2.6.30.10/drivers/uio/Kconfig linux-2.6.30.10-ubi/drivers/uio/Kc
 +        If you compile this as a module, it will be called uio_ubicom32ring
 +
  endif
 +        If you compile this as a module, it will be called uio_ubicom32ring
 +
  endif
-diff -ruN linux-2.6.30.10/drivers/uio/Makefile linux-2.6.30.10-ubi/drivers/uio/Makefile
---- linux-2.6.30.10/drivers/uio/Makefile       2009-12-04 08:00:07.000000000 +0200
-+++ linux-2.6.30.10-ubi/drivers/uio/Makefile   2009-12-11 11:45:20.000000000 +0200
-@@ -5,3 +5,4 @@
+--- a/drivers/uio/Makefile
++++ b/drivers/uio/Makefile
+@@ -5,3 +5,4 @@ obj-$(CONFIG_UIO_PDRV_GENIRQ)  += uio_pdr
  obj-$(CONFIG_UIO_SMX) += uio_smx.o
  obj-$(CONFIG_UIO_AEC) += uio_aec.o
  obj-$(CONFIG_UIO_SERCOS3)     += uio_sercos3.o
 +obj-$(CONFIG_UIO_UBICOM32RING)        += uio_ubicom32ring.o
  obj-$(CONFIG_UIO_SMX) += uio_smx.o
  obj-$(CONFIG_UIO_AEC) += uio_aec.o
  obj-$(CONFIG_UIO_SERCOS3)     += uio_sercos3.o
 +obj-$(CONFIG_UIO_UBICOM32RING)        += uio_ubicom32ring.o
-diff -ruN linux-2.6.30.10/drivers/uio/uio_ubicom32ring.c linux-2.6.30.10-ubi/drivers/uio/uio_ubicom32ring.c
---- linux-2.6.30.10/drivers/uio/uio_ubicom32ring.c     1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.30.10-ubi/drivers/uio/uio_ubicom32ring.c 2009-12-11 11:45:20.000000000 +0200
+--- /dev/null
++++ b/drivers/uio/uio_ubicom32ring.c
 @@ -0,0 +1,288 @@
 +/*
 + * drivers/uio/uio_ubicom32ring.c
 @@ -0,0 +1,288 @@
 +/*
 + * drivers/uio/uio_ubicom32ring.c
@@ -50620,10 +50341,9 @@ diff -ruN linux-2.6.30.10/drivers/uio/uio_ubicom32ring.c linux-2.6.30.10-ubi/dri
 +MODULE_DESCRIPTION("Userspace I/O driver for Ubicom32 ring buffers");
 +MODULE_LICENSE("GPL v2");
 +MODULE_ALIAS("platform:" DRIVER_NAME);
 +MODULE_DESCRIPTION("Userspace I/O driver for Ubicom32 ring buffers");
 +MODULE_LICENSE("GPL v2");
 +MODULE_ALIAS("platform:" DRIVER_NAME);
-diff -ruN linux-2.6.30.10/drivers/usb/gadget/epautoconf.c linux-2.6.30.10-ubi/drivers/usb/gadget/epautoconf.c
---- linux-2.6.30.10/drivers/usb/gadget/epautoconf.c    2009-12-04 08:00:07.000000000 +0200
-+++ linux-2.6.30.10-ubi/drivers/usb/gadget/epautoconf.c        2009-12-11 11:45:20.000000000 +0200
-@@ -154,6 +154,10 @@
+--- a/drivers/usb/gadget/epautoconf.c
++++ b/drivers/usb/gadget/epautoconf.c
+@@ -154,6 +154,10 @@ ep_matches (
                        /* configure your hardware with enough buffering!! */
                }
                break;
                        /* configure your hardware with enough buffering!! */
                }
                break;
@@ -50634,10 +50354,9 @@ diff -ruN linux-2.6.30.10/drivers/usb/gadget/epautoconf.c linux-2.6.30.10-ubi/dr
        }
  
        /* MATCH!! */
        }
  
        /* MATCH!! */
-diff -ruN linux-2.6.30.10/drivers/usb/Kconfig linux-2.6.30.10-ubi/drivers/usb/Kconfig
---- linux-2.6.30.10/drivers/usb/Kconfig        2009-12-04 08:00:07.000000000 +0200
-+++ linux-2.6.30.10-ubi/drivers/usb/Kconfig    2009-12-11 11:45:20.000000000 +0200
-@@ -22,6 +22,7 @@
+--- a/drivers/usb/Kconfig
++++ b/drivers/usb/Kconfig
+@@ -22,6 +22,7 @@ config USB_ARCH_HAS_HCD
        default y if PCMCIA && !M32R                    # sl811_cs
        default y if ARM                                # SL-811
        default y if SUPERH                             # r8a66597-hcd
        default y if PCMCIA && !M32R                    # sl811_cs
        default y if ARM                                # SL-811
        default y if SUPERH                             # r8a66597-hcd
@@ -50645,10 +50364,9 @@ diff -ruN linux-2.6.30.10/drivers/usb/Kconfig linux-2.6.30.10-ubi/drivers/usb/Kc
        default PCI
  
  # many non-PCI SOC chips embed OHCI
        default PCI
  
  # many non-PCI SOC chips embed OHCI
-diff -ruN linux-2.6.30.10/drivers/usb/musb/Kconfig linux-2.6.30.10-ubi/drivers/usb/musb/Kconfig
---- linux-2.6.30.10/drivers/usb/musb/Kconfig   2009-12-04 08:00:07.000000000 +0200
-+++ linux-2.6.30.10-ubi/drivers/usb/musb/Kconfig       2009-12-11 11:45:20.000000000 +0200
-@@ -12,7 +12,7 @@
+--- a/drivers/usb/musb/Kconfig
++++ b/drivers/usb/musb/Kconfig
+@@ -12,7 +12,7 @@ config USB_MUSB_HDRC
        depends on !SUPERH
        select TWL4030_USB if MACH_OMAP_3430SDP
        select USB_OTG_UTILS
        depends on !SUPERH
        select TWL4030_USB if MACH_OMAP_3430SDP
        select USB_OTG_UTILS
@@ -50657,10 +50375,9 @@ diff -ruN linux-2.6.30.10/drivers/usb/musb/Kconfig linux-2.6.30.10-ubi/drivers/u
        help
          Say Y here if your system has a dual role high speed USB
          controller based on the Mentor Graphics silicon IP.  Then
        help
          Say Y here if your system has a dual role high speed USB
          controller based on the Mentor Graphics silicon IP.  Then
-diff -ruN linux-2.6.30.10/drivers/usb/musb/Makefile linux-2.6.30.10-ubi/drivers/usb/musb/Makefile
---- linux-2.6.30.10/drivers/usb/musb/Makefile  2009-12-04 08:00:07.000000000 +0200
-+++ linux-2.6.30.10-ubi/drivers/usb/musb/Makefile      2009-12-11 11:45:20.000000000 +0200
-@@ -30,6 +30,10 @@
+--- a/drivers/usb/musb/Makefile
++++ b/drivers/usb/musb/Makefile
+@@ -30,6 +30,10 @@ ifeq ($(CONFIG_BF52x),y)
        musb_hdrc-objs  += blackfin.o
  endif
  
        musb_hdrc-objs  += blackfin.o
  endif
  
@@ -50671,9 +50388,8 @@ diff -ruN linux-2.6.30.10/drivers/usb/musb/Makefile linux-2.6.30.10-ubi/drivers/
  ifeq ($(CONFIG_USB_GADGET_MUSB_HDRC),y)
        musb_hdrc-objs          += musb_gadget_ep0.o musb_gadget.o
  endif
  ifeq ($(CONFIG_USB_GADGET_MUSB_HDRC),y)
        musb_hdrc-objs          += musb_gadget_ep0.o musb_gadget.o
  endif
-diff -ruN linux-2.6.30.10/drivers/usb/musb/musb_core.c linux-2.6.30.10-ubi/drivers/usb/musb/musb_core.c
---- linux-2.6.30.10/drivers/usb/musb/musb_core.c       2009-12-04 08:00:07.000000000 +0200
-+++ linux-2.6.30.10-ubi/drivers/usb/musb/musb_core.c   2009-12-11 11:45:20.000000000 +0200
+--- a/drivers/usb/musb/musb_core.c
++++ b/drivers/usb/musb/musb_core.c
 @@ -105,6 +105,13 @@
  #include <asm/mach-types.h>
  #endif
 @@ -105,6 +105,13 @@
  #include <asm/mach-types.h>
  #endif
@@ -50688,7 +50404,7 @@ diff -ruN linux-2.6.30.10/drivers/usb/musb/musb_core.c linux-2.6.30.10-ubi/drive
  #include "musb_core.h"
  
  
  #include "musb_core.h"
  
  
-@@ -147,8 +154,37 @@
+@@ -147,8 +154,37 @@ static inline struct musb *dev_to_musb(s
  }
  
  /*-------------------------------------------------------------------------*/
  }
  
  /*-------------------------------------------------------------------------*/
@@ -50727,7 +50443,7 @@ diff -ruN linux-2.6.30.10/drivers/usb/musb/musb_core.c linux-2.6.30.10-ubi/drive
  
  /*
   * Load an endpoint's FIFO
  
  /*
   * Load an endpoint's FIFO
-@@ -227,8 +263,7 @@
+@@ -227,8 +263,7 @@ void musb_read_fifo(struct musb_hw_ep *h
                readsb(fifo, dst, len);
        }
  }
                readsb(fifo, dst, len);
        }
  }
@@ -50737,7 +50453,7 @@ diff -ruN linux-2.6.30.10/drivers/usb/musb/musb_core.c linux-2.6.30.10-ubi/drive
  
  
  /*-------------------------------------------------------------------------*/
  
  
  /*-------------------------------------------------------------------------*/
-@@ -874,12 +909,19 @@
+@@ -874,12 +909,19 @@ void musb_start(struct musb *musb)
        musb_writeb(regs, MUSB_TESTMODE, 0);
  
        /* put into basic highspeed mode and start session */
        musb_writeb(regs, MUSB_TESTMODE, 0);
  
        /* put into basic highspeed mode and start session */
@@ -50757,7 +50473,7 @@ diff -ruN linux-2.6.30.10/drivers/usb/musb/musb_core.c linux-2.6.30.10-ubi/drive
  
        musb->is_active = 0;
        devctl = musb_readb(regs, MUSB_DEVCTL);
  
        musb->is_active = 0;
        devctl = musb_readb(regs, MUSB_DEVCTL);
-@@ -1081,6 +1123,7 @@
+@@ -1081,6 +1123,7 @@ static struct fifo_cfg __initdata mode_4
  };
  
  
  };
  
  
@@ -50765,7 +50481,7 @@ diff -ruN linux-2.6.30.10/drivers/usb/musb/musb_core.c linux-2.6.30.10-ubi/drive
  /*
   * configure a fifo; for non-shared endpoints, this may be called
   * once for a tx fifo and once for an rx fifo.
  /*
   * configure a fifo; for non-shared endpoints, this may be called
   * once for a tx fifo and once for an rx fifo.
-@@ -1240,7 +1283,7 @@
+@@ -1240,7 +1283,7 @@ static int __init ep_config_from_table(s
  
        return 0;
  }
  
        return 0;
  }
@@ -50774,7 +50490,7 @@ diff -ruN linux-2.6.30.10/drivers/usb/musb/musb_core.c linux-2.6.30.10-ubi/drive
  
  /*
   * ep_config_from_hw - when MUSB_C_DYNFIFO_DEF is false
  
  /*
   * ep_config_from_hw - when MUSB_C_DYNFIFO_DEF is false
-@@ -1256,6 +1299,11 @@
+@@ -1256,6 +1299,11 @@ static int __init ep_config_from_hw(stru
        DBG(2, "<== static silicon ep config\n");
  
        /* FIXME pick up ep0 maxpacket size */
        DBG(2, "<== static silicon ep config\n");
  
        /* FIXME pick up ep0 maxpacket size */
@@ -50786,7 +50502,7 @@ diff -ruN linux-2.6.30.10/drivers/usb/musb/musb_core.c linux-2.6.30.10-ubi/drive
  
        for (epnum = 1; epnum < musb->config->num_eps; epnum++) {
                musb_ep_select(mbase, epnum);
  
        for (epnum = 1; epnum < musb->config->num_eps; epnum++) {
                musb_ep_select(mbase, epnum);
-@@ -1276,14 +1324,27 @@
+@@ -1276,14 +1324,27 @@ static int __init ep_config_from_hw(stru
                /* REVISIT:  this algorithm is lazy, we should at least
                 * try to pick a double buffered endpoint.
                 */
                /* REVISIT:  this algorithm is lazy, we should at least
                 * try to pick a double buffered endpoint.
                 */
@@ -50815,7 +50531,7 @@ diff -ruN linux-2.6.30.10/drivers/usb/musb/musb_core.c linux-2.6.30.10-ubi/drive
                pr_debug("%s: missing bulk\n", musb_driver_name);
                return -EINVAL;
        }
                pr_debug("%s: missing bulk\n", musb_driver_name);
                return -EINVAL;
        }
-@@ -1393,12 +1454,16 @@
+@@ -1393,12 +1454,16 @@ static int __init musb_core_init(u16 mus
        musb->epmask = 1;
  
        if (reg & MUSB_CONFIGDATA_DYNFIFO) {
        musb->epmask = 1;
  
        if (reg & MUSB_CONFIGDATA_DYNFIFO) {
@@ -50833,7 +50549,7 @@ diff -ruN linux-2.6.30.10/drivers/usb/musb/musb_core.c linux-2.6.30.10-ubi/drive
        } else {
                if (!musb->config->dyn_fifo)
                        status = ep_config_from_hw(musb);
        } else {
                if (!musb->config->dyn_fifo)
                        status = ep_config_from_hw(musb);
-@@ -1462,8 +1527,8 @@
+@@ -1462,8 +1527,8 @@ static int __init musb_core_init(u16 mus
  
  /*-------------------------------------------------------------------------*/
  
  
  /*-------------------------------------------------------------------------*/
  
@@ -50844,7 +50560,7 @@ diff -ruN linux-2.6.30.10/drivers/usb/musb/musb_core.c linux-2.6.30.10-ubi/drive
  static irqreturn_t generic_interrupt(int irq, void *__hci)
  {
        unsigned long   flags;
  static irqreturn_t generic_interrupt(int irq, void *__hci)
  {
        unsigned long   flags;
-@@ -1472,10 +1537,17 @@
+@@ -1472,10 +1537,17 @@ static irqreturn_t generic_interrupt(int
  
        spin_lock_irqsave(&musb->lock, flags);
  
  
        spin_lock_irqsave(&musb->lock, flags);
  
@@ -50862,7 +50578,7 @@ diff -ruN linux-2.6.30.10/drivers/usb/musb/musb_core.c linux-2.6.30.10-ubi/drive
        if (musb->int_usb || musb->int_tx || musb->int_rx)
                retval = musb_interrupt(musb);
  
        if (musb->int_usb || musb->int_tx || musb->int_rx)
                retval = musb_interrupt(musb);
  
-@@ -2210,6 +2282,10 @@
+@@ -2210,6 +2282,10 @@ static struct platform_driver musb_drive
  
  static int __init musb_init(void)
  {
  
  static int __init musb_init(void)
  {
@@ -50873,10 +50589,9 @@ diff -ruN linux-2.6.30.10/drivers/usb/musb/musb_core.c linux-2.6.30.10-ubi/drive
  #ifdef CONFIG_USB_MUSB_HDRC_HCD
        if (usb_disabled())
                return 0;
  #ifdef CONFIG_USB_MUSB_HDRC_HCD
        if (usb_disabled())
                return 0;
-diff -ruN linux-2.6.30.10/drivers/usb/musb/musb_core.h linux-2.6.30.10-ubi/drivers/usb/musb/musb_core.h
---- linux-2.6.30.10/drivers/usb/musb/musb_core.h       2009-12-04 08:00:07.000000000 +0200
-+++ linux-2.6.30.10-ubi/drivers/usb/musb/musb_core.h   2009-12-11 11:45:20.000000000 +0200
-@@ -326,7 +326,12 @@
+--- a/drivers/usb/musb/musb_core.h
++++ b/drivers/usb/musb/musb_core.h
+@@ -326,7 +326,12 @@ struct musb {
         * queue until it completes or NAKs too much; then we try the next
         * endpoint.
         */
         * queue until it completes or NAKs too much; then we try the next
         * endpoint.
         */
@@ -50889,10 +50604,9 @@ diff -ruN linux-2.6.30.10/drivers/usb/musb/musb_core.h linux-2.6.30.10-ubi/drive
  
        struct list_head        control;        /* of musb_qh */
        struct list_head        in_bulk;        /* of musb_qh */
  
        struct list_head        control;        /* of musb_qh */
        struct list_head        in_bulk;        /* of musb_qh */
-diff -ruN linux-2.6.30.10/drivers/usb/musb/musb_gadget.c linux-2.6.30.10-ubi/drivers/usb/musb/musb_gadget.c
---- linux-2.6.30.10/drivers/usb/musb/musb_gadget.c     2009-12-04 08:00:07.000000000 +0200
-+++ linux-2.6.30.10-ubi/drivers/usb/musb/musb_gadget.c 2009-12-11 11:45:20.000000000 +0200
-@@ -432,7 +432,7 @@
+--- a/drivers/usb/musb/musb_gadget.c
++++ b/drivers/usb/musb/musb_gadget.c
+@@ -432,7 +432,7 @@ void musb_g_tx(struct musb *musb, u8 epn
                 * probably rates reporting as a host error
                 */
                if (csr & MUSB_TXCSR_P_SENTSTALL) {
                 * probably rates reporting as a host error
                 */
                if (csr & MUSB_TXCSR_P_SENTSTALL) {
@@ -50901,7 +50615,7 @@ diff -ruN linux-2.6.30.10/drivers/usb/musb/musb_gadget.c linux-2.6.30.10-ubi/dri
                        csr &= ~MUSB_TXCSR_P_SENTSTALL;
                        musb_writew(epio, MUSB_TXCSR, csr);
                        if (dma_channel_status(dma) == MUSB_DMA_STATUS_BUSY) {
                        csr &= ~MUSB_TXCSR_P_SENTSTALL;
                        musb_writew(epio, MUSB_TXCSR, csr);
                        if (dma_channel_status(dma) == MUSB_DMA_STATUS_BUSY) {
-@@ -448,7 +448,7 @@
+@@ -448,7 +448,7 @@ void musb_g_tx(struct musb *musb, u8 epn
  
                if (csr & MUSB_TXCSR_P_UNDERRUN) {
                        /* we NAKed, no big deal ... little reason to care */
  
                if (csr & MUSB_TXCSR_P_UNDERRUN) {
                        /* we NAKed, no big deal ... little reason to care */
@@ -50910,7 +50624,7 @@ diff -ruN linux-2.6.30.10/drivers/usb/musb/musb_gadget.c linux-2.6.30.10-ubi/dri
                        csr &= ~(MUSB_TXCSR_P_UNDERRUN
                                        | MUSB_TXCSR_TXPKTRDY);
                        musb_writew(epio, MUSB_TXCSR, csr);
                        csr &= ~(MUSB_TXCSR_P_UNDERRUN
                                        | MUSB_TXCSR_TXPKTRDY);
                        musb_writew(epio, MUSB_TXCSR, csr);
-@@ -584,10 +584,16 @@
+@@ -584,10 +584,16 @@ static void rxstate(struct musb *musb, s
        u16                     csr = 0;
        const u8                epnum = req->epnum;
        struct usb_request      *request = &req->request;
        u16                     csr = 0;
        const u8                epnum = req->epnum;
        struct usb_request      *request = &req->request;
@@ -50930,7 +50644,7 @@ diff -ruN linux-2.6.30.10/drivers/usb/musb/musb_gadget.c linux-2.6.30.10-ubi/dri
  
        csr = musb_readw(epio, MUSB_RXCSR);
  
  
        csr = musb_readw(epio, MUSB_RXCSR);
  
-@@ -726,7 +732,7 @@
+@@ -726,7 +732,7 @@ static void rxstate(struct musb *musb, s
                         */
  
                        /* ack the read! */
                         */
  
                        /* ack the read! */
@@ -50939,7 +50653,7 @@ diff -ruN linux-2.6.30.10/drivers/usb/musb/musb_gadget.c linux-2.6.30.10-ubi/dri
                        csr &= ~MUSB_RXCSR_RXPKTRDY;
                        musb_writew(epio, MUSB_RXCSR, csr);
                }
                        csr &= ~MUSB_RXCSR_RXPKTRDY;
                        musb_writew(epio, MUSB_RXCSR, csr);
                }
-@@ -745,10 +751,15 @@
+@@ -745,10 +751,15 @@ void musb_g_rx(struct musb *musb, u8 epn
        u16                     csr;
        struct usb_request      *request;
        void __iomem            *mbase = musb->mregs;
        u16                     csr;
        struct usb_request      *request;
        void __iomem            *mbase = musb->mregs;
@@ -50956,7 +50670,7 @@ diff -ruN linux-2.6.30.10/drivers/usb/musb/musb_gadget.c linux-2.6.30.10-ubi/dri
        musb_ep_select(mbase, epnum);
  
        request = next_request(musb_ep);
        musb_ep_select(mbase, epnum);
  
        request = next_request(musb_ep);
-@@ -1769,7 +1780,9 @@
+@@ -1769,7 +1780,9 @@ int usb_gadget_register_driver(struct us
                        }
                }
        }
                        }
                }
        }
@@ -50967,10 +50681,9 @@ diff -ruN linux-2.6.30.10/drivers/usb/musb/musb_gadget.c linux-2.6.30.10-ubi/dri
        return retval;
  }
  EXPORT_SYMBOL(usb_gadget_register_driver);
        return retval;
  }
  EXPORT_SYMBOL(usb_gadget_register_driver);
-diff -ruN linux-2.6.30.10/drivers/usb/musb/musb_gadget_ep0.c linux-2.6.30.10-ubi/drivers/usb/musb/musb_gadget_ep0.c
---- linux-2.6.30.10/drivers/usb/musb/musb_gadget_ep0.c 2009-12-04 08:00:07.000000000 +0200
-+++ linux-2.6.30.10-ubi/drivers/usb/musb/musb_gadget_ep0.c     2009-12-11 11:45:20.000000000 +0200
-@@ -240,14 +240,14 @@
+--- a/drivers/usb/musb/musb_gadget_ep0.c
++++ b/drivers/usb/musb/musb_gadget_ep0.c
+@@ -240,14 +240,14 @@ __acquires(musb->lock)
                case USB_REQ_SET_ADDRESS:
                        /* change it after the status stage */
                        musb->set_address = true;
                case USB_REQ_SET_ADDRESS:
                        /* change it after the status stage */
                        musb->set_address = true;
@@ -50987,7 +50700,7 @@ diff -ruN linux-2.6.30.10/drivers/usb/musb/musb_gadget_ep0.c linux-2.6.30.10-ubi
                                                != USB_DEVICE_REMOTE_WAKEUP)
                                        break;
                                musb->may_wakeup = 0;
                                                != USB_DEVICE_REMOTE_WAKEUP)
                                        break;
                                musb->may_wakeup = 0;
-@@ -261,8 +261,8 @@
+@@ -261,8 +261,8 @@ __acquires(musb->lock)
  
                                if (num == 0
                                                || num >= MUSB_C_NUM_EPS
  
                                if (num == 0
                                                || num >= MUSB_C_NUM_EPS
@@ -50998,7 +50711,7 @@ diff -ruN linux-2.6.30.10/drivers/usb/musb/musb_gadget_ep0.c linux-2.6.30.10-ubi
                                        break;
  
                                if (ctrlrequest->wIndex & USB_DIR_IN)
                                        break;
  
                                if (ctrlrequest->wIndex & USB_DIR_IN)
-@@ -292,7 +292,7 @@
+@@ -292,7 +292,7 @@ __acquires(musb->lock)
                        switch (recip) {
                        case USB_RECIP_DEVICE:
                                handled = 1;
                        switch (recip) {
                        case USB_RECIP_DEVICE:
                                handled = 1;
@@ -51007,7 +50720,7 @@ diff -ruN linux-2.6.30.10/drivers/usb/musb/musb_gadget_ep0.c linux-2.6.30.10-ubi
                                case USB_DEVICE_REMOTE_WAKEUP:
                                        musb->may_wakeup = 1;
                                        break;
                                case USB_DEVICE_REMOTE_WAKEUP:
                                        musb->may_wakeup = 1;
                                        break;
-@@ -374,8 +374,8 @@
+@@ -374,8 +374,8 @@ stall:
  
                                if (epnum == 0
                                                || epnum >= MUSB_C_NUM_EPS
  
                                if (epnum == 0
                                                || epnum >= MUSB_C_NUM_EPS
@@ -51018,10 +50731,9 @@ diff -ruN linux-2.6.30.10/drivers/usb/musb/musb_gadget_ep0.c linux-2.6.30.10-ubi
                                        break;
  
                                ep = musb->endpoints + epnum;
                                        break;
  
                                ep = musb->endpoints + epnum;
-diff -ruN linux-2.6.30.10/drivers/usb/musb/musb_host.c linux-2.6.30.10-ubi/drivers/usb/musb/musb_host.c
---- linux-2.6.30.10/drivers/usb/musb/musb_host.c       2009-12-04 08:00:07.000000000 +0200
-+++ linux-2.6.30.10-ubi/drivers/usb/musb/musb_host.c   2009-12-11 11:45:20.000000000 +0200
-@@ -160,7 +160,11 @@
+--- a/drivers/usb/musb/musb_host.c
++++ b/drivers/usb/musb/musb_host.c
+@@ -160,7 +160,11 @@ static inline void musb_h_tx_start(struc
        /* NOTE: no locks here; caller should lock and select EP */
        if (ep->epnum) {
                txcsr = musb_readw(ep->regs, MUSB_TXCSR);
        /* NOTE: no locks here; caller should lock and select EP */
        if (ep->epnum) {
                txcsr = musb_readw(ep->regs, MUSB_TXCSR);
@@ -51033,7 +50745,7 @@ diff -ruN linux-2.6.30.10/drivers/usb/musb/musb_host.c linux-2.6.30.10-ubi/drive
                musb_writew(ep->regs, MUSB_TXCSR, txcsr);
        } else {
                txcsr = MUSB_CSR0_H_SETUPPKT | MUSB_CSR0_TXPKTRDY;
                musb_writew(ep->regs, MUSB_TXCSR, txcsr);
        } else {
                txcsr = MUSB_CSR0_H_SETUPPKT | MUSB_CSR0_TXPKTRDY;
-@@ -223,6 +227,8 @@
+@@ -223,6 +227,8 @@ musb_start_urb(struct musb *musb, int is
                break;
        default:                /* bulk, interrupt */
                /* actual_length may be nonzero on retry paths */
                break;
        default:                /* bulk, interrupt */
                /* actual_length may be nonzero on retry paths */
@@ -51042,7 +50754,7 @@ diff -ruN linux-2.6.30.10/drivers/usb/musb/musb_host.c linux-2.6.30.10-ubi/drive
                buf = urb->transfer_buffer + urb->actual_length;
                len = urb->transfer_buffer_length - urb->actual_length;
        }
                buf = urb->transfer_buffer + urb->actual_length;
                len = urb->transfer_buffer_length - urb->actual_length;
        }
-@@ -342,13 +348,13 @@
+@@ -342,13 +348,13 @@ musb_save_toggle(struct musb_hw_ep *ep, 
        if (!is_in) {
                csr = musb_readw(epio, MUSB_TXCSR);
                usb_settoggle(udev, qh->epnum, 1,
        if (!is_in) {
                csr = musb_readw(epio, MUSB_TXCSR);
                usb_settoggle(udev, qh->epnum, 1,
@@ -51060,7 +50772,7 @@ diff -ruN linux-2.6.30.10/drivers/usb/musb/musb_host.c linux-2.6.30.10-ubi/drive
        }
  }
  
        }
  }
  
-@@ -556,7 +562,11 @@
+@@ -556,7 +562,11 @@ musb_host_packet_rx(struct musb *musb, s
        musb_read_fifo(hw_ep, length, buf);
  
        csr = musb_readw(epio, MUSB_RXCSR);
        musb_read_fifo(hw_ep, length, buf);
  
        csr = musb_readw(epio, MUSB_RXCSR);
@@ -51072,7 +50784,7 @@ diff -ruN linux-2.6.30.10/drivers/usb/musb/musb_host.c linux-2.6.30.10-ubi/drive
        if (unlikely(do_flush))
                musb_h_flush_rxfifo(hw_ep, csr);
        else {
        if (unlikely(do_flush))
                musb_h_flush_rxfifo(hw_ep, csr);
        else {
-@@ -590,6 +600,7 @@
+@@ -590,6 +600,7 @@ musb_rx_reinit(struct musb *musb, struct
  
        /* if programmed for Tx, put it in RX mode */
        if (ep->is_shared_fifo) {
  
        /* if programmed for Tx, put it in RX mode */
        if (ep->is_shared_fifo) {
@@ -51080,7 +50792,7 @@ diff -ruN linux-2.6.30.10/drivers/usb/musb/musb_host.c linux-2.6.30.10-ubi/drive
                csr = musb_readw(ep->regs, MUSB_TXCSR);
                if (csr & MUSB_TXCSR_MODE) {
                        musb_h_tx_flush_fifo(ep);
                csr = musb_readw(ep->regs, MUSB_TXCSR);
                if (csr & MUSB_TXCSR_MODE) {
                        musb_h_tx_flush_fifo(ep);
-@@ -604,7 +615,18 @@
+@@ -604,7 +615,18 @@ musb_rx_reinit(struct musb *musb, struct
                 */
                if (csr & MUSB_TXCSR_DMAMODE)
                        musb_writew(ep->regs, MUSB_TXCSR, MUSB_TXCSR_DMAMODE);
                 */
                if (csr & MUSB_TXCSR_DMAMODE)
                        musb_writew(ep->regs, MUSB_TXCSR, MUSB_TXCSR_DMAMODE);
@@ -51099,7 +50811,7 @@ diff -ruN linux-2.6.30.10/drivers/usb/musb/musb_host.c linux-2.6.30.10-ubi/drive
  
        /* scrub all previous state, clearing toggle */
        } else {
  
        /* scrub all previous state, clearing toggle */
        } else {
-@@ -1138,8 +1160,18 @@
+@@ -1138,8 +1160,18 @@ void musb_host_tx(struct musb *musb, u8 
        void __iomem            *mbase = musb->mregs;
        struct dma_channel      *dma;
  
        void __iomem            *mbase = musb->mregs;
        struct dma_channel      *dma;
  
@@ -51118,7 +50830,7 @@ diff -ruN linux-2.6.30.10/drivers/usb/musb/musb_host.c linux-2.6.30.10-ubi/drive
        musb_ep_select(mbase, epnum);
        tx_csr = musb_readw(epio, MUSB_TXCSR);
  
        musb_ep_select(mbase, epnum);
        tx_csr = musb_readw(epio, MUSB_TXCSR);
  
-@@ -1180,9 +1212,14 @@
+@@ -1180,9 +1212,14 @@ void musb_host_tx(struct musb *musb, u8 
                 * we have a candidate... NAKing is *NOT* an error
                 */
                musb_ep_select(mbase, epnum);
                 * we have a candidate... NAKing is *NOT* an error
                 */
                musb_ep_select(mbase, epnum);
@@ -51133,7 +50845,7 @@ diff -ruN linux-2.6.30.10/drivers/usb/musb/musb_host.c linux-2.6.30.10-ubi/drive
                return;
        }
  
                return;
        }
  
-@@ -1353,8 +1390,14 @@
+@@ -1353,8 +1390,14 @@ void musb_host_tx(struct musb *musb, u8 
        qh->segsize = length;
  
        musb_ep_select(mbase, epnum);
        qh->segsize = length;
  
        musb_ep_select(mbase, epnum);
@@ -51149,7 +50861,7 @@ diff -ruN linux-2.6.30.10/drivers/usb/musb/musb_host.c linux-2.6.30.10-ubi/drive
  }
  
  
  }
  
  
-@@ -1414,7 +1457,11 @@
+@@ -1414,7 +1457,11 @@ static void musb_bulk_rx_nak_timeout(str
  
        /* clear nak timeout bit */
        rx_csr = musb_readw(epio, MUSB_RXCSR);
  
        /* clear nak timeout bit */
        rx_csr = musb_readw(epio, MUSB_RXCSR);
@@ -51161,7 +50873,7 @@ diff -ruN linux-2.6.30.10/drivers/usb/musb/musb_host.c linux-2.6.30.10-ubi/drive
        rx_csr &= ~MUSB_RXCSR_DATAERROR;
        musb_writew(epio, MUSB_RXCSR, rx_csr);
  
        rx_csr &= ~MUSB_RXCSR_DATAERROR;
        musb_writew(epio, MUSB_RXCSR, rx_csr);
  
-@@ -1483,6 +1530,13 @@
+@@ -1483,6 +1530,13 @@ void musb_host_rx(struct musb *musb, u8 
  
        pipe = urb->pipe;
  
  
        pipe = urb->pipe;
  
@@ -51175,7 +50887,7 @@ diff -ruN linux-2.6.30.10/drivers/usb/musb/musb_host.c linux-2.6.30.10-ubi/drive
        DBG(5, "<== hw %d rxcsr %04x, urb actual %d (+dma %zu)\n",
                epnum, rx_csr, urb->actual_length,
                dma ? dma->actual_len : 0);
        DBG(5, "<== hw %d rxcsr %04x, urb actual %d (+dma %zu)\n",
                epnum, rx_csr, urb->actual_length,
                dma ? dma->actual_len : 0);
-@@ -1521,8 +1575,15 @@
+@@ -1521,8 +1575,15 @@ void musb_host_rx(struct musb *musb, u8 
                                return;
                        }
                        musb_ep_select(mbase, epnum);
                                return;
                        }
                        musb_ep_select(mbase, epnum);
@@ -51191,7 +50903,7 @@ diff -ruN linux-2.6.30.10/drivers/usb/musb/musb_host.c linux-2.6.30.10-ubi/drive
                        musb_writew(epio, MUSB_RXCSR, rx_csr);
  
                        goto finish;
                        musb_writew(epio, MUSB_RXCSR, rx_csr);
  
                        goto finish;
-@@ -1579,8 +1640,13 @@
+@@ -1579,8 +1640,13 @@ void musb_host_rx(struct musb *musb, u8 
                rx_csr &= ~MUSB_RXCSR_H_REQPKT;
  
                musb_ep_select(mbase, epnum);
                rx_csr &= ~MUSB_RXCSR_H_REQPKT;
  
                musb_ep_select(mbase, epnum);
@@ -51205,7 +50917,7 @@ diff -ruN linux-2.6.30.10/drivers/usb/musb/musb_host.c linux-2.6.30.10-ubi/drive
        }
  #endif
        if (dma && (rx_csr & MUSB_RXCSR_DMAENAB)) {
        }
  #endif
        if (dma && (rx_csr & MUSB_RXCSR_DMAENAB)) {
-@@ -1610,7 +1676,7 @@
+@@ -1610,7 +1676,7 @@ void musb_host_rx(struct musb *musb, u8 
                        else
                                done = false;
  
                        else
                                done = false;
  
@@ -51214,7 +50926,7 @@ diff -ruN linux-2.6.30.10/drivers/usb/musb/musb_host.c linux-2.6.30.10-ubi/drive
                /* done if urb buffer is full or short packet is recd */
                done = (urb->actual_length + xfer_len >=
                                urb->transfer_buffer_length
                /* done if urb buffer is full or short packet is recd */
                done = (urb->actual_length + xfer_len >=
                                urb->transfer_buffer_length
-@@ -1823,7 +1889,11 @@
+@@ -1823,7 +1889,11 @@ static int musb_schedule(
                } else  if (hw_ep->out_qh != NULL)
                        continue;
  
                } else  if (hw_ep->out_qh != NULL)
                        continue;
  
@@ -51226,7 +50938,7 @@ diff -ruN linux-2.6.30.10/drivers/usb/musb/musb_host.c linux-2.6.30.10-ubi/drive
                        continue;
  
                if (is_in)
                        continue;
  
                if (is_in)
-@@ -1836,7 +1906,14 @@
+@@ -1836,7 +1906,14 @@ static int musb_schedule(
                        best_end = epnum;
                }
        }
                        best_end = epnum;
                }
        }
@@ -51241,7 +50953,7 @@ diff -ruN linux-2.6.30.10/drivers/usb/musb/musb_host.c linux-2.6.30.10-ubi/drive
        if (best_end < 0 && qh->type == USB_ENDPOINT_XFER_BULK) {
                hw_ep = musb->bulk_ep;
                if (is_in)
        if (best_end < 0 && qh->type == USB_ENDPOINT_XFER_BULK) {
                hw_ep = musb->bulk_ep;
                if (is_in)
-@@ -1858,6 +1935,22 @@
+@@ -1858,6 +1935,22 @@ static int musb_schedule(
        } else if (best_end < 0) {
                return -ENOSPC;
        }
        } else if (best_end < 0) {
                return -ENOSPC;
        }
@@ -51264,7 +50976,7 @@ diff -ruN linux-2.6.30.10/drivers/usb/musb/musb_host.c linux-2.6.30.10-ubi/drive
  
        idle = 1;
        qh->mux = 0;
  
        idle = 1;
        qh->mux = 0;
-@@ -1869,6 +1962,13 @@
+@@ -1869,6 +1962,13 @@ success:
                list_add_tail(&qh->ring, head);
                qh->mux = 1;
        }
                list_add_tail(&qh->ring, head);
                qh->mux = 1;
        }
@@ -51278,7 +50990,7 @@ diff -ruN linux-2.6.30.10/drivers/usb/musb/musb_host.c linux-2.6.30.10-ubi/drive
        qh->hw_ep = hw_ep;
        qh->hep->hcpriv = qh;
        if (idle)
        qh->hw_ep = hw_ep;
        qh->hep->hcpriv = qh;
        if (idle)
-@@ -1975,6 +2075,15 @@
+@@ -1975,6 +2075,15 @@ static int musb_urb_enqueue(
                /* ISO always uses logarithmic encoding */
                interval = min_t(u8, epd->bInterval, 16);
                break;
                /* ISO always uses logarithmic encoding */
                interval = min_t(u8, epd->bInterval, 16);
                break;
@@ -51294,10 +51006,9 @@ diff -ruN linux-2.6.30.10/drivers/usb/musb/musb_host.c linux-2.6.30.10-ubi/drive
        default:
                /* REVISIT we actually want to use NAK limits, hinting to the
                 * transfer scheduling logic to try some other qh, e.g. try
        default:
                /* REVISIT we actually want to use NAK limits, hinting to the
                 * transfer scheduling logic to try some other qh, e.g. try
-diff -ruN linux-2.6.30.10/drivers/usb/musb/musb_io.h linux-2.6.30.10-ubi/drivers/usb/musb/musb_io.h
---- linux-2.6.30.10/drivers/usb/musb/musb_io.h 2009-12-04 08:00:07.000000000 +0200
-+++ linux-2.6.30.10-ubi/drivers/usb/musb/musb_io.h     2009-12-11 11:45:20.000000000 +0200
-@@ -58,6 +58,7 @@
+--- a/drivers/usb/musb/musb_io.h
++++ b/drivers/usb/musb/musb_io.h
+@@ -58,6 +58,7 @@ static inline void writesb(const void __
  
  #ifndef CONFIG_BLACKFIN
  
  
  #ifndef CONFIG_BLACKFIN
  
@@ -51305,7 +51016,7 @@ diff -ruN linux-2.6.30.10/drivers/usb/musb/musb_io.h linux-2.6.30.10-ubi/drivers
  /* NOTE:  these offsets are all in bytes */
  
  static inline u16 musb_readw(const void __iomem *addr, unsigned offset)
  /* NOTE:  these offsets are all in bytes */
  
  static inline u16 musb_readw(const void __iomem *addr, unsigned offset)
-@@ -72,7 +73,37 @@
+@@ -72,7 +73,37 @@ static inline void musb_writew(void __io
  
  static inline void musb_writel(void __iomem *addr, unsigned offset, u32 data)
        { __raw_writel(data, addr + offset); }
  
  static inline void musb_writel(void __iomem *addr, unsigned offset, u32 data)
        { __raw_writel(data, addr + offset); }
@@ -51343,7 +51054,7 @@ diff -ruN linux-2.6.30.10/drivers/usb/musb/musb_io.h linux-2.6.30.10-ubi/drivers
  
  #ifdef CONFIG_USB_TUSB6010
  
  
  #ifdef CONFIG_USB_TUSB6010
  
-@@ -106,7 +137,7 @@
+@@ -106,7 +137,7 @@ static inline void musb_writeb(void __io
        __raw_writew(tmp, addr + (offset & ~1));
  }
  
        __raw_writew(tmp, addr + (offset & ~1));
  }
  
@@ -51352,9 +51063,8 @@ diff -ruN linux-2.6.30.10/drivers/usb/musb/musb_io.h linux-2.6.30.10-ubi/drivers
  
  static inline u8 musb_readb(const void __iomem *addr, unsigned offset)
        { return __raw_readb(addr + offset); }
  
  static inline u8 musb_readb(const void __iomem *addr, unsigned offset)
        { return __raw_readb(addr + offset); }
-diff -ruN linux-2.6.30.10/drivers/usb/musb/musb_regs.h linux-2.6.30.10-ubi/drivers/usb/musb/musb_regs.h
---- linux-2.6.30.10/drivers/usb/musb/musb_regs.h       2009-12-04 08:00:07.000000000 +0200
-+++ linux-2.6.30.10-ubi/drivers/usb/musb/musb_regs.h   2009-12-11 11:45:20.000000000 +0200
+--- a/drivers/usb/musb/musb_regs.h
++++ b/drivers/usb/musb/musb_regs.h
 @@ -167,6 +167,7 @@
        (MUSB_TXCSR_H_NAKTIMEOUT | MUSB_TXCSR_H_RXSTALL \
        | MUSB_TXCSR_H_ERROR | MUSB_TXCSR_FIFONOTEMPTY)
 @@ -167,6 +167,7 @@
        (MUSB_TXCSR_H_NAKTIMEOUT | MUSB_TXCSR_H_RXSTALL \
        | MUSB_TXCSR_H_ERROR | MUSB_TXCSR_FIFONOTEMPTY)
@@ -51363,9 +51073,8 @@ diff -ruN linux-2.6.30.10/drivers/usb/musb/musb_regs.h linux-2.6.30.10-ubi/drive
  /* RXCSR in Peripheral and Host mode */
  #define MUSB_RXCSR_AUTOCLEAR          0x8000
  #define MUSB_RXCSR_DMAENAB            0x2000
  /* RXCSR in Peripheral and Host mode */
  #define MUSB_RXCSR_AUTOCLEAR          0x8000
  #define MUSB_RXCSR_DMAENAB            0x2000
-diff -ruN linux-2.6.30.10/drivers/usb/musb/ubi32_usb.c linux-2.6.30.10-ubi/drivers/usb/musb/ubi32_usb.c
---- linux-2.6.30.10/drivers/usb/musb/ubi32_usb.c       1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.30.10-ubi/drivers/usb/musb/ubi32_usb.c   2009-12-11 11:45:20.000000000 +0200
+--- /dev/null
++++ b/drivers/usb/musb/ubi32_usb.c
 @@ -0,0 +1,156 @@
 +/*
 + * drivers/usb/musb/ubi32_usb.c
 @@ -0,0 +1,156 @@
 +/*
 + * drivers/usb/musb/ubi32_usb.c
@@ -51523,10 +51232,9 @@ diff -ruN linux-2.6.30.10/drivers/usb/musb/ubi32_usb.c linux-2.6.30.10-ubi/drive
 +      musb_platform_suspend(musb);
 +      return 0;
 +}
 +      musb_platform_suspend(musb);
 +      return 0;
 +}
-diff -ruN linux-2.6.30.10/drivers/video/backlight/Kconfig linux-2.6.30.10-ubi/drivers/video/backlight/Kconfig
---- linux-2.6.30.10/drivers/video/backlight/Kconfig    2009-12-04 08:00:07.000000000 +0200
-+++ linux-2.6.30.10-ubi/drivers/video/backlight/Kconfig        2009-12-11 11:45:20.000000000 +0200
-@@ -93,6 +93,63 @@
+--- a/drivers/video/backlight/Kconfig
++++ b/drivers/video/backlight/Kconfig
+@@ -93,6 +93,63 @@ config LCD_HP700
          If you have an HP Jornada 700 series handheld (710/720/728)
          say Y to enable LCD control driver.
  
          If you have an HP Jornada 700 series handheld (710/720/728)
          say Y to enable LCD control driver.
  
@@ -51590,7 +51298,7 @@ diff -ruN linux-2.6.30.10/drivers/video/backlight/Kconfig linux-2.6.30.10-ubi/dr
  #
  # Backlight
  #
  #
  # Backlight
  #
-@@ -229,3 +286,11 @@
+@@ -229,3 +286,11 @@ config BACKLIGHT_SAHARA
        help
          If you have a Tabletkiosk Sahara Touch-iT, say y to enable the
          backlight driver.
        help
          If you have a Tabletkiosk Sahara Touch-iT, say y to enable the
          backlight driver.
@@ -51602,10 +51310,9 @@ diff -ruN linux-2.6.30.10/drivers/video/backlight/Kconfig linux-2.6.30.10-ubi/dr
 +      help
 +        If you have a Ubicom32 based system with a backlight say Y to enable the
 +        backlight driver.
 +      help
 +        If you have a Ubicom32 based system with a backlight say Y to enable the
 +        backlight driver.
-diff -ruN linux-2.6.30.10/drivers/video/backlight/Makefile linux-2.6.30.10-ubi/drivers/video/backlight/Makefile
---- linux-2.6.30.10/drivers/video/backlight/Makefile   2009-12-04 08:00:07.000000000 +0200
-+++ linux-2.6.30.10-ubi/drivers/video/backlight/Makefile       2009-12-11 11:45:20.000000000 +0200
-@@ -9,6 +9,9 @@
+--- a/drivers/video/backlight/Makefile
++++ b/drivers/video/backlight/Makefile
+@@ -9,6 +9,9 @@ obj-$(CONFIG_LCD_PLATFORM)        += platfor
  obj-$(CONFIG_LCD_VGG2432A4)      += vgg2432a4.o
  obj-$(CONFIG_LCD_TDO24M)         += tdo24m.o
  obj-$(CONFIG_LCD_TOSA)                   += tosa_lcd.o
  obj-$(CONFIG_LCD_VGG2432A4)      += vgg2432a4.o
  obj-$(CONFIG_LCD_TDO24M)         += tdo24m.o
  obj-$(CONFIG_LCD_TOSA)                   += tosa_lcd.o
@@ -51615,15 +51322,14 @@ diff -ruN linux-2.6.30.10/drivers/video/backlight/Makefile linux-2.6.30.10-ubi/d
  
  obj-$(CONFIG_BACKLIGHT_CLASS_DEVICE) += backlight.o
  obj-$(CONFIG_BACKLIGHT_ATMEL_PWM)    += atmel-pwm-bl.o
  
  obj-$(CONFIG_BACKLIGHT_CLASS_DEVICE) += backlight.o
  obj-$(CONFIG_BACKLIGHT_ATMEL_PWM)    += atmel-pwm-bl.o
-@@ -24,4 +27,4 @@
+@@ -24,4 +27,4 @@ obj-$(CONFIG_BACKLIGHT_DA903X)       += da903x
  obj-$(CONFIG_BACKLIGHT_MBP_NVIDIA) += mbp_nvidia_bl.o
  obj-$(CONFIG_BACKLIGHT_TOSA)  += tosa_bl.o
  obj-$(CONFIG_BACKLIGHT_SAHARA)        += kb3886_bl.o
 -
 +obj-$(CONFIG_BACKLIGHT_UBICOM32) += ubicom32bl.o
  obj-$(CONFIG_BACKLIGHT_MBP_NVIDIA) += mbp_nvidia_bl.o
  obj-$(CONFIG_BACKLIGHT_TOSA)  += tosa_bl.o
  obj-$(CONFIG_BACKLIGHT_SAHARA)        += kb3886_bl.o
 -
 +obj-$(CONFIG_BACKLIGHT_UBICOM32) += ubicom32bl.o
-diff -ruN linux-2.6.30.10/drivers/video/backlight/ubicom32bl.c linux-2.6.30.10-ubi/drivers/video/backlight/ubicom32bl.c
---- linux-2.6.30.10/drivers/video/backlight/ubicom32bl.c       1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.30.10-ubi/drivers/video/backlight/ubicom32bl.c   2009-12-11 11:45:20.000000000 +0200
+--- /dev/null
++++ b/drivers/video/backlight/ubicom32bl.c
 @@ -0,0 +1,399 @@
 +/*
 + * drivers/video/backlight/ubicom32bl.c
 @@ -0,0 +1,399 @@
 +/*
 + * drivers/video/backlight/ubicom32bl.c
@@ -52024,9 +51730,8 @@ diff -ruN linux-2.6.30.10/drivers/video/backlight/ubicom32bl.c linux-2.6.30.10-u
 +MODULE_AUTHOR("Patrick Tjin <@ubicom.com>");
 +MODULE_DESCRIPTION("Ubicom32 backlight driver");
 +MODULE_LICENSE("GPL");
 +MODULE_AUTHOR("Patrick Tjin <@ubicom.com>");
 +MODULE_DESCRIPTION("Ubicom32 backlight driver");
 +MODULE_LICENSE("GPL");
-diff -ruN linux-2.6.30.10/drivers/video/backlight/ubicom32lcd.c linux-2.6.30.10-ubi/drivers/video/backlight/ubicom32lcd.c
---- linux-2.6.30.10/drivers/video/backlight/ubicom32lcd.c      1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.30.10-ubi/drivers/video/backlight/ubicom32lcd.c  2009-12-11 11:45:20.000000000 +0200
+--- /dev/null
++++ b/drivers/video/backlight/ubicom32lcd.c
 @@ -0,0 +1,372 @@
 +/*
 + * drivers/video/ubicom32lcd.c
 @@ -0,0 +1,372 @@
 +/*
 + * drivers/video/ubicom32lcd.c
@@ -52400,9 +52105,8 @@ diff -ruN linux-2.6.30.10/drivers/video/backlight/ubicom32lcd.c linux-2.6.30.10-
 +MODULE_AUTHOR("Patrick Tjin <@ubicom.com>");
 +MODULE_DESCRIPTION("Ubicom32 LCD driver");
 +MODULE_LICENSE("GPL");
 +MODULE_AUTHOR("Patrick Tjin <@ubicom.com>");
 +MODULE_DESCRIPTION("Ubicom32 LCD driver");
 +MODULE_LICENSE("GPL");
-diff -ruN linux-2.6.30.10/drivers/video/backlight/ubicom32lcd.h linux-2.6.30.10-ubi/drivers/video/backlight/ubicom32lcd.h
---- linux-2.6.30.10/drivers/video/backlight/ubicom32lcd.h      1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.30.10-ubi/drivers/video/backlight/ubicom32lcd.h  2009-12-11 11:45:20.000000000 +0200
+--- /dev/null
++++ b/drivers/video/backlight/ubicom32lcd.h
 @@ -0,0 +1,546 @@
 +/*
 + * ubicom32lcd.h
 @@ -0,0 +1,546 @@
 +/*
 + * ubicom32lcd.h
@@ -52950,9 +52654,8 @@ diff -ruN linux-2.6.30.10/drivers/video/backlight/ubicom32lcd.h linux-2.6.30.10-
 +};
 +
 +#endif
 +};
 +
 +#endif
-diff -ruN linux-2.6.30.10/drivers/video/backlight/ubicom32lcdpower.c linux-2.6.30.10-ubi/drivers/video/backlight/ubicom32lcdpower.c
---- linux-2.6.30.10/drivers/video/backlight/ubicom32lcdpower.c 1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.30.10-ubi/drivers/video/backlight/ubicom32lcdpower.c     2009-12-11 11:45:20.000000000 +0200
+--- /dev/null
++++ b/drivers/video/backlight/ubicom32lcdpower.c
 @@ -0,0 +1,194 @@
 +/*
 + * drivers/video/backlight/ubicom32lcdpowerpower.c
 @@ -0,0 +1,194 @@
 +/*
 + * drivers/video/backlight/ubicom32lcdpowerpower.c
@@ -53148,10 +52851,9 @@ diff -ruN linux-2.6.30.10/drivers/video/backlight/ubicom32lcdpower.c linux-2.6.3
 +MODULE_AUTHOR("Patrick Tjin <@ubicom.com>");
 +MODULE_DESCRIPTION("Ubicom32 lcd power driver");
 +MODULE_LICENSE("GPL");
 +MODULE_AUTHOR("Patrick Tjin <@ubicom.com>");
 +MODULE_DESCRIPTION("Ubicom32 lcd power driver");
 +MODULE_LICENSE("GPL");
-diff -ruN linux-2.6.30.10/drivers/video/Kconfig linux-2.6.30.10-ubi/drivers/video/Kconfig
---- linux-2.6.30.10/drivers/video/Kconfig      2009-12-04 08:00:07.000000000 +0200
-+++ linux-2.6.30.10-ubi/drivers/video/Kconfig  2009-12-11 11:45:20.000000000 +0200
-@@ -609,6 +609,50 @@
+--- a/drivers/video/Kconfig
++++ b/drivers/video/Kconfig
+@@ -609,6 +609,50 @@ config FB_BFIN_T350MCQB
         This display is a QVGA 320x240 24-bit RGB display interfaced by an 8-bit wide PPI
         It uses PPI[0..7] PPI_FS1, PPI_FS2 and PPI_CLK.
  
         This display is a QVGA 320x240 24-bit RGB display interfaced by an 8-bit wide PPI
         It uses PPI[0..7] PPI_FS1, PPI_FS2 and PPI_CLK.
  
@@ -53202,10 +52904,9 @@ diff -ruN linux-2.6.30.10/drivers/video/Kconfig linux-2.6.30.10-ubi/drivers/vide
  
  config FB_STI
        tristate "HP STI frame buffer device support"
  
  config FB_STI
        tristate "HP STI frame buffer device support"
-diff -ruN linux-2.6.30.10/drivers/video/Makefile linux-2.6.30.10-ubi/drivers/video/Makefile
---- linux-2.6.30.10/drivers/video/Makefile     2009-12-04 08:00:07.000000000 +0200
-+++ linux-2.6.30.10-ubi/drivers/video/Makefile 2009-12-11 11:45:20.000000000 +0200
-@@ -136,6 +136,10 @@
+--- a/drivers/video/Makefile
++++ b/drivers/video/Makefile
+@@ -136,6 +136,10 @@ obj-$(CONFIG_FB_BF54X_LQ043)        += bf54x-
  obj-$(CONFIG_FB_BFIN_T350MCQB)          += bfin-t350mcqb-fb.o
  obj-$(CONFIG_FB_MX3)            += mx3fb.o
  
  obj-$(CONFIG_FB_BFIN_T350MCQB)          += bfin-t350mcqb-fb.o
  obj-$(CONFIG_FB_MX3)            += mx3fb.o
  
@@ -53216,9 +52917,8 @@ diff -ruN linux-2.6.30.10/drivers/video/Makefile linux-2.6.30.10-ubi/drivers/vid
  # the test framebuffer is last
  obj-$(CONFIG_FB_VIRTUAL)          += vfb.o
  
  # the test framebuffer is last
  obj-$(CONFIG_FB_VIRTUAL)          += vfb.o
  
-diff -ruN linux-2.6.30.10/drivers/video/ubicom32fb.c linux-2.6.30.10-ubi/drivers/video/ubicom32fb.c
---- linux-2.6.30.10/drivers/video/ubicom32fb.c 1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.30.10-ubi/drivers/video/ubicom32fb.c     2009-12-11 11:45:21.000000000 +0200
+--- /dev/null
++++ b/drivers/video/ubicom32fb.c
 @@ -0,0 +1,779 @@
 +/*
 + * drivers/video/ubicom32fb.c
 @@ -0,0 +1,779 @@
 +/*
 + * drivers/video/ubicom32fb.c
@@ -53999,9 +53699,8 @@ diff -ruN linux-2.6.30.10/drivers/video/ubicom32fb.c linux-2.6.30.10-ubi/drivers
 +MODULE_LICENSE("GPL");
 +MODULE_AUTHOR("Patrick Tjin <@ubicom.com>");
 +MODULE_DESCRIPTION(DRIVER_DESCRIPTION);
 +MODULE_LICENSE("GPL");
 +MODULE_AUTHOR("Patrick Tjin <@ubicom.com>");
 +MODULE_DESCRIPTION(DRIVER_DESCRIPTION);
-diff -ruN linux-2.6.30.10/drivers/video/ubicom32plio80.c linux-2.6.30.10-ubi/drivers/video/ubicom32plio80.c
---- linux-2.6.30.10/drivers/video/ubicom32plio80.c     1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.30.10-ubi/drivers/video/ubicom32plio80.c 2009-12-11 11:45:21.000000000 +0200
+--- /dev/null
++++ b/drivers/video/ubicom32plio80.c
 @@ -0,0 +1,780 @@
 +/*
 + * drivers/video/ubicom32plio80.c
 @@ -0,0 +1,780 @@
 +/*
 + * drivers/video/ubicom32plio80.c
@@ -54783,9 +54482,8 @@ diff -ruN linux-2.6.30.10/drivers/video/ubicom32plio80.c linux-2.6.30.10-ubi/dri
 +MODULE_LICENSE("GPL");
 +MODULE_AUTHOR("Patrick Tjin <@ubicom.com>");
 +MODULE_DESCRIPTION(DRIVER_DESCRIPTION);
 +MODULE_LICENSE("GPL");
 +MODULE_AUTHOR("Patrick Tjin <@ubicom.com>");
 +MODULE_DESCRIPTION(DRIVER_DESCRIPTION);
-diff -ruN linux-2.6.30.10/drivers/video/ubicom32vfb.c linux-2.6.30.10-ubi/drivers/video/ubicom32vfb.c
---- linux-2.6.30.10/drivers/video/ubicom32vfb.c        1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.30.10-ubi/drivers/video/ubicom32vfb.c    2009-12-11 11:45:21.000000000 +0200
+--- /dev/null
++++ b/drivers/video/ubicom32vfb.c
 @@ -0,0 +1,603 @@
 +/*
 + * drivers/video/ubicom32vfb.c
 @@ -0,0 +1,603 @@
 +/*
 + * drivers/video/ubicom32vfb.c
@@ -55390,10 +55088,9 @@ diff -ruN linux-2.6.30.10/drivers/video/ubicom32vfb.c linux-2.6.30.10-ubi/driver
 +MODULE_LICENSE("GPL");
 +MODULE_AUTHOR("Patrick Tjin <@ubicom.com>");
 +MODULE_DESCRIPTION(DRIVER_DESCRIPTION);
 +MODULE_LICENSE("GPL");
 +MODULE_AUTHOR("Patrick Tjin <@ubicom.com>");
 +MODULE_DESCRIPTION(DRIVER_DESCRIPTION);
-diff -ruN linux-2.6.30.10/drivers/watchdog/Kconfig linux-2.6.30.10-ubi/drivers/watchdog/Kconfig
---- linux-2.6.30.10/drivers/watchdog/Kconfig   2009-12-04 08:00:07.000000000 +0200
-+++ linux-2.6.30.10-ubi/drivers/watchdog/Kconfig       2009-12-11 11:45:21.000000000 +0200
-@@ -887,6 +887,19 @@
+--- a/drivers/watchdog/Kconfig
++++ b/drivers/watchdog/Kconfig
+@@ -887,6 +887,19 @@ config WATCHDOG_RIO
          machines.  The watchdog timeout period is normally one minute but
          can be changed with a boot-time parameter.
  
          machines.  The watchdog timeout period is normally one minute but
          can be changed with a boot-time parameter.
  
@@ -55413,10 +55110,9 @@ diff -ruN linux-2.6.30.10/drivers/watchdog/Kconfig linux-2.6.30.10-ubi/drivers/w
  # XTENSA Architecture
  
  #
  # XTENSA Architecture
  
  #
-diff -ruN linux-2.6.30.10/drivers/watchdog/Makefile linux-2.6.30.10-ubi/drivers/watchdog/Makefile
---- linux-2.6.30.10/drivers/watchdog/Makefile  2009-12-04 08:00:07.000000000 +0200
-+++ linux-2.6.30.10-ubi/drivers/watchdog/Makefile      2009-12-11 11:45:21.000000000 +0200
-@@ -131,6 +131,9 @@
+--- a/drivers/watchdog/Makefile
++++ b/drivers/watchdog/Makefile
+@@ -131,6 +131,9 @@ obj-$(CONFIG_SH_WDT) += shwdt.o
  obj-$(CONFIG_WATCHDOG_RIO)            += riowd.o
  obj-$(CONFIG_WATCHDOG_CP1XXX)         += cpwd.o
  
  obj-$(CONFIG_WATCHDOG_RIO)            += riowd.o
  obj-$(CONFIG_WATCHDOG_CP1XXX)         += cpwd.o
  
@@ -55426,9 +55122,8 @@ diff -ruN linux-2.6.30.10/drivers/watchdog/Makefile linux-2.6.30.10-ubi/drivers/
  # XTENSA Architecture
  
  # Architecture Independant
  # XTENSA Architecture
  
  # Architecture Independant
-diff -ruN linux-2.6.30.10/drivers/watchdog/ubi32_wdt.c linux-2.6.30.10-ubi/drivers/watchdog/ubi32_wdt.c
---- linux-2.6.30.10/drivers/watchdog/ubi32_wdt.c       1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.30.10-ubi/drivers/watchdog/ubi32_wdt.c   2009-12-11 11:45:21.000000000 +0200
+--- /dev/null
++++ b/drivers/watchdog/ubi32_wdt.c
 @@ -0,0 +1,630 @@
 +/*
 + * drivers/watchdog/ubi32_wdt.c
 @@ -0,0 +1,630 @@
 +/*
 + * drivers/watchdog/ubi32_wdt.c
@@ -56060,9 +55755,8 @@ diff -ruN linux-2.6.30.10/drivers/watchdog/ubi32_wdt.c linux-2.6.30.10-ubi/drive
 +MODULE_PARM_DESC(nowayout,
 +      "Watchdog cannot be stopped once started (default="
 +              __MODULE_STRING(WATCHDOG_NOWAYOUT) ")");
 +MODULE_PARM_DESC(nowayout,
 +      "Watchdog cannot be stopped once started (default="
 +              __MODULE_STRING(WATCHDOG_NOWAYOUT) ")");
-diff -ruN linux-2.6.30.10/fs/binfmt_flat.c linux-2.6.30.10-ubi/fs/binfmt_flat.c
---- linux-2.6.30.10/fs/binfmt_flat.c   2009-12-04 08:00:07.000000000 +0200
-+++ linux-2.6.30.10-ubi/fs/binfmt_flat.c       2009-12-11 11:45:21.000000000 +0200
+--- a/fs/binfmt_flat.c
++++ b/fs/binfmt_flat.c
 @@ -67,6 +67,11 @@
  #define FLAT_DATA_ALIGN       (sizeof(void *))
  #endif
 @@ -67,6 +67,11 @@
  #define FLAT_DATA_ALIGN       (sizeof(void *))
  #endif
@@ -56075,7 +55769,7 @@ diff -ruN linux-2.6.30.10/fs/binfmt_flat.c linux-2.6.30.10-ubi/fs/binfmt_flat.c
  #define RELOC_FAILED 0xff00ff01               /* Relocation incorrect somewhere */
  #define UNLOADED_LIB 0x7ff000ff               /* Placeholder for unused library */
  
  #define RELOC_FAILED 0xff00ff01               /* Relocation incorrect somewhere */
  #define UNLOADED_LIB 0x7ff000ff               /* Placeholder for unused library */
  
-@@ -436,6 +441,7 @@
+@@ -436,6 +441,7 @@ static int load_flat_file(struct linux_b
        loff_t fpos;
        unsigned long start_code, end_code;
        int ret;
        loff_t fpos;
        unsigned long start_code, end_code;
        int ret;
@@ -56083,7 +55777,7 @@ diff -ruN linux-2.6.30.10/fs/binfmt_flat.c linux-2.6.30.10-ubi/fs/binfmt_flat.c
  
        hdr = ((struct flat_hdr *) bprm->buf);          /* exec-header */
        inode = bprm->file->f_path.dentry->d_inode;
  
        hdr = ((struct flat_hdr *) bprm->buf);          /* exec-header */
        inode = bprm->file->f_path.dentry->d_inode;
-@@ -521,6 +527,7 @@
+@@ -521,6 +527,7 @@ static int load_flat_file(struct linux_b
  
                /* OK, This is the point of no return */
                set_personality(PER_LINUX_32BIT);
  
                /* OK, This is the point of no return */
                set_personality(PER_LINUX_32BIT);
@@ -56091,7 +55785,7 @@ diff -ruN linux-2.6.30.10/fs/binfmt_flat.c linux-2.6.30.10-ubi/fs/binfmt_flat.c
        }
  
        /*
        }
  
        /*
-@@ -535,6 +542,12 @@
+@@ -535,6 +542,12 @@ static int load_flat_file(struct linux_b
         * it all together.
         */
        if ((flags & (FLAT_FLAG_RAM|FLAT_FLAG_GZIP)) == 0) {
         * it all together.
         */
        if ((flags & (FLAT_FLAG_RAM|FLAT_FLAG_GZIP)) == 0) {
@@ -56104,7 +55798,7 @@ diff -ruN linux-2.6.30.10/fs/binfmt_flat.c linux-2.6.30.10-ubi/fs/binfmt_flat.c
                /*
                 * this should give us a ROM ptr,  but if it doesn't we don't
                 * really care
                /*
                 * this should give us a ROM ptr,  but if it doesn't we don't
                 * really care
-@@ -553,7 +566,7 @@
+@@ -553,7 +566,7 @@ static int load_flat_file(struct linux_b
                        goto err;
                }
  
                        goto err;
                }
  
@@ -56113,7 +55807,7 @@ diff -ruN linux-2.6.30.10/fs/binfmt_flat.c linux-2.6.30.10-ubi/fs/binfmt_flat.c
                len = PAGE_ALIGN(len);
                down_write(&current->mm->mmap_sem);
                realdatastart = do_mmap(0, 0, len,
                len = PAGE_ALIGN(len);
                down_write(&current->mm->mmap_sem);
                realdatastart = do_mmap(0, 0, len,
-@@ -572,6 +585,7 @@
+@@ -572,6 +585,7 @@ static int load_flat_file(struct linux_b
                datapos = ALIGN(realdatastart +
                                MAX_SHARED_LIBS * sizeof(unsigned long),
                                FLAT_DATA_ALIGN);
                datapos = ALIGN(realdatastart +
                                MAX_SHARED_LIBS * sizeof(unsigned long),
                                FLAT_DATA_ALIGN);
@@ -56121,7 +55815,7 @@ diff -ruN linux-2.6.30.10/fs/binfmt_flat.c linux-2.6.30.10-ubi/fs/binfmt_flat.c
  
                DBG_FLT("BINFMT_FLAT: Allocated data+bss+stack (%d bytes): %x\n",
                                (int)(data_len + bss_len + stack_len), (int)datapos);
  
                DBG_FLT("BINFMT_FLAT: Allocated data+bss+stack (%d bytes): %x\n",
                                (int)(data_len + bss_len + stack_len), (int)datapos);
-@@ -600,7 +614,11 @@
+@@ -600,7 +614,11 @@ static int load_flat_file(struct linux_b
                memp_size = len;
        } else {
  
                memp_size = len;
        } else {
  
@@ -56134,7 +55828,7 @@ diff -ruN linux-2.6.30.10/fs/binfmt_flat.c linux-2.6.30.10-ubi/fs/binfmt_flat.c
                len = PAGE_ALIGN(len);
                down_write(&current->mm->mmap_sem);
                textpos = do_mmap(0, 0, len,
                len = PAGE_ALIGN(len);
                down_write(&current->mm->mmap_sem);
                textpos = do_mmap(0, 0, len,
-@@ -616,10 +634,17 @@
+@@ -616,10 +634,17 @@ static int load_flat_file(struct linux_b
                        goto err;
                }
  
                        goto err;
                }
  
@@ -56152,7 +55846,7 @@ diff -ruN linux-2.6.30.10/fs/binfmt_flat.c linux-2.6.30.10-ubi/fs/binfmt_flat.c
  
                reloc = (unsigned long *)
                        (datapos + (ntohl(hdr->reloc_start) - text_len));
  
                reloc = (unsigned long *)
                        (datapos + (ntohl(hdr->reloc_start) - text_len));
-@@ -659,7 +684,7 @@
+@@ -659,7 +684,7 @@ static int load_flat_file(struct linux_b
                }
                if (result >= (unsigned long)-4096) {
                        printk("Unable to read code+data+bss, errno %d\n",(int)-result);
                }
                if (result >= (unsigned long)-4096) {
                        printk("Unable to read code+data+bss, errno %d\n",(int)-result);
@@ -56161,7 +55855,7 @@ diff -ruN linux-2.6.30.10/fs/binfmt_flat.c linux-2.6.30.10-ubi/fs/binfmt_flat.c
                                MAX_SHARED_LIBS * sizeof(unsigned long));
                        ret = result;
                        goto err;
                                MAX_SHARED_LIBS * sizeof(unsigned long));
                        ret = result;
                        goto err;
-@@ -672,6 +697,9 @@
+@@ -672,6 +697,9 @@ static int load_flat_file(struct linux_b
  
        /* The main program needs a little extra setup in the task structure */
        start_code = textpos + sizeof (struct flat_hdr);
  
        /* The main program needs a little extra setup in the task structure */
        start_code = textpos + sizeof (struct flat_hdr);
@@ -56171,7 +55865,7 @@ diff -ruN linux-2.6.30.10/fs/binfmt_flat.c linux-2.6.30.10-ubi/fs/binfmt_flat.c
        end_code = textpos + text_len;
        if (id == 0) {
                current->mm->start_code = start_code;
        end_code = textpos + text_len;
        if (id == 0) {
                current->mm->start_code = start_code;
-@@ -800,6 +828,13 @@
+@@ -800,6 +828,13 @@ static int load_flat_file(struct linux_b
  
        return 0;
  err:
  
        return 0;
  err:
@@ -56185,10 +55879,9 @@ diff -ruN linux-2.6.30.10/fs/binfmt_flat.c linux-2.6.30.10-ubi/fs/binfmt_flat.c
        return ret;
  }
  
        return ret;
  }
  
-diff -ruN linux-2.6.30.10/fs/Kconfig.binfmt linux-2.6.30.10-ubi/fs/Kconfig.binfmt
---- linux-2.6.30.10/fs/Kconfig.binfmt  2009-12-04 08:00:07.000000000 +0200
-+++ linux-2.6.30.10-ubi/fs/Kconfig.binfmt      2009-12-11 11:45:21.000000000 +0200
-@@ -30,7 +30,7 @@
+--- a/fs/Kconfig.binfmt
++++ b/fs/Kconfig.binfmt
+@@ -30,7 +30,7 @@ config COMPAT_BINFMT_ELF
  config BINFMT_ELF_FDPIC
        bool "Kernel support for FDPIC ELF binaries"
        default y
  config BINFMT_ELF_FDPIC
        bool "Kernel support for FDPIC ELF binaries"
        default y
@@ -56197,9 +55890,8 @@ diff -ruN linux-2.6.30.10/fs/Kconfig.binfmt linux-2.6.30.10-ubi/fs/Kconfig.binfm
        help
          ELF FDPIC binaries are based on ELF, but allow the individual load
          segments of a binary to be located in memory independently of each
        help
          ELF FDPIC binaries are based on ELF, but allow the individual load
          segments of a binary to be located in memory independently of each
-diff -ruN linux-2.6.30.10/include/asm-generic/resource.h linux-2.6.30.10-ubi/include/asm-generic/resource.h
---- linux-2.6.30.10/include/asm-generic/resource.h     2009-12-04 08:00:07.000000000 +0200
-+++ linux-2.6.30.10-ubi/include/asm-generic/resource.h 2009-12-11 11:45:23.000000000 +0200
+--- a/include/asm-generic/resource.h
++++ b/include/asm-generic/resource.h
 @@ -69,13 +69,16 @@
  /*
   * boot-time rlimit defaults for the init task:
 @@ -69,13 +69,16 @@
  /*
   * boot-time rlimit defaults for the init task:
@@ -56218,9 +55910,8 @@ diff -ruN linux-2.6.30.10/include/asm-generic/resource.h linux-2.6.30.10-ubi/inc
        [RLIMIT_RSS]            = {  RLIM_INFINITY,  RLIM_INFINITY },   \
        [RLIMIT_NPROC]          = {              0,              0 },   \
        [RLIMIT_NOFILE]         = {       INR_OPEN,       INR_OPEN },   \
        [RLIMIT_RSS]            = {  RLIM_INFINITY,  RLIM_INFINITY },   \
        [RLIMIT_NPROC]          = {              0,              0 },   \
        [RLIMIT_NOFILE]         = {       INR_OPEN,       INR_OPEN },   \
-diff -ruN linux-2.6.30.10/include/linux/elf-em.h linux-2.6.30.10-ubi/include/linux/elf-em.h
---- linux-2.6.30.10/include/linux/elf-em.h     2009-12-04 08:00:07.000000000 +0200
-+++ linux-2.6.30.10-ubi/include/linux/elf-em.h 2009-12-11 11:45:23.000000000 +0200
+--- a/include/linux/elf-em.h
++++ b/include/linux/elf-em.h
 @@ -41,6 +41,7 @@
   * up with a final number.
   */
 @@ -41,6 +41,7 @@
   * up with a final number.
   */
@@ -56229,10 +55920,9 @@ diff -ruN linux-2.6.30.10/include/linux/elf-em.h linux-2.6.30.10-ubi/include/lin
  
  /* Bogus old v850 magic number, used by old tools. */
  #define EM_CYGNUS_V850        0x9080
  
  /* Bogus old v850 magic number, used by old tools. */
  #define EM_CYGNUS_V850        0x9080
-diff -ruN linux-2.6.30.10/include/linux/fb.h linux-2.6.30.10-ubi/include/linux/fb.h
---- linux-2.6.30.10/include/linux/fb.h 2009-12-14 12:16:53.000000000 +0200
-+++ linux-2.6.30.10-ubi/include/linux/fb.h     2009-12-14 12:16:56.000000000 +0200
-@@ -151,6 +151,10 @@
+--- a/include/linux/fb.h
++++ b/include/linux/fb.h
+@@ -151,6 +151,10 @@ struct dentry;
  #define FB_ACCEL_PROSAVAGE_DDR  0x8d  /* S3 ProSavage DDR             */
  #define FB_ACCEL_PROSAVAGE_DDRK 0x8e  /* S3 ProSavage DDR-K           */
  
  #define FB_ACCEL_PROSAVAGE_DDR  0x8d  /* S3 ProSavage DDR             */
  #define FB_ACCEL_PROSAVAGE_DDRK 0x8e  /* S3 ProSavage DDR-K           */
  
@@ -56243,10 +55933,9 @@ diff -ruN linux-2.6.30.10/include/linux/fb.h linux-2.6.30.10-ubi/include/linux/f
  struct fb_fix_screeninfo {
        char id[16];                    /* identification string eg "TT Builtin" */
        unsigned long smem_start;       /* Start of frame buffer mem */
  struct fb_fix_screeninfo {
        char id[16];                    /* identification string eg "TT Builtin" */
        unsigned long smem_start;       /* Start of frame buffer mem */
-diff -ruN linux-2.6.30.10/include/linux/if_ppp.h linux-2.6.30.10-ubi/include/linux/if_ppp.h
---- linux-2.6.30.10/include/linux/if_ppp.h     2009-12-04 08:00:07.000000000 +0200
-+++ linux-2.6.30.10-ubi/include/linux/if_ppp.h 2009-12-11 11:45:23.000000000 +0200
-@@ -114,14 +114,14 @@
+--- a/include/linux/if_ppp.h
++++ b/include/linux/if_ppp.h
+@@ -114,14 +114,14 @@ struct pppol2tp_ioc_stats {
        __u16           tunnel_id;      /* redundant */
        __u16           session_id;     /* if zero, get tunnel stats */
        __u32           using_ipsec:1;  /* valid only for session_id == 0 */
        __u16           tunnel_id;      /* redundant */
        __u16           session_id;     /* if zero, get tunnel stats */
        __u32           using_ipsec:1;  /* valid only for session_id == 0 */
@@ -56269,10 +55958,9 @@ diff -ruN linux-2.6.30.10/include/linux/if_ppp.h linux-2.6.30.10-ubi/include/lin
  };
  
  #define ifr__name       b.ifr_ifrn.ifrn_name
  };
  
  #define ifr__name       b.ifr_ifrn.ifrn_name
-diff -ruN linux-2.6.30.10/include/linux/oprofile.h linux-2.6.30.10-ubi/include/linux/oprofile.h
---- linux-2.6.30.10/include/linux/oprofile.h   2009-12-04 08:00:07.000000000 +0200
-+++ linux-2.6.30.10-ubi/include/linux/oprofile.h       2009-12-11 11:45:23.000000000 +0200
-@@ -99,6 +99,8 @@
+--- a/include/linux/oprofile.h
++++ b/include/linux/oprofile.h
+@@ -99,6 +99,8 @@ void oprofile_add_sample(struct pt_regs 
   */
  void oprofile_add_ext_sample(unsigned long pc, struct pt_regs * const regs,
                                unsigned long event, int is_kernel);
   */
  void oprofile_add_ext_sample(unsigned long pc, struct pt_regs * const regs,
                                unsigned long event, int is_kernel);
@@ -56281,9 +55969,8 @@ diff -ruN linux-2.6.30.10/include/linux/oprofile.h linux-2.6.30.10-ubi/include/l
  
  /* Use this instead when the PC value is not from the regs. Doesn't
   * backtrace. */
  
  /* Use this instead when the PC value is not from the regs. Doesn't
   * backtrace. */
-diff -ruN linux-2.6.30.10/include/linux/serial_core.h linux-2.6.30.10-ubi/include/linux/serial_core.h
---- linux-2.6.30.10/include/linux/serial_core.h        2009-12-04 08:00:07.000000000 +0200
-+++ linux-2.6.30.10-ubi/include/linux/serial_core.h    2009-12-11 11:45:23.000000000 +0200
+--- a/include/linux/serial_core.h
++++ b/include/linux/serial_core.h
 @@ -167,6 +167,9 @@
  /* MAX3100 */
  #define PORT_MAX3100    86
 @@ -167,6 +167,9 @@
  /* MAX3100 */
  #define PORT_MAX3100    86
@@ -56294,10 +55981,9 @@ diff -ruN linux-2.6.30.10/include/linux/serial_core.h linux-2.6.30.10-ubi/includ
  #ifdef __KERNEL__
  
  #include <linux/compiler.h>
  #ifdef __KERNEL__
  
  #include <linux/compiler.h>
-diff -ruN linux-2.6.30.10/include/linux/slab.h linux-2.6.30.10-ubi/include/linux/slab.h
---- linux-2.6.30.10/include/linux/slab.h       2009-12-04 08:00:07.000000000 +0200
-+++ linux-2.6.30.10-ubi/include/linux/slab.h   2009-12-11 11:45:23.000000000 +0200
-@@ -317,4 +317,14 @@
+--- a/include/linux/slab.h
++++ b/include/linux/slab.h
+@@ -317,4 +317,14 @@ static inline void *kzalloc_node(size_t 
        return kmalloc_node(size, flags | __GFP_ZERO, node);
  }
  
        return kmalloc_node(size, flags | __GFP_ZERO, node);
  }
  
@@ -56312,10 +55998,9 @@ diff -ruN linux-2.6.30.10/include/linux/slab.h linux-2.6.30.10-ubi/include/linux
 +extern int kmem_cache_block_info(char *name, struct kmem_cache_size_info *data, int max_data);
 +
  #endif        /* _LINUX_SLAB_H */
 +extern int kmem_cache_block_info(char *name, struct kmem_cache_size_info *data, int max_data);
 +
  #endif        /* _LINUX_SLAB_H */
-diff -ruN linux-2.6.30.10/init/Kconfig linux-2.6.30.10-ubi/init/Kconfig
---- linux-2.6.30.10/init/Kconfig       2009-12-14 13:00:08.000000000 +0200
-+++ linux-2.6.30.10-ubi/init/Kconfig   2009-12-14 13:00:11.000000000 +0200
-@@ -865,6 +865,12 @@
+--- a/init/Kconfig
++++ b/init/Kconfig
+@@ -865,6 +865,12 @@ config ELF_CORE
        help
          Enable support for generating core dumps. Disabling saves about 4k.
  
        help
          Enable support for generating core dumps. Disabling saves about 4k.
  
@@ -56328,10 +56013,9 @@ diff -ruN linux-2.6.30.10/init/Kconfig linux-2.6.30.10-ubi/init/Kconfig
  config PCSPKR_PLATFORM
        bool "Enable PC-Speaker support" if EMBEDDED
        depends on ALPHA || X86 || MIPS || PPC_PREP || PPC_CHRP || PPC_PSERIES
  config PCSPKR_PLATFORM
        bool "Enable PC-Speaker support" if EMBEDDED
        depends on ALPHA || X86 || MIPS || PPC_PREP || PPC_CHRP || PPC_PSERIES
-diff -ruN linux-2.6.30.10/kernel/module.c linux-2.6.30.10-ubi/kernel/module.c
---- linux-2.6.30.10/kernel/module.c    2009-12-04 08:00:07.000000000 +0200
-+++ linux-2.6.30.10-ubi/kernel/module.c        2009-12-11 11:45:24.000000000 +0200
-@@ -2688,6 +2688,9 @@
+--- a/kernel/module.c
++++ b/kernel/module.c
+@@ -2688,6 +2688,9 @@ static int m_show(struct seq_file *m, vo
        /* Used by oprofile and other similar tools. */
        seq_printf(m, " 0x%p", mod->module_core);
  
        /* Used by oprofile and other similar tools. */
        seq_printf(m, " 0x%p", mod->module_core);
  
@@ -56341,7 +56025,7 @@ diff -ruN linux-2.6.30.10/kernel/module.c linux-2.6.30.10-ubi/kernel/module.c
        /* Taints info */
        if (mod->taints)
                seq_printf(m, " %s", module_flags(mod, buf));
        /* Taints info */
        if (mod->taints)
                seq_printf(m, " %s", module_flags(mod, buf));
-@@ -2840,8 +2843,12 @@
+@@ -2840,8 +2843,12 @@ void print_modules(void)
        printk("Modules linked in:");
        /* Most callers should already have preempt disabled, but make sure */
        preempt_disable();
        printk("Modules linked in:");
        /* Most callers should already have preempt disabled, but make sure */
        preempt_disable();
@@ -56355,9 +56039,8 @@ diff -ruN linux-2.6.30.10/kernel/module.c linux-2.6.30.10-ubi/kernel/module.c
        preempt_enable();
        if (last_unloaded_module[0])
                printk(" [last unloaded: %s]", last_unloaded_module);
        preempt_enable();
        if (last_unloaded_module[0])
                printk(" [last unloaded: %s]", last_unloaded_module);
-diff -ruN linux-2.6.30.10/kernel/sched_clock.c linux-2.6.30.10-ubi/kernel/sched_clock.c
---- linux-2.6.30.10/kernel/sched_clock.c       2009-12-04 08:00:07.000000000 +0200
-+++ linux-2.6.30.10-ubi/kernel/sched_clock.c   2009-12-11 11:45:24.000000000 +0200
+--- a/kernel/sched_clock.c
++++ b/kernel/sched_clock.c
 @@ -38,8 +38,7 @@
   */
  unsigned long long __attribute__((weak)) sched_clock(void)
 @@ -38,8 +38,7 @@
   */
  unsigned long long __attribute__((weak)) sched_clock(void)
@@ -56368,10 +56051,9 @@ diff -ruN linux-2.6.30.10/kernel/sched_clock.c linux-2.6.30.10-ubi/kernel/sched_
  }
  
  static __read_mostly int sched_clock_running;
  }
  
  static __read_mostly int sched_clock_running;
-diff -ruN linux-2.6.30.10/lib/Kconfig.debug linux-2.6.30.10-ubi/lib/Kconfig.debug
---- linux-2.6.30.10/lib/Kconfig.debug  2009-12-04 08:00:07.000000000 +0200
-+++ linux-2.6.30.10-ubi/lib/Kconfig.debug      2009-12-11 11:45:24.000000000 +0200
-@@ -621,7 +621,7 @@
+--- a/lib/Kconfig.debug
++++ b/lib/Kconfig.debug
+@@ -621,7 +621,7 @@ config FRAME_POINTER
        bool "Compile the kernel with frame pointers"
        depends on DEBUG_KERNEL && \
                (CRIS || M68K || M68KNOMMU || FRV || UML || \
        bool "Compile the kernel with frame pointers"
        depends on DEBUG_KERNEL && \
                (CRIS || M68K || M68KNOMMU || FRV || UML || \
@@ -56380,19 +56062,17 @@ diff -ruN linux-2.6.30.10/lib/Kconfig.debug linux-2.6.30.10-ubi/lib/Kconfig.debu
                ARCH_WANT_FRAME_POINTERS
        default y if (DEBUG_INFO && UML) || ARCH_WANT_FRAME_POINTERS
        help
                ARCH_WANT_FRAME_POINTERS
        default y if (DEBUG_INFO && UML) || ARCH_WANT_FRAME_POINTERS
        help
-diff -ruN linux-2.6.30.10/mm/Makefile linux-2.6.30.10-ubi/mm/Makefile
---- linux-2.6.30.10/mm/Makefile        2009-12-04 08:00:07.000000000 +0200
-+++ linux-2.6.30.10-ubi/mm/Makefile    2009-12-11 11:45:24.000000000 +0200
-@@ -38,3 +38,5 @@
+--- a/mm/Makefile
++++ b/mm/Makefile
+@@ -38,3 +38,5 @@ obj-$(CONFIG_SMP) += allocpercpu.o
  endif
  obj-$(CONFIG_QUICKLIST) += quicklist.o
  obj-$(CONFIG_CGROUP_MEM_RES_CTLR) += memcontrol.o page_cgroup.o
 +
 +CFLAGS_slab.o := $(PROFILING) -O2
  endif
  obj-$(CONFIG_QUICKLIST) += quicklist.o
  obj-$(CONFIG_CGROUP_MEM_RES_CTLR) += memcontrol.o page_cgroup.o
 +
 +CFLAGS_slab.o := $(PROFILING) -O2
-diff -ruN linux-2.6.30.10/mm/slab.c linux-2.6.30.10-ubi/mm/slab.c
---- linux-2.6.30.10/mm/slab.c  2009-12-04 08:00:07.000000000 +0200
-+++ linux-2.6.30.10-ubi/mm/slab.c      2009-12-11 11:45:24.000000000 +0200
-@@ -4100,6 +4100,68 @@
+--- a/mm/slab.c
++++ b/mm/slab.c
+@@ -4100,6 +4100,68 @@ out:
  
  #ifdef CONFIG_SLABINFO
  
  
  #ifdef CONFIG_SLABINFO
  
@@ -56461,10 +56141,9 @@ diff -ruN linux-2.6.30.10/mm/slab.c linux-2.6.30.10-ubi/mm/slab.c
  static void print_slabinfo_header(struct seq_file *m)
  {
        /*
  static void print_slabinfo_header(struct seq_file *m)
  {
        /*
-diff -ruN linux-2.6.30.10/scripts/mod/file2alias.c linux-2.6.30.10-ubi/scripts/mod/file2alias.c
---- linux-2.6.30.10/scripts/mod/file2alias.c   2009-12-04 08:00:07.000000000 +0200
-+++ linux-2.6.30.10-ubi/scripts/mod/file2alias.c       2009-12-11 11:45:24.000000000 +0200
-@@ -774,6 +774,15 @@
+--- a/scripts/mod/file2alias.c
++++ b/scripts/mod/file2alias.c
+@@ -774,6 +774,15 @@ void handle_moddevtable(struct module *m
                        + sym->st_value;
        }
  
                        + sym->st_value;
        }
  
@@ -56480,10 +56159,9 @@ diff -ruN linux-2.6.30.10/scripts/mod/file2alias.c linux-2.6.30.10-ubi/scripts/m
        if (sym_is(symname, "__mod_pci_device_table"))
                do_table(symval, sym->st_size,
                         sizeof(struct pci_device_id), "pci",
        if (sym_is(symname, "__mod_pci_device_table"))
                do_table(symval, sym->st_size,
                         sizeof(struct pci_device_id), "pci",
-diff -ruN linux-2.6.30.10/sound/Kconfig linux-2.6.30.10-ubi/sound/Kconfig
---- linux-2.6.30.10/sound/Kconfig      2009-12-04 08:00:07.000000000 +0200
-+++ linux-2.6.30.10-ubi/sound/Kconfig  2009-12-11 11:45:24.000000000 +0200
-@@ -82,6 +82,8 @@
+--- a/sound/Kconfig
++++ b/sound/Kconfig
+@@ -82,6 +82,8 @@ source "sound/parisc/Kconfig"
  
  source "sound/soc/Kconfig"
  
  
  source "sound/soc/Kconfig"
  
@@ -56492,10 +56170,9 @@ diff -ruN linux-2.6.30.10/sound/Kconfig linux-2.6.30.10-ubi/sound/Kconfig
  endif # SND
  
  menuconfig SOUND_PRIME
  endif # SND
  
  menuconfig SOUND_PRIME
-diff -ruN linux-2.6.30.10/sound/Makefile linux-2.6.30.10-ubi/sound/Makefile
---- linux-2.6.30.10/sound/Makefile     2009-12-04 08:00:07.000000000 +0200
-+++ linux-2.6.30.10-ubi/sound/Makefile 2009-12-11 11:45:24.000000000 +0200
-@@ -6,7 +6,7 @@
+--- a/sound/Makefile
++++ b/sound/Makefile
+@@ -6,7 +6,7 @@ obj-$(CONFIG_SOUND_PRIME) += sound_firmw
  obj-$(CONFIG_SOUND_PRIME) += oss/
  obj-$(CONFIG_DMASOUND) += oss/
  obj-$(CONFIG_SND) += core/ i2c/ drivers/ isa/ pci/ ppc/ arm/ sh/ synth/ usb/ \
  obj-$(CONFIG_SOUND_PRIME) += oss/
  obj-$(CONFIG_DMASOUND) += oss/
  obj-$(CONFIG_SND) += core/ i2c/ drivers/ isa/ pci/ ppc/ arm/ sh/ synth/ usb/ \
@@ -56504,9 +56181,8 @@ diff -ruN linux-2.6.30.10/sound/Makefile linux-2.6.30.10-ubi/sound/Makefile
  obj-$(CONFIG_SND_AOA) += aoa/
  
  # This one must be compilable even if sound is configured out
  obj-$(CONFIG_SND_AOA) += aoa/
  
  # This one must be compilable even if sound is configured out
-diff -ruN linux-2.6.30.10/sound/ubicom32/Kconfig linux-2.6.30.10-ubi/sound/ubicom32/Kconfig
---- linux-2.6.30.10/sound/ubicom32/Kconfig     1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.30.10-ubi/sound/ubicom32/Kconfig 2009-12-11 11:45:25.000000000 +0200
+--- /dev/null
++++ b/sound/ubicom32/Kconfig
 @@ -0,0 +1,42 @@
 +# ALSA Ubicom32 drivers
 +
 @@ -0,0 +1,42 @@
 +# ALSA Ubicom32 drivers
 +
@@ -56550,9 +56226,8 @@ diff -ruN linux-2.6.30.10/sound/ubicom32/Kconfig linux-2.6.30.10-ubi/sound/ubico
 +        Support for the Cirrus Logic CS4384 DAC.
 +
 +endif #SND_UBI32
 +        Support for the Cirrus Logic CS4384 DAC.
 +
 +endif #SND_UBI32
-diff -ruN linux-2.6.30.10/sound/ubicom32/Makefile linux-2.6.30.10-ubi/sound/ubicom32/Makefile
---- linux-2.6.30.10/sound/ubicom32/Makefile    1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.30.10-ubi/sound/ubicom32/Makefile        2009-12-11 11:45:25.000000000 +0200
+--- /dev/null
++++ b/sound/ubicom32/Makefile
 @@ -0,0 +1,41 @@
 +#
 +# sound/ubicom32/Makefile
 @@ -0,0 +1,41 @@
 +#
 +# sound/ubicom32/Makefile
@@ -56595,9 +56270,8 @@ diff -ruN linux-2.6.30.10/sound/ubicom32/Makefile linux-2.6.30.10-ubi/sound/ubic
 +obj-$(CONFIG_SND_UBI32_AUDIO_GENERIC_CAPTURE) += snd-ubi32-generic-capture.o
 +obj-$(CONFIG_SND_UBI32_AUDIO_CS4350) += snd-ubi32-cs4350.o
 +obj-$(CONFIG_SND_UBI32_AUDIO_CS4384) += snd-ubi32-cs4384.o
 +obj-$(CONFIG_SND_UBI32_AUDIO_GENERIC_CAPTURE) += snd-ubi32-generic-capture.o
 +obj-$(CONFIG_SND_UBI32_AUDIO_CS4350) += snd-ubi32-cs4350.o
 +obj-$(CONFIG_SND_UBI32_AUDIO_CS4384) += snd-ubi32-cs4384.o
-diff -ruN linux-2.6.30.10/sound/ubicom32/ubi32-cs4350.c linux-2.6.30.10-ubi/sound/ubicom32/ubi32-cs4350.c
---- linux-2.6.30.10/sound/ubicom32/ubi32-cs4350.c      1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.30.10-ubi/sound/ubicom32/ubi32-cs4350.c  2009-12-11 11:45:25.000000000 +0200
+--- /dev/null
++++ b/sound/ubicom32/ubi32-cs4350.c
 @@ -0,0 +1,583 @@
 +/*
 + * sound/ubicom32/ubi32-cs4350.c
 @@ -0,0 +1,583 @@
 +/*
 + * sound/ubicom32/ubi32-cs4350.c
@@ -57182,9 +56856,8 @@ diff -ruN linux-2.6.30.10/sound/ubicom32/ubi32-cs4350.c linux-2.6.30.10-ubi/soun
 +MODULE_AUTHOR("Patrick Tjin");
 +MODULE_DESCRIPTION("Driver for Ubicom32 audio devices CS4350");
 +MODULE_LICENSE("GPL");
 +MODULE_AUTHOR("Patrick Tjin");
 +MODULE_DESCRIPTION("Driver for Ubicom32 audio devices CS4350");
 +MODULE_LICENSE("GPL");
-diff -ruN linux-2.6.30.10/sound/ubicom32/ubi32-cs4384.c linux-2.6.30.10-ubi/sound/ubicom32/ubi32-cs4384.c
---- linux-2.6.30.10/sound/ubicom32/ubi32-cs4384.c      1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.30.10-ubi/sound/ubicom32/ubi32-cs4384.c  2009-12-11 11:45:25.000000000 +0200
+--- /dev/null
++++ b/sound/ubicom32/ubi32-cs4384.c
 @@ -0,0 +1,996 @@
 +/*
 + * sound/ubicom32/ubi32-cs4384.c
 @@ -0,0 +1,996 @@
 +/*
 + * sound/ubicom32/ubi32-cs4384.c
@@ -58182,9 +57855,8 @@ diff -ruN linux-2.6.30.10/sound/ubicom32/ubi32-cs4384.c linux-2.6.30.10-ubi/soun
 +MODULE_AUTHOR("Patrick Tjin");
 +MODULE_DESCRIPTION("Driver for Ubicom32 audio devices CS4384");
 +MODULE_LICENSE("GPL");
 +MODULE_AUTHOR("Patrick Tjin");
 +MODULE_DESCRIPTION("Driver for Ubicom32 audio devices CS4384");
 +MODULE_LICENSE("GPL");
-diff -ruN linux-2.6.30.10/sound/ubicom32/ubi32-generic.c linux-2.6.30.10-ubi/sound/ubicom32/ubi32-generic.c
---- linux-2.6.30.10/sound/ubicom32/ubi32-generic.c     1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.30.10-ubi/sound/ubicom32/ubi32-generic.c 2009-12-11 11:45:25.000000000 +0200
+--- /dev/null
++++ b/sound/ubicom32/ubi32-generic.c
 @@ -0,0 +1,166 @@
 +/*
 + * sound/ubicom32/ubi32-generic.c
 @@ -0,0 +1,166 @@
 +/*
 + * sound/ubicom32/ubi32-generic.c
@@ -58352,9 +58024,8 @@ diff -ruN linux-2.6.30.10/sound/ubicom32/ubi32-generic.c linux-2.6.30.10-ubi/sou
 +MODULE_AUTHOR("Aaron Jow, Patrick Tjin");
 +MODULE_DESCRIPTION("Driver for Ubicom32 audio devices");
 +MODULE_LICENSE("GPL");
 +MODULE_AUTHOR("Aaron Jow, Patrick Tjin");
 +MODULE_DESCRIPTION("Driver for Ubicom32 audio devices");
 +MODULE_LICENSE("GPL");
-diff -ruN linux-2.6.30.10/sound/ubicom32/ubi32-generic-capture.c linux-2.6.30.10-ubi/sound/ubicom32/ubi32-generic-capture.c
---- linux-2.6.30.10/sound/ubicom32/ubi32-generic-capture.c     1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.30.10-ubi/sound/ubicom32/ubi32-generic-capture.c 2009-12-11 11:45:25.000000000 +0200
+--- /dev/null
++++ b/sound/ubicom32/ubi32-generic-capture.c
 @@ -0,0 +1,167 @@
 +/*
 + * sound/ubicom32/ubi32-generic-capture.c
 @@ -0,0 +1,167 @@
 +/*
 + * sound/ubicom32/ubi32-generic-capture.c
@@ -58523,9 +58194,8 @@ diff -ruN linux-2.6.30.10/sound/ubicom32/ubi32-generic-capture.c linux-2.6.30.10
 +MODULE_AUTHOR("Patrick Tjin");
 +MODULE_DESCRIPTION("Driver for Ubicom32 audio devices");
 +MODULE_LICENSE("GPL");
 +MODULE_AUTHOR("Patrick Tjin");
 +MODULE_DESCRIPTION("Driver for Ubicom32 audio devices");
 +MODULE_LICENSE("GPL");
-diff -ruN linux-2.6.30.10/sound/ubicom32/ubi32.h linux-2.6.30.10-ubi/sound/ubicom32/ubi32.h
---- linux-2.6.30.10/sound/ubicom32/ubi32.h     1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.30.10-ubi/sound/ubicom32/ubi32.h 2009-12-11 11:45:25.000000000 +0200
+--- /dev/null
++++ b/sound/ubicom32/ubi32.h
 @@ -0,0 +1,102 @@
 +/*
 + * sound/ubicom32/ubi32.h
 @@ -0,0 +1,102 @@
 +/*
 + * sound/ubicom32/ubi32.h
@@ -58629,9 +58299,8 @@ diff -ruN linux-2.6.30.10/sound/ubicom32/ubi32.h linux-2.6.30.10-ubi/sound/ubico
 +extern void snd_ubi32_pcm_remove(struct ubi32_snd_priv *ubi32_priv);
 +
 +#endif
 +extern void snd_ubi32_pcm_remove(struct ubi32_snd_priv *ubi32_priv);
 +
 +#endif
-diff -ruN linux-2.6.30.10/sound/ubicom32/ubi32-pcm.c linux-2.6.30.10-ubi/sound/ubicom32/ubi32-pcm.c
---- linux-2.6.30.10/sound/ubicom32/ubi32-pcm.c 1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.30.10-ubi/sound/ubicom32/ubi32-pcm.c     2009-12-11 11:45:25.000000000 +0200
+--- /dev/null
++++ b/sound/ubicom32/ubi32-pcm.c
 @@ -0,0 +1,711 @@
 +/*
 + * sound/ubicom32/ubi32-pcm.c
 @@ -0,0 +1,711 @@
 +/*
 + * sound/ubicom32/ubi32-pcm.c
Personal OpenWRT clone
This page took 0.160998 seconds and 4 git commands to generate.