diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2008-06-11 11:17:01 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2008-06-11 11:17:01 -0700 |
| commit | 33c9cb3493fbb0f8f04e729a28aa9ec799d662aa (patch) | |
| tree | d7d27488b4937fd493f3bad9f5cec30e85d89b9e | |
| parent | 8e6bbb93075c235e212706cf53fb85de34c245a1 (diff) | |
| download | patches-33c9cb3493fbb0f8f04e729a28aa9ec799d662aa.tar.gz | |
2.6.26-rc5-git5 resync
| -rw-r--r-- | driver-core/s390-bus_id-dev_set_name-changes.patch | 4 | ||||
| -rw-r--r-- | version | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/driver-core/s390-bus_id-dev_set_name-changes.patch b/driver-core/s390-bus_id-dev_set_name-changes.patch index 80e064842adba5..060face090535d 100644 --- a/driver-core/s390-bus_id-dev_set_name-changes.patch +++ b/driver-core/s390-bus_id-dev_set_name-changes.patch @@ -90,7 +90,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> /* * The first subchannel that is not-operational (ccode==3) -@@ -679,6 +681,7 @@ do_IRQ (struct pt_regs *regs) +@@ -681,6 +683,7 @@ do_IRQ (struct pt_regs *regs) #ifdef CONFIG_CCW_CONSOLE static struct subchannel console_subchannel; @@ -98,7 +98,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> static struct io_subchannel_private console_priv; static int console_subchannel_in_use; -@@ -829,6 +832,12 @@ cio_get_console_subchannel(void) +@@ -831,6 +834,12 @@ cio_get_console_subchannel(void) return &console_subchannel; } @@ -1 +1 @@ -2.6.26-rc5-git4 +2.6.26-rc5-git5 |