Merge master.kernel.org:/home/rmk/linux-2.6-arm

2 files changed, 3 insertions, 21 deletions

diff --git a/drivers/mtd/afs.c b/drivers/mtd/afs.c
index 801e6c7d0892..7363e101eb0f 100644
--- a/drivers/mtd/afs.c
+++ b/drivers/mtd/afs.c
@@ -219,7 +219,7 @@ static int parse_afs_partitions(struct mtd_info *mtd,
          */
         for (idx = off = 0; off < mtd->size; off += mtd->erasesize) {
                 struct image_info_struct iis;
-                u_int iis_ptr, img_ptr, size;
+                u_int iis_ptr, img_ptr;
 
                 /* Read the footer. */
                 ret = afs_read_footer(mtd, &img_ptr, &iis_ptr, off, mask);
@@ -236,21 +236,9 @@ static int parse_afs_partitions(struct mtd_info *mtd,
                         continue;
 
                 strcpy(str, iis.name);
-                size = mtd->erasesize + off - img_ptr;
-
-                /*
-                 * In order to support JFFS2 partitions on this layout,
-                 * we must lie to MTD about the real size of JFFS2
-                 * partitions; this ensures that the AFS flash footer
-                 * won't be erased by JFFS2.  Please ensure that your
-                 * JFFS2 partitions are given image numbers between
-                 * 1000 and 2000 inclusive.
-                 */
-                if (iis.imageNumber >= 1000 && iis.imageNumber < 2000)
-                        size -= mtd->erasesize;
 
                 parts[idx].name         = str;
-                parts[idx].size         = size;
+                parts[idx].size         = (iis.length + mtd->erasesize - 1) & ~(mtd->erasesize - 1);
                 parts[idx].offset       = img_ptr;
                 parts[idx].mask_flags   = 0;
 
diff --git a/drivers/video/console/fbcon.c b/drivers/video/console/fbcon.c
index b209adbd508a..9dd0fbccf994 100644
--- a/drivers/video/console/fbcon.c
+++ b/drivers/video/console/fbcon.c
@@ -142,7 +142,6 @@ static int fbcon_set_origin(struct vc_data *);
 #define CURSOR_DRAW_DELAY               (1)
 
 /* # VBL ints between cursor state changes */
-#define ARM_CURSOR_BLINK_RATE           (10)
 #define ATARI_CURSOR_BLINK_RATE         (42)
 #define MAC_CURSOR_BLINK_RATE           (32)
 #define DEFAULT_CURSOR_BLINK_RATE       (20)
@@ -288,7 +287,7 @@ static void fb_flashcursor(void *private)
         release_console_sem();
 }
 
-#if (defined(__arm__) && defined(IRQ_VSYNCPULSE)) || defined(CONFIG_ATARI) || defined(CONFIG_MAC)
+#if defined(CONFIG_ATARI) || defined(CONFIG_MAC)
 static int cursor_blink_rate;
 static irqreturn_t fb_vbl_handler(int irq, void *dev_id, struct pt_regs *fp)
 {
@@ -878,11 +877,6 @@ static const char *fbcon_startup(void)
         }
 #endif                          /* CONFIG_MAC */
 
-#if defined(__arm__) && defined(IRQ_VSYNCPULSE)
-        cursor_blink_rate = ARM_CURSOR_BLINK_RATE;
-        irqres = request_irq(IRQ_VSYNCPULSE, fb_vbl_handler, SA_SHIRQ,
-                             "framebuffer vbl", info);
-#endif
         /* Initialize the work queue. If the driver provides its
          * own work queue this means it will use something besides 
          * default timer to flash the cursor. */