Drop redundant patch arm-proc-v7.diff

Fixed patches for patching

diff --git a/kernel-power-2.6.28/debian/patches/arm-proc-v7.diff b/kernel-power-2.6.28/debian/patches/arm-proc-v7.diff
deleted file mode 100644 (file)
index 9e5c7e3..0000000
--- a/kernel-power-2.6.28/debian/patches/arm-proc-v7.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- kernel-power-2.6.28.orig/arch/arm/mm/proc-v7.S
-+++ kernel-power-2.6.28/arch/arm/mm/proc-v7.S
-@@ -85,7 +85,7 @@
- #ifdef CONFIG_MMU
-       mov     r2, #0
-       ldr     r1, [r1, #MM_CONTEXT_ID]        @ get mm->context.id
--      orr     r0, r0, #TTB_RGN_OC_WB          @ mark PTWs outer cacheable, WB
-+      orr     r0, r0, #TTB_RGN_OC_WB
-       mcr     p15, 0, r2, c13, c0, 1          @ set reserved context ID
-       isb
- 1:    mcr     p15, 0, r0, c2, c0, 0           @ set TTB 0

diff --git a/kernel-power-2.6.28/debian/patches/dspbridge.diff b/kernel-power-2.6.28/debian/patches/dspbridge.diff
index f1c8bb9..101a5b6 100644 (file)
--- a/kernel-power-2.6.28/debian/patches/dspbridge.diff
+++ b/kernel-power-2.6.28/debian/patches/dspbridge.diff
@@ -6684,9 +6684,9 @@ diff -rupN kernel-power-2.6.28.orig/arch/arm/plat-omap/include/dspbridge/wmdmsg.
  #ifndef WMDMSG_
  #define WMDMSG_
  
-diff -rupN kernel-power-2.6.28.orig/debian/rx51power_defconfig kernel-power-2.6.28/debian/rx51power_defconfig
---- kernel-power-2.6.28.orig/debian/rx51power_defconfig        2011-04-17 17:32:12.000000000 +0100
-+++ kernel-power-2.6.28/debian/rx51power_defconfig     2011-05-06 14:16:04.000000000 +0100
+diff -rupN kernel-power-2.6.28.orig/arch/arm/configs/rx51_defconfig kernel-power-2.6.28/arch/arm/configs/rx51_defconfig
+--- kernel-power-2.6.28.orig/arch/arm/configs/rx51_defconfig   2011-04-17 17:32:12.000000000 +0100
++++ kernel-power-2.6.28/arch/arm/configs/rx51_defconfig        2011-05-06 14:16:04.000000000 +0100
 @@ -1512,7 +1512,7 @@ CONFIG_FB_CFB_IMAGEBLIT=y
  CONFIG_FB_OMAP_BOOTLOADER_INIT=y
  CONFIG_FB_OMAP_CONSISTENT_DMA_SIZE=14
@@ -18857,8 +18857,8 @@ diff -rupN kernel-power-2.6.28.orig/drivers/dsp/bridge/rmgr/drv_interface.c kern
  char *iva_img;
 -static char *num_procs = "C55=1";
 -static s32 shm_size = 0x400000;       /* 4 MB */
-+static s32 _shm_size = 0x500000;      /* 5 MB */\r
-+static s32 shm_size = 0;\r
++static s32 _shm_size = 0x500000;      /* 5 MB */
++static s32 shm_size = 0;
 +
  static u32 phys_mempool_base;
  static u32 phys_mempool_size;

diff --git a/kernel-power-2.6.28/debian/patches/ext4-data-corruption.diff b/kernel-power-2.6.28/debian/patches/ext4-data-corruption.diff
index 8cd7c3d..64cb839 100644 (file)
--- a/kernel-power-2.6.28/debian/patches/ext4-data-corruption.diff
+++ b/kernel-power-2.6.28/debian/patches/ext4-data-corruption.diff
@@ -605,4 +605,4 @@ diff -uprN linux-2.6.28.orig/fs/ocfs2/ocfs2_jbd_compat.h linux-2.6.28/fs/ocfs2/o
 +                                                    struct jbd2_inode *inode,\r
                                                      loff_t new_size)\r
  {\r
-       return 0;
\ No newline at end of file
+       return 0;\r

diff --git a/kernel-power-2.6.28/debian/patches/series b/kernel-power-2.6.28/debian/patches/series
index 37d9637..8c312bd 100644 (file)
--- a/kernel-power-2.6.28/debian/patches/series
+++ b/kernel-power-2.6.28/debian/patches/series
@@ -22,7 +22,6 @@ mmcnames-fanoush.diff
 gethercharge.diff
 ondemand-avoid.diff
 overclock.diff
-arm-proc-v7.diff
 armthumb.diff
 minstrel-aziwoqpa_fixed.diff
 wl12xx_rohar.diff