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 Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...
[linux-2.6.git]
/
drivers
/
isdn
/
gigaset
/
gigaset.h
diff --git
a/drivers/isdn/gigaset/gigaset.h
b/drivers/isdn/gigaset/gigaset.h
index
22b9693
..
884bd72
100644
(file)
--- a/
drivers/isdn/gigaset/gigaset.h
+++ b/
drivers/isdn/gigaset/gigaset.h
@@
-16,7
+16,6
@@
#ifndef GIGASET_H
#define GIGASET_H
#ifndef GIGASET_H
#define GIGASET_H
-#include <linux/config.h>
#include <linux/kernel.h>
#include <linux/compiler.h>
#include <linux/types.h>
#include <linux/kernel.h>
#include <linux/compiler.h>
#include <linux/types.h>
@@
-445,6
+444,7
@@
struct cardstate {
struct gigaset_driver *driver;
unsigned minor_index;
struct device *dev;
struct gigaset_driver *driver;
unsigned minor_index;
struct device *dev;
+ struct class_device *class;
const struct gigaset_ops *ops;
const struct gigaset_ops *ops;
@@
-768,7
+768,6
@@
void gigaset_block_channels(struct cardstate *cs);
struct gigaset_driver *gigaset_initdriver(unsigned minor, unsigned minors,
const char *procname,
const char *devname,
struct gigaset_driver *gigaset_initdriver(unsigned minor, unsigned minors,
const char *procname,
const char *devname,
- const char *devfsname,
const struct gigaset_ops *ops,
struct module *owner);
const struct gigaset_ops *ops,
struct module *owner);
@@
-891,7
+890,7
@@
int gigaset_fill_inbuf(struct inbuf_t *inbuf, const unsigned char *src,
/* initialize interface */
void gigaset_if_initdriver(struct gigaset_driver *drv, const char *procname,
/* initialize interface */
void gigaset_if_initdriver(struct gigaset_driver *drv, const char *procname,
- const char *devname
, const char *devfsname
);
+ const char *devname);
/* release interface */
void gigaset_if_freedriver(struct gigaset_driver *drv);
/* add minor */
/* release interface */
void gigaset_if_freedriver(struct gigaset_driver *drv);
/* add minor */