diff options
| author | Roman Yeryomin <roman@advem.lv> | 2013-05-26 01:02:55 +0300 |
|---|---|---|
| committer | Roman Yeryomin <roman@advem.lv> | 2013-05-26 01:02:55 +0300 |
| commit | 342045a35b1981a89e4bc80842b10c065e1050da (patch) | |
| tree | 4140720b20e8d641c11da882010d6130a75fef21 /target/linux/mpc85xx/patches-3.8/001-powerpc-85xx-add-gpio-keys-to-of-match-table.patch | |
| parent | 7338133dde8238afce34676214b494c8db96689b (diff) | |
| parent | 1a116ce7818ecee5d167a9c0ebb1a0feca9120e6 (diff) | |
Merge trunk into realtek-unstable
Conflicts:
Config.in
feeds.conf.default
package/base-files/files/etc/hotplug2-common.rules
package/network/config/netifd/files/etc/init.d/network
Diffstat (limited to 'target/linux/mpc85xx/patches-3.8/001-powerpc-85xx-add-gpio-keys-to-of-match-table.patch')
| -rw-r--r-- | target/linux/mpc85xx/patches-3.8/001-powerpc-85xx-add-gpio-keys-to-of-match-table.patch | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/target/linux/mpc85xx/patches-3.8/001-powerpc-85xx-add-gpio-keys-to-of-match-table.patch b/target/linux/mpc85xx/patches-3.8/001-powerpc-85xx-add-gpio-keys-to-of-match-table.patch new file mode 100644 index 000000000..e79edbea7 --- /dev/null +++ b/target/linux/mpc85xx/patches-3.8/001-powerpc-85xx-add-gpio-keys-to-of-match-table.patch @@ -0,0 +1,10 @@ +--- a/arch/powerpc/platforms/85xx/common.c ++++ b/arch/powerpc/platforms/85xx/common.c +@@ -27,6 +27,7 @@ static struct of_device_id __initdata mp + { .compatible = "fsl,mpc8548-guts", }, + /* Probably unnecessary? */ + { .compatible = "gpio-leds", }, ++ { .compatible = "gpio-keys", }, + /* For all PCI controllers */ + { .compatible = "fsl,mpc8540-pci", }, + { .compatible = "fsl,mpc8548-pcie", }, |