Merge master.kernel.org:/home/rmk/linux-2.6-ucb

b954cbcb · Linus Torvalds · 5cd9a60c · a448a285 · b954cbcb · b954cbcb
Commit b954cbcb authored Oct 06, 2005 by Linus Torvalds
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 4 deletions

drivers/mfd/ucb1x00-core.c drivers/mfd/ucb1x00-core.c +0 -2

drivers/mfd/ucb1x00.h drivers/mfd/ucb1x00.h +0 -2

No files found.
--- a/drivers/mfd/ucb1x00-core.c
+++ b/drivers/mfd/ucb1x00-core.c
@@ -642,8 +642,6 @@ static void __exit ucb1x00_exit(void)
 module_init(ucb1x00_init);
 module_exit(ucb1x00_exit);

-EXPORT_SYMBOL(ucb1x00_class);
-
 EXPORT_SYMBOL(ucb1x00_io_set_dir);
 EXPORT_SYMBOL(ucb1x00_io_write);
 EXPORT_SYMBOL(ucb1x00_io_read);

--- a/drivers/mfd/ucb1x00.h
+++ b/drivers/mfd/ucb1x00.h
@@ -106,8 +106,6 @@ struct ucb1x00_irq {
 	void (*fn)(int, void *);
 };

-extern struct class ucb1x00_class;
-
 struct ucb1x00 {
 	spinlock_t		lock;
 	struct mcp		*mcp;