git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
[sfrench/cifs-2.6.git]
/
arch
/
powerpc
/
include
/
asm
/
macio.h
diff --git
a/arch/powerpc/include/asm/macio.h
b/arch/powerpc/include/asm/macio.h
index 19a661b4cb98205f6304c3c449062e6ca20e3c94..675e159b5ef42decbf2617870963547f07016870 100644
(file)
--- a/
arch/powerpc/include/asm/macio.h
+++ b/
arch/powerpc/include/asm/macio.h
@@
-123,10
+123,6
@@
static inline struct pci_dev *macio_get_pci_dev(struct macio_dev *mdev)
*/
struct macio_driver
{
- char *name;
- struct of_device_id *match_table;
- struct module *owner;
-
int (*probe)(struct macio_dev* dev, const struct of_device_id *match);
int (*remove)(struct macio_dev* dev);