diff --git a/[refs] b/[refs] index 70f7ba173d74..ce36a4e38e90 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 46621ebbf5859375dc1fd4dc21d400224032fbf9 +refs/heads/master: 5ab9059d7f2055f434140046e74d3d811e4cbb15 diff --git a/trunk/include/linux/mfd/mc13xxx.h b/trunk/include/linux/mfd/mc13xxx.h index 6e7c0ac36d09..1acf9cbf5f25 100644 --- a/trunk/include/linux/mfd/mc13xxx.h +++ b/trunk/include/linux/mfd/mc13xxx.h @@ -145,8 +145,6 @@ struct mc13xxx_platform_data { #define MC13XXX_USE_CODEC (1 << 1) #define MC13XXX_USE_ADC (1 << 2) #define MC13XXX_USE_RTC (1 << 3) -#define MC13XXX_USE_REGULATOR (1 << 4) -#define MC13XXX_USE_LED (1 << 5) unsigned int flags; struct mc13xxx_regulator_platform_data regulators;