diff options
| author | Nicolas Chauvet <kwizart@gmail.com> | 2014-06-23 17:48:23 +0200 |
|---|---|---|
| committer | Nicolas Chauvet <kwizart@gmail.com> | 2014-07-07 16:21:18 +0200 |
| commit | 4fe7204e94502cca28050384525810241c54e9df (patch) | |
| tree | c7c409828cef2e40a7c092f03a1f95bd735ebe22 | |
| parent | dc80ed2fd10c543bee324e97cef85a8ee0d5fd2a (diff) | |
| download | kernel-4fe7204e94502cca28050384525810241c54e9df.tar.gz kernel-4fe7204e94502cca28050384525810241c54e9df.tar.xz kernel-4fe7204e94502cca28050384525810241c54e9df.zip | |
Remove merge hook
| -rw-r--r-- | linux-3.15-tagr.patch | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/linux-3.15-tagr.patch b/linux-3.15-tagr.patch index 7718ce31..58501697 100644 --- a/linux-3.15-tagr.patch +++ b/linux-3.15-tagr.patch @@ -1130,26 +1130,6 @@ index 083cf37..1a16734 100644 /* Tegra PCIE requires relaxed ordering */ static void tegra_pcie_relax_enable(struct pci_dev *dev) -diff --git a/drivers/regulator/as3722-regulator.c b/drivers/regulator/as3722-regulator.c -index 8558521..ad9e0c9 100644 ---- a/drivers/regulator/as3722-regulator.c -+++ b/drivers/regulator/as3722-regulator.c -@@ -433,6 +433,7 @@ static struct regulator_ops as3722_ldo3_extcntrl_ops = { - }; - - static const struct regulator_linear_range as3722_ldo_ranges[] = { -+ REGULATOR_LINEAR_RANGE(0, 0x00, 0x00, 0), - REGULATOR_LINEAR_RANGE(825000, 0x01, 0x24, 25000), - REGULATOR_LINEAR_RANGE(1725000, 0x40, 0x7F, 25000), - }; -@@ -609,6 +610,7 @@ static bool as3722_sd0_is_low_voltage(struct as3722_regulators *as3722_regs) - } - - static const struct regulator_linear_range as3722_sd2345_ranges[] = { -+ REGULATOR_LINEAR_RANGE(0, 0x00, 0x00, 0), - REGULATOR_LINEAR_RANGE(612500, 0x01, 0x40, 12500), - REGULATOR_LINEAR_RANGE(1425000, 0x41, 0x70, 25000), - REGULATOR_LINEAR_RANGE(2650000, 0x71, 0x7F, 50000), diff --git a/include/drm/drmP.h b/include/drm/drmP.h index 8af71a8..0f4e7a5 100644 --- a/include/drm/drmP.h |