 f5ee10ab42
			
		
	
	
	f5ee10ab42
	
	
	
		
			
			Commit f03f91826 (regulator: Add option for machine drivers to enable the dummy regulator) in the regulators tree seems to have introduced the following build break when CONFIG_REGULATOR_DUMMY is disabled. Fix this. CC drivers/regulator/dummy.o drivers/regulator/dummy.c:41: error: redefinition of 'regulator_dummy_init' drivers/regulator/dummy.h:28: note: previous definition of 'regulator_dummy_init' was here make[2]: *** [drivers/regulator/dummy.o] Error 1 make[1]: *** [drivers/regulator] Error 2 make: *** [drivers] Error 2 Signed-off-by: Anand Gadiyar <gadiyar@ti.com> Cc: Liam Girdwood <lrg@slimlogic.co.uk> Cc: Mark Brown <broonie@opensource.wolfsonmicro.com> Acked-by: Randy Dunlap <randy.dunlap@oracle.com> Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Signed-off-by: Liam Girdwood <lrg@slimlogic.co.uk>
		
			
				
	
	
		
			27 lines
		
	
	
	
		
			718 B
			
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			27 lines
		
	
	
	
		
			718 B
			
		
	
	
	
		
			C
		
	
	
	
	
	
| /*
 | |
|  * dummy.h
 | |
|  *
 | |
|  * Copyright 2010 Wolfson Microelectronics PLC.
 | |
|  *
 | |
|  * Author: Mark Brown <broonie@opensource.wolfsonmicro.com>
 | |
|  *
 | |
|  * This program is free software; you can redistribute it and/or
 | |
|  * modify it under the terms of the GNU General Public License as
 | |
|  * published by the Free Software Foundation; either version 2 of the
 | |
|  * License, or (at your option) any later version.
 | |
|  *
 | |
|  * This is useful for systems with mixed controllable and
 | |
|  * non-controllable regulators, as well as for allowing testing on
 | |
|  * systems with no controllable regulators.
 | |
|  */
 | |
| 
 | |
| #ifndef _DUMMY_H
 | |
| #define _DUMMY_H
 | |
| 
 | |
| struct regulator_dev;
 | |
| 
 | |
| extern struct regulator_dev *dummy_regulator_rdev;
 | |
| 
 | |
| void __init regulator_dummy_init(void);
 | |
| 
 | |
| #endif
 |