git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master.kernel.org:/home/rmk/linux-2.6-serial
[pandora-kernel.git]
/
drivers
/
s390
/
cio
/
qdio.c
diff --git
a/drivers/s390/cio/qdio.c
b/drivers/s390/cio/qdio.c
index
96f5192
..
7c93a87
100644
(file)
--- a/
drivers/s390/cio/qdio.c
+++ b/
drivers/s390/cio/qdio.c
@@
-30,7
+30,6
@@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-#include <linux/config.h>
#include <linux/module.h>
#include <linux/init.h>
#include <linux/module.h>
#include <linux/init.h>
@@
-2736,7
+2735,7
@@
qdio_free(struct ccw_device *cdev)
QDIO_DBF_TEXT1(0,trace,dbf_text);
QDIO_DBF_TEXT0(0,setup,dbf_text);
QDIO_DBF_TEXT1(0,trace,dbf_text);
QDIO_DBF_TEXT0(0,setup,dbf_text);
- cdev->private->qdio_data =
0
;
+ cdev->private->qdio_data =
NULL
;
up(&irq_ptr->setting_up_sema);
up(&irq_ptr->setting_up_sema);