bt linux-2.6.21.5 # patch -Np1 --verbose --dry-run -i zd1211rw_inject_2.6.22.patch
Hmm... Looks like a unified diff to me...
The text leading up to this was:
--------------------------
|diff -Naur linux-2.6.22_orig/drivers/net/wireless/zd1211rw/zd_mac.c linux-2.6.22/drivers/net/wireless/zd1211rw/zd_mac.c
|--- linux-2.6.22_orig/drivers/net/wireless/zd1211rw/zd_mac.c 2007-08-09 15:37:14.000000000 +0200
|+++ linux-2.6.22/drivers/net/wireless/zd1211rw/zd_mac.c 2007-08-23 22:51:27.000000000 +0200
--------------------------
Patching file drivers/net/wireless/zd1211rw/zd_mac.c using Plan A...
Reversed (or previously applied) patch detected! Skipping patch.
Hunk #1 ignored at 156.
Hunk #2 ignored at 201.
Hunk #3 ignored at 840.
Hunk #4 ignored at 864.
Hunk #5 ignored at 923.
Hunk #6 ignored at 947.
Hunk #7 ignored at 962.
Hunk #8 ignored at 978.
Hunk #9 ignored at 1087.
9 out of 9 hunks ignored -- saving rejects to file drivers/net/wireless/zd1211rw/zd_mac.c.rej
Hmm... The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|diff -Naur linux-2.6.22_orig/drivers/net/wireless/zd1211rw/zd_mac.c~ linux-2.6.22/drivers/net/wireless/zd1211rw/zd_mac.c~
|--- linux-2.6.22_orig/drivers/net/wireless/zd1211rw/zd_mac.c~ 1970-01-01 01:00:00.000000000 +0100
|+++ linux-2.6.22/drivers/net/wireless/zd1211rw/zd_mac.c~ 2007-08-23 22:26:08.000000000 +0200
--------------------------
Patching file drivers/net/wireless/zd1211rw/zd_mac.c~ using Plan A...
Hunk #1 succeeded at 1.
Hmm... The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|diff -Naur linux-2.6.22_orig/drivers/net/wireless/zd1211rw/zd_usb.c linux-2.6.22/drivers/net/wireless/zd1211rw/zd_usb.c
|--- linux-2.6.22_orig/drivers/net/wireless/zd1211rw/zd_usb.c 2007-08-09 15:37:14.000000000 +0200
|+++ linux-2.6.22/drivers/net/wireless/zd1211rw/zd_usb.c 2007-08-23 22:26:08.000000000 +0200
--------------------------
Patching file drivers/net/wireless/zd1211rw/zd_usb.c using Plan A...
Reversed (or previously applied) patch detected! Skipping patch.
Hunk #1 ignored at 774.
1 out of 1 hunk ignored -- saving rejects to file drivers/net/wireless/zd1211rw/zd_usb.c.rej
Hmm... The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|diff -Naur linux-2.6.22_orig/drivers/net/wireless/zd1211rw/zd_usb.h linux-2.6.22/drivers/net/wireless/zd1211rw/zd_usb.h
|--- linux-2.6.22_orig/drivers/net/wireless/zd1211rw/zd_usb.h 2007-08-09 15:37:14.000000000 +0200
|+++ linux-2.6.22/drivers/net/wireless/zd1211rw/zd_usb.h 2007-08-23 22:26:08.000000000 +0200
--------------------------
Patching file drivers/net/wireless/zd1211rw/zd_usb.h using Plan A...
Reversed (or previously applied) patch detected! Skipping patch.
Hunk #1 ignored at 221.
1 out of 1 hunk ignored -- saving rejects to file drivers/net/wireless/zd1211rw/zd_usb.h.rej
done