kernel: update linux 3.6 to 3.6.10

[librecmc/librecmc.git] / target / linux / generic / patches-3.6 / 067-input_keymap_module_license.patch

diff --git a/target/linux/generic/patches-3.6/067-input_keymap_module_license.patch b/target/linux/generic/patches-3.6/067-input_keymap_module_license.patch
index 40230427876935c49b181df4da54ab2d9ddcdd0e..f95e06dca1cabf0c01926b68bc4bec2e064795bc 100644 (file)
--- a/target/linux/generic/patches-3.6/067-input_keymap_module_license.patch
+++ b/target/linux/generic/patches-3.6/067-input_keymap_module_license.patch
@@ -16,8 +16,6 @@ Dmitry, can you try to push this to Linus before 3.7 final? Thank you
  drivers/input/matrix-keymap.c |    3 +++
  1 file changed, 3 insertions(+)
 
-diff --git a/drivers/input/matrix-keymap.c b/drivers/input/matrix-keymap.c
-index 443ad64b..d88d9be 100644
 --- a/drivers/input/matrix-keymap.c
 +++ b/drivers/input/matrix-keymap.c
 @@ -23,6 +23,7 @@
@@ -28,12 +26,9 @@ index 443ad64b..d88d9be 100644
  #include <linux/input/matrix_keypad.h>
  
  static bool matrix_keypad_map_key(struct input_dev *input_dev,
-@@ -161,3 +162,5 @@ int matrix_keypad_build_keymap(const struct matrix_keymap_data *keymap_data,
+@@ -161,3 +162,5 @@ int matrix_keypad_build_keymap(const str
        return 0;
  }
  EXPORT_SYMBOL(matrix_keypad_build_keymap);
 +
 +MODULE_LICENSE("GPL");
--- 
-1.7.10.4
-