diff options
author | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
---|---|---|
committer | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
commit | c71c03bda1e86c9d5198c5d83f712e695c4f2a1e (patch) | |
tree | ecb166cb3e2b7e2adb3b5e292245fefd23381ac8 /include/linux/leds-regulator.h | |
parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.c
Diffstat (limited to 'include/linux/leds-regulator.h')
-rw-r--r-- | include/linux/leds-regulator.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/leds-regulator.h b/include/linux/leds-regulator.h index 5a8eb389aab8..e2337a8c90b0 100644 --- a/include/linux/leds-regulator.h +++ b/include/linux/leds-regulator.h | |||
@@ -16,7 +16,7 @@ | |||
16 | * Use "vled" as supply id when declaring the regulator consumer: | 16 | * Use "vled" as supply id when declaring the regulator consumer: |
17 | * | 17 | * |
18 | * static struct regulator_consumer_supply pcap_regulator_VVIB_consumers [] = { | 18 | * static struct regulator_consumer_supply pcap_regulator_VVIB_consumers [] = { |
19 | * { .dev_name = "leds-regulator.0", supply = "vled" }, | 19 | * { .dev_name = "leds-regulator.0", .supply = "vled" }, |
20 | * }; | 20 | * }; |
21 | * | 21 | * |
22 | * If you have several regulator driven LEDs, you can append a numerical id to | 22 | * If you have several regulator driven LEDs, you can append a numerical id to |