From ed6f948190fd0625473fea9012b92792063c1b7b Mon Sep 17 00:00:00 2001
From: Stephen Hemminger <shemminger@vyatta.com>
Date: Tue, 20 Jul 2010 20:09:00 -0600
Subject: [PATCH] --- yaml --- r: 208319 b: refs/heads/master c:
 3b06c21e8462b77186613e70db286cfa8616088b h: refs/heads/master i:   208317:
 97a78789ea8198e8b4b6ed16d10c175869c0138f   208315:
 2da3e33677b0dd7010972712a52981178a1061b0   208311:
 ce3566cda73d3a6606e879c10f2414361befd0f8   208303:
 d0c20b0dd187023db2f24356759320eab4818428   208287:
 ddd5afebfb853a7a0a13c0c518c08da3aa47a167   208255:
 5a6b796dd32a947fbe521c109bb62ae7620884ba v: v3

---
 [refs]                       |  2 +-
 trunk/drivers/block/floppy.c | 16 ++++++++--------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/[refs] b/[refs]
index 58afcde3f434..8eeba8b93ef9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ad96a7a7ea950d5bc9755f2f568be185c7070f1e
+refs/heads/master: 3b06c21e8462b77186613e70db286cfa8616088b
diff --git a/trunk/drivers/block/floppy.c b/trunk/drivers/block/floppy.c
index 3126d5122b2b..cf04c1b234ed 100644
--- a/trunk/drivers/block/floppy.c
+++ b/trunk/drivers/block/floppy.c
@@ -538,7 +538,7 @@ static int max_buffer_sectors;
 
 static int *errors;
 typedef void (*done_f)(int);
-static struct cont_t {
+static const struct cont_t {
 	void (*interrupt)(void);
 				/* this is called after the interrupt of the
 				 * main command */
@@ -1970,14 +1970,14 @@ static void do_wakeup(void)
 	wake_up(&command_done);
 }
 
-static struct cont_t wakeup_cont = {
+static const struct cont_t wakeup_cont = {
 	.interrupt	= empty,
 	.redo		= do_wakeup,
 	.error		= empty,
 	.done		= (done_f)empty
 };
 
-static struct cont_t intr_cont = {
+static const struct cont_t intr_cont = {
 	.interrupt	= empty,
 	.redo		= process_fd_request,
 	.error		= empty,
@@ -2183,7 +2183,7 @@ static void redo_format(void)
 	debugt(__func__, "queue format request");
 }
 
-static struct cont_t format_cont = {
+static const struct cont_t format_cont = {
 	.interrupt	= format_interrupt,
 	.redo		= redo_format,
 	.error		= bad_flp_intr,
@@ -2879,7 +2879,7 @@ static void redo_fd_request(void)
 	return;
 }
 
-static struct cont_t rw_cont = {
+static const struct cont_t rw_cont = {
 	.interrupt	= rw_interrupt,
 	.redo		= redo_fd_request,
 	.error		= bad_flp_intr,
@@ -2915,7 +2915,7 @@ static void do_fd_request(struct request_queue *q)
 	is_alive(__func__, "");
 }
 
-static struct cont_t poll_cont = {
+static const struct cont_t poll_cont = {
 	.interrupt	= success_and_wakeup,
 	.redo		= floppy_ready,
 	.error		= generic_failure,
@@ -2946,7 +2946,7 @@ static void reset_intr(void)
 	pr_info("weird, reset interrupt called\n");
 }
 
-static struct cont_t reset_cont = {
+static const struct cont_t reset_cont = {
 	.interrupt	= reset_intr,
 	.redo		= success_and_wakeup,
 	.error		= generic_failure,
@@ -3051,7 +3051,7 @@ static void raw_cmd_done(int flag)
 	generic_done(flag);
 }
 
-static struct cont_t raw_cmd_cont = {
+static const struct cont_t raw_cmd_cont = {
 	.interrupt	= success_and_wakeup,
 	.redo		= floppy_start,
 	.error		= generic_failure,