Phoenix84

gtab diff

Dec 18th, 2011
121
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
Diff 7.99 KB | None | 0 0
  1. # On branch android-tegra-nv-2.6.39
  2. # Changed but not updated:
  3. #   (use "git add <file>..." to update what will be committed)
  4. #   (use "git checkout -- <file>..." to discard changes in working directory)
  5. #
  6. #       modified:   arch/arm/mach-tegra/Kconfig
  7. #       modified:   arch/arm/mach-tegra/Makefile
  8. #       modified:   arch/arm/mach-tegra/include/mach/latency_allowance.h
  9. #       modified:   arch/arm/mach-tegra/include/mach/sdhci.h
  10. #       modified:   include/linux/netdevice.h
  11. #
  12. # Untracked files:
  13. #   (use "git add <file>..." to include in what will be committed)
  14. #
  15. #       arch/arm/configs/tegra_smba1002_android_defconfig
  16. #       arch/arm/mach-tegra/board-smba1002-aes.c
  17. #       arch/arm/mach-tegra/board-smba1002-audio.c
  18. #       arch/arm/mach-tegra/board-smba1002-audio.c-bak
  19. #       arch/arm/mach-tegra/board-smba1002-bootinfo.c
  20. #       arch/arm/mach-tegra/board-smba1002-bt.c
  21. #       arch/arm/mach-tegra/board-smba1002-camera.c
  22. #       arch/arm/mach-tegra/board-smba1002-clocks.c
  23. #       arch/arm/mach-tegra/board-smba1002-clocks.c.bak
  24. #       arch/arm/mach-tegra/board-smba1002-gps.c
  25. #       arch/arm/mach-tegra/board-smba1002-gpu.c
  26. #       arch/arm/mach-tegra/board-smba1002-gsm.c
  27. #       arch/arm/mach-tegra/board-smba1002-i2c.c
  28. #       arch/arm/mach-tegra/board-smba1002-keyboard.c
  29. #       arch/arm/mach-tegra/board-smba1002-memory.c
  30. #       arch/arm/mach-tegra/board-smba1002-nand.c
  31. #       arch/arm/mach-tegra/board-smba1002-pinmux.c
  32. #       arch/arm/mach-tegra/board-smba1002-pm-bluetooth.c
  33. #       arch/arm/mach-tegra/board-smba1002-pm-camera.c
  34. #       arch/arm/mach-tegra/board-smba1002-power.c
  35. #       arch/arm/mach-tegra/board-smba1002-sdhci.c
  36. #       arch/arm/mach-tegra/board-smba1002-sensors.c
  37. #       arch/arm/mach-tegra/board-smba1002-spi.c
  38. #       arch/arm/mach-tegra/board-smba1002-touch.c
  39. #       arch/arm/mach-tegra/board-smba1002-uart.c
  40. #       arch/arm/mach-tegra/board-smba1002-usb.c
  41. #       arch/arm/mach-tegra/board-smba1002-wake.c
  42. #       arch/arm/mach-tegra/board-smba1002-wdt.c
  43. #       arch/arm/mach-tegra/board-smba1002-wlan.c
  44. #       arch/arm/mach-tegra/board-smba1002.c
  45. #       arch/arm/mach-tegra/board-smba1002.h
  46. #       arch/arm/mach-tegra/include/mach/shuttle_audio.h
  47. #       arch/arm/mach-tegra/include/mach/smba1002_audio.h
  48. #       include/linux/gpio_shortlong_key.h
  49. #       include/linux/input/egalax.h
  50. #       include/linux/input/it7260.h
  51. #       include/linux/mfd/nvec.h
  52. #       include/linux/power/nvec_power.h
  53. #       include/linux/power/tps6586x_battery.h
  54. #       include/linux/regulator/virtual_adj.h
  55. #       include/linux/smp_lock.h
  56. #       include/sound/alc5624.h
  57.  
  58.  
  59. diff --git a/arch/arm/mach-tegra/Kconfig b/arch/arm/mach-tegra/Kconfig
  60. index 48b1692..189466f 100644
  61. --- a/arch/arm/mach-tegra/Kconfig
  62. +++ b/arch/arm/mach-tegra/Kconfig
  63. @@ -64,6 +64,13 @@ config MACH_ADAM
  64.         help
  65.           Support for all TabletPCs based on the ADAM design.
  66.  
  67. +config MACH_SMBA1002
  68. +       bool "Malata smba1002"
  69. +         depends on ARCH_TEGRA_2x_SOC
  70. +         select MACH_HAS_SND_SOC_TEGRA_ALC5623 if SND_SOC
  71. +       help
  72. +         Support for the Malata smba1002
  73. +
  74.  config MACH_HARMONY
  75.         bool "Harmony board"
  76.         depends on ARCH_TEGRA_2x_SOC
  77. diff --git a/arch/arm/mach-tegra/Makefile b/arch/arm/mach-tegra/Makefile
  78. index 2ee82c3..ffd1448 100644
  79. --- a/arch/arm/mach-tegra/Makefile
  80. +++ b/arch/arm/mach-tegra/Makefile
  81. @@ -113,6 +113,40 @@ obj-${CONFIG_MACH_SEABOARD}             += board-seaboard-pinmux.o
  82.  obj-${CONFIG_MACH_TRIMSLICE}            += board-trimslice.o
  83.  obj-${CONFIG_MACH_TRIMSLICE}            += board-trimslice-pinmux.o
  84.  
  85. +# smba1002 arch drivers
  86. +obj-${CONFIG_MACH_SMBA1002}              += board-smba1002-aes.o
  87. +obj-${CONFIG_MACH_SMBA1002}              += board-smba1002-audio.o
  88. +obj-${CONFIG_MACH_SMBA1002}              += board-smba1002-bootinfo.o
  89. +obj-${CONFIG_MACH_SMBA1002}              += board-smba1002-bt.o
  90. +obj-${CONFIG_MACH_SMBA1002}              += board-smba1002-camera.o
  91. +obj-${CONFIG_MACH_SMBA1002}              += board-smba1002-clocks.o
  92. +obj-${CONFIG_MACH_SMBA1002}              += board-smba1002-gps.o
  93. +obj-${CONFIG_MACH_SMBA1002}              += board-smba1002-gpu.o
  94. +obj-${CONFIG_MACH_SMBA1002}              += board-smba1002-gsm.o
  95. +obj-${CONFIG_MACH_SMBA1002}              += board-smba1002-i2c.o
  96. +obj-${CONFIG_MACH_SMBA1002}              += board-smba1002-keyboard.o
  97. +obj-${CONFIG_MACH_SMBA1002}              += board-smba1002-memory.o
  98. +obj-${CONFIG_MACH_SMBA1002}              += board-smba1002-nand.o
  99. +obj-${CONFIG_MACH_SMBA1002}              += board-smba1002-pinmux.o
  100. +obj-${CONFIG_MACH_SMBA1002}              += board-smba1002-power.o
  101. +obj-${CONFIG_MACH_SMBA1002}              += board-smba1002-sdhci.o
  102. +obj-${CONFIG_MACH_SMBA1002}              += board-smba1002-sensors.o
  103. +obj-${CONFIG_MACH_SMBA1002}              += board-smba1002-spi.o
  104. +obj-${CONFIG_MACH_SMBA1002}              += board-smba1002-touch.o
  105. +obj-${CONFIG_MACH_SMBA1002}              += board-smba1002-uart.o
  106. +obj-${CONFIG_MACH_SMBA1002}              += board-smba1002-usb.o
  107. +obj-${CONFIG_MACH_SMBA1002}              += board-smba1002-wake.o
  108. +obj-${CONFIG_MACH_SMBA1002}              += board-smba1002-wdt.o
  109. +#obj-${CONFIG_MACH_SMBA1002}              += board-smba1002-wlan.o
  110. +obj-${CONFIG_MACH_SMBA1002}              += board-smba1002.o
  111. +# smba1002 power management drivers
  112. +obj-${CONFIG_MACH_SMBA1002}              += board-smba1002-pm-bluetooth.o
  113. +obj-${CONFIG_MACH_SMBA1002}              += board-smba1002-pm-camera.o
  114. +#obj-${CONFIG_MACH_SMBA1002}              += board-smba1002-pm-gps.o
  115. +#obj-${CONFIG_MACH_SMBA1002}              += board-smba1002-pm-gsm.o
  116. +#obj-${CONFIG_MACH_SMBA1002}              += board-smba1002-pm-wlan.o
  117. +
  118. +
  119.  obj-${CONFIG_MACH_VENTANA}              += board-ventana.o
  120.  obj-${CONFIG_MACH_VENTANA}              += board-ventana-pinmux.o
  121.  obj-${CONFIG_MACH_VENTANA}              += board-ventana-sdhci.o
  122. diff --git a/arch/arm/mach-tegra/include/mach/latency_allowance.h b/arch/arm/mach-tegra/include/mach/latency_allowance.h
  123. index f0d27f0..fae2896 100644
  124. --- a/arch/arm/mach-tegra/include/mach/latency_allowance.h
  125. +++ b/arch/arm/mach-tegra/include/mach/latency_allowance.h
  126. @@ -104,7 +104,7 @@ static inline int tegra_enable_latency_scaling(enum tegra_la_id id,
  127.  
  128.  static inline void tegra_disable_latency_scaling(enum tegra_la_id id)
  129.  {
  130. -   return 0;
  131. +   return;
  132.  }
  133.  #else
  134.  int tegra_set_latency_allowance(enum tegra_la_id id,
  135. diff --git a/arch/arm/mach-tegra/include/mach/sdhci.h b/arch/arm/mach-tegra/include/mach/sdhci.h
  136. index 8e9dcc4..1c9e6bc 100644
  137. --- a/arch/arm/mach-tegra/include/mach/sdhci.h
  138. +++ b/arch/arm/mach-tegra/include/mach/sdhci.h
  139. @@ -24,8 +24,8 @@ struct tegra_sdhci_platform_data {
  140.     int cd_gpio;
  141.     int wp_gpio;
  142.     int power_gpio;
  143. -   int is_8bit;
  144. -   int has_no_vreg;      /* 1=No voltage regulator */
  145. +   int is_8bit:1;
  146. +   int has_no_vreg:1;  /* 1=No voltage regulator */
  147.     struct mmc_platform_data mmc_data;
  148.  };
  149.  
  150. diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
  151. index 66b22bf..0e9cdc1 100644
  152. --- a/include/linux/netdevice.h
  153. +++ b/include/linux/netdevice.h
  154. @@ -556,7 +556,7 @@ struct netdev_queue {
  155.     struct Qdisc        *qdisc;
  156.     unsigned long       state;
  157.     struct Qdisc        *qdisc_sleeping;
  158. -#ifdef CONFIG_RPS
  159. +#if defined(CONFIG_RPS) || defined(CONFIG_XPS)
  160.     struct kobject      kobj;
  161.  #endif
  162.  #if defined(CONFIG_XPS) && defined(CONFIG_NUMA)
  163. @@ -571,6 +571,12 @@ struct netdev_queue {
  164.      * please use this field instead of dev->trans_start
  165.      */
  166.     unsigned long       trans_start;
  167. +
  168. +   /*
  169. +    * Number of TX timeouts for this queue
  170. +    * (/sys/class/net/DEV/Q/trans_timeout)
  171. +    */
  172. +   unsigned long    trans_timeout;
  173.  } ____cacheline_aligned_in_smp;
  174.  
  175.  static inline int netdev_queue_numa_node_read(const struct netdev_queue *q)
  176. @@ -1208,8 +1214,10 @@ struct net_device {
  177.  
  178.     unsigned char       broadcast[MAX_ADDR_LEN];    /* hw bcast add */
  179.  
  180. -#ifdef CONFIG_RPS
  181. +#if defined(CONFIG_RPS) || defined(CONFIG_XPS)
  182. +#ifdef CONFIG_SYSFS
  183.     struct kset     *queues_kset;
  184. +#endif
  185.  
  186.     struct netdev_rx_queue  *_rx;
Advertisement
Add Comment
Please, Sign In to add comment