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

-4
-2
drivers/mfd/ucb1x00-core.c
··· 642 module_init(ucb1x00_init); 643 module_exit(ucb1x00_exit); 644 645 - EXPORT_SYMBOL(ucb1x00_class); 646 - 647 EXPORT_SYMBOL(ucb1x00_io_set_dir); 648 EXPORT_SYMBOL(ucb1x00_io_write); 649 EXPORT_SYMBOL(ucb1x00_io_read);
··· 642 module_init(ucb1x00_init); 643 module_exit(ucb1x00_exit); 644 645 EXPORT_SYMBOL(ucb1x00_io_set_dir); 646 EXPORT_SYMBOL(ucb1x00_io_write); 647 EXPORT_SYMBOL(ucb1x00_io_read);
-2
drivers/mfd/ucb1x00.h
··· 106 void (*fn)(int, void *); 107 }; 108 109 - extern struct class ucb1x00_class; 110 - 111 struct ucb1x00 { 112 spinlock_t lock; 113 struct mcp *mcp;
··· 106 void (*fn)(int, void *); 107 }; 108 109 struct ucb1x00 { 110 spinlock_t lock; 111 struct mcp *mcp;