Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b954cbcb authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

parents 5cd9a60c a448a285

drivers/mfd/ucb1x00-core.c

+0 −2
Original line number Diff line number Diff line
@@ -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);

drivers/mfd/ucb1x00.h

+0 −2
Original line number Diff line number Diff line
@@ -106,8 +106,6 @@ struct ucb1x00_irq { 
	void (*fn)(int, void *);

};



extern struct class ucb1x00_class;



struct ucb1x00 {

	spinlock_t		lock;

	struct mcp		*mcp;