1. 01 Apr, 2013 20 commits
  2. 30 Mar, 2013 1 commit
  3. 25 Mar, 2013 2 commits
    • Anton Vorontsov's avatar
      Merge branch 'urgent' · 6e997bb8
      Anton Vorontsov authored
      Conflicts:
      	drivers/power/pm2301_charger.c
      6e997bb8
    • Lars-Peter Clausen's avatar
      pm2301_charger: Remove __dev* annotations · 92413a9b
      Lars-Peter Clausen authored
      The removal of __devinit and friends seems to have overlapped with the
      addition of the pm2301_charger driver. Currently the driver fails to build
      with the following errors:
      
      	drivers/power/pm2301_charger.c:843:22: error: expected '=', ',', ';', 'asm' or '__attribute__' before 'pm2xxx_wall_charger_probe'
      	drivers/power/pm2301_charger.c:1013:22: error: expected '=', ',', ';', 'asm' or '__attribute__' before 'pm2xxx_wall_charger_remove'
      	drivers/power/pm2301_charger.c:1049:11: error: 'pm2xxx_wall_charger_probe' undeclared here (not in a function)
      	drivers/power/pm2301_charger.c:1050:2: error: implicit declaration of function '__devexit_p'
      	drivers/power/pm2301_charger.c:1050:24: error: 'pm2xxx_wall_charger_remove' undeclared here (not in a function)
      
      This patch removes the __dev* annotations, which fixes the build errors.
      
      Cc: Lee Jones <lee.jones@linaro.org>
      Signed-off-by: default avatarLars-Peter Clausen <lars@metafoo.de>
      Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
      Acked-by: default avatarLinus Walleij <linus.walleij@linaro.org>
      Signed-off-by: default avatarAnton Vorontsov <anton@enomsg.org>
      92413a9b
  4. 23 Mar, 2013 8 commits
  5. 22 Mar, 2013 9 commits