git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge to kernel-2.6.20-1.2949.fc6.vs2.2.0.1
[linux-2.6.git]
/
drivers
/
s390
/
char
/
sclp_cpi.c
diff --git
a/drivers/s390/char/sclp_cpi.c
b/drivers/s390/char/sclp_cpi.c
index
80f7f31
..
4f873ae
100644
(file)
--- a/
drivers/s390/char/sclp_cpi.c
+++ b/
drivers/s390/char/sclp_cpi.c
@@
-5,7
+5,6
@@
* SCLP Control-Program Identification.
*/
* SCLP Control-Program Identification.
*/
-#include <linux/config.h>
#include <linux/version.h>
#include <linux/kmod.h>
#include <linux/module.h>
#include <linux/version.h>
#include <linux/kmod.h>
#include <linux/module.h>
@@
-50,6
+49,8
@@
static struct sclp_register sclp_cpi_event =
.send_mask = EvTyp_CtlProgIdent_Mask
};
.send_mask = EvTyp_CtlProgIdent_Mask
};
+MODULE_LICENSE("GPL");
+
MODULE_AUTHOR(
"Martin Peschke, IBM Deutschland Entwicklung GmbH "
"<mpeschke@de.ibm.com>");
MODULE_AUTHOR(
"Martin Peschke, IBM Deutschland Entwicklung GmbH "
"<mpeschke@de.ibm.com>");
@@
-128,7
+129,7
@@
cpi_prepare_req(void)
struct cpi_sccb *sccb;
struct cpi_evbuf *evb;
struct cpi_sccb *sccb;
struct cpi_evbuf *evb;
- req =
(struct sclp_req *)
kmalloc(sizeof(struct sclp_req), GFP_KERNEL);
+ req = kmalloc(sizeof(struct sclp_req), GFP_KERNEL);
if (req == NULL)
return ERR_PTR(-ENOMEM);
sccb = (struct cpi_sccb *) __get_free_page(GFP_KERNEL | GFP_DMA);
if (req == NULL)
return ERR_PTR(-ENOMEM);
sccb = (struct cpi_sccb *) __get_free_page(GFP_KERNEL | GFP_DMA);