diff options
author | David S. Miller <davem@davemloft.net> | 2011-09-22 03:23:13 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2011-09-22 03:23:13 -0400 |
commit | 8decf868790b48a727d7e7ca164f2bcd3c1389c0 (patch) | |
tree | b759a5f861f842af7ea76f9011b579d06e9d5508 /drivers/staging | |
parent | 3fc72370186be2f9d4d6ef06d99e1caa5d92c564 (diff) | |
parent | d93dc5c4478c1fd5de85a3e8aece9aad7bbae044 (diff) |
Merge branch 'master' of github.com:davem330/net
Conflicts:
MAINTAINERS
drivers/net/Kconfig
drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c
drivers/net/ethernet/broadcom/tg3.c
drivers/net/wireless/iwlwifi/iwl-pci.c
drivers/net/wireless/iwlwifi/iwl-trans-tx-pcie.c
drivers/net/wireless/rt2x00/rt2800usb.c
drivers/net/wireless/wl12xx/main.c
Diffstat (limited to 'drivers/staging')
-rw-r--r-- | drivers/staging/brcm80211/brcmsmac/otp.c | 1 | ||||
-rw-r--r-- | drivers/staging/brcm80211/brcmsmac/types.h | 1 | ||||
-rw-r--r-- | drivers/staging/comedi/drivers/ni_labpc.c | 4 | ||||
-rw-r--r-- | drivers/staging/gma500/mdfld_dsi_dbi.c | 3 | ||||
-rw-r--r-- | drivers/staging/gma500/mdfld_dsi_dbi.h | 3 | ||||
-rw-r--r-- | drivers/staging/gma500/mdfld_dsi_dpi.c | 7 | ||||
-rw-r--r-- | drivers/staging/gma500/mdfld_dsi_output.c | 4 | ||||
-rw-r--r-- | drivers/staging/gma500/medfield.h | 2 | ||||
-rw-r--r-- | drivers/staging/gma500/psb_drv.h | 1 | ||||
-rw-r--r-- | drivers/staging/octeon/ethernet-rgmii.c | 1 | ||||
-rw-r--r-- | drivers/staging/octeon/ethernet-spi.c | 1 | ||||
-rw-r--r-- | drivers/staging/tidspbridge/core/dsp-clock.c | 1 | ||||
-rw-r--r-- | drivers/staging/zcache/tmem.c | 2 | ||||
-rw-r--r-- | drivers/staging/zcache/zcache-main.c | 10 |
14 files changed, 24 insertions, 17 deletions
diff --git a/drivers/staging/brcm80211/brcmsmac/otp.c b/drivers/staging/brcm80211/brcmsmac/otp.c index 34253cf3781..4a70180eba5 100644 --- a/drivers/staging/brcm80211/brcmsmac/otp.c +++ b/drivers/staging/brcm80211/brcmsmac/otp.c | |||
@@ -16,6 +16,7 @@ | |||
16 | 16 | ||
17 | #include <linux/io.h> | 17 | #include <linux/io.h> |
18 | #include <linux/errno.h> | 18 | #include <linux/errno.h> |
19 | #include <linux/string.h> | ||
19 | 20 | ||
20 | #include <brcm_hw_ids.h> | 21 | #include <brcm_hw_ids.h> |
21 | #include <chipcommon.h> | 22 | #include <chipcommon.h> |
diff --git a/drivers/staging/brcm80211/brcmsmac/types.h b/drivers/staging/brcm80211/brcmsmac/types.h index bbf21897ae0..823b5e4672e 100644 --- a/drivers/staging/brcm80211/brcmsmac/types.h +++ b/drivers/staging/brcm80211/brcmsmac/types.h | |||
@@ -18,6 +18,7 @@ | |||
18 | #define _BRCM_TYPES_H_ | 18 | #define _BRCM_TYPES_H_ |
19 | 19 | ||
20 | #include <linux/types.h> | 20 | #include <linux/types.h> |
21 | #include <linux/io.h> | ||
21 | 22 | ||
22 | /* Bus types */ | 23 | /* Bus types */ |
23 | #define SI_BUS 0 /* SOC Interconnect */ | 24 | #define SI_BUS 0 /* SOC Interconnect */ |
diff --git a/drivers/staging/comedi/drivers/ni_labpc.c b/drivers/staging/comedi/drivers/ni_labpc.c index 6859af0778c..7611def97d0 100644 --- a/drivers/staging/comedi/drivers/ni_labpc.c +++ b/drivers/staging/comedi/drivers/ni_labpc.c | |||
@@ -241,8 +241,10 @@ static int labpc_eeprom_write_insn(struct comedi_device *dev, | |||
241 | struct comedi_insn *insn, | 241 | struct comedi_insn *insn, |
242 | unsigned int *data); | 242 | unsigned int *data); |
243 | static void labpc_adc_timing(struct comedi_device *dev, struct comedi_cmd *cmd); | 243 | static void labpc_adc_timing(struct comedi_device *dev, struct comedi_cmd *cmd); |
244 | #ifdef CONFIG_COMEDI_PCI | 244 | #ifdef CONFIG_ISA_DMA_API |
245 | static unsigned int labpc_suggest_transfer_size(struct comedi_cmd cmd); | 245 | static unsigned int labpc_suggest_transfer_size(struct comedi_cmd cmd); |
246 | #endif | ||
247 | #ifdef CONFIG_COMEDI_PCI | ||
246 | static int labpc_find_device(struct comedi_device *dev, int bus, int slot); | 248 | static int labpc_find_device(struct comedi_device *dev, int bus, int slot); |
247 | #endif | 249 | #endif |
248 | static int labpc_dio_mem_callback(int dir, int port, int data, | 250 | static int labpc_dio_mem_callback(int dir, int port, int data, |
diff --git a/drivers/staging/gma500/mdfld_dsi_dbi.c b/drivers/staging/gma500/mdfld_dsi_dbi.c index 02e17c9c863..fd211f3467c 100644 --- a/drivers/staging/gma500/mdfld_dsi_dbi.c +++ b/drivers/staging/gma500/mdfld_dsi_dbi.c | |||
@@ -711,10 +711,11 @@ struct mdfld_dsi_encoder *mdfld_dsi_dbi_init(struct drm_device *dev, | |||
711 | /* Create drm encoder object */ | 711 | /* Create drm encoder object */ |
712 | connector = &dsi_connector->base.base; | 712 | connector = &dsi_connector->base.base; |
713 | encoder = &dbi_output->base.base; | 713 | encoder = &dbi_output->base.base; |
714 | /* Review this if we ever get MIPI-HDMI bridges or similar */ | ||
714 | drm_encoder_init(dev, | 715 | drm_encoder_init(dev, |
715 | encoder, | 716 | encoder, |
716 | p_funcs->encoder_funcs, | 717 | p_funcs->encoder_funcs, |
717 | DRM_MODE_ENCODER_MIPI); | 718 | DRM_MODE_ENCODER_LVDS); |
718 | drm_encoder_helper_add(encoder, p_funcs->encoder_helper_funcs); | 719 | drm_encoder_helper_add(encoder, p_funcs->encoder_helper_funcs); |
719 | 720 | ||
720 | /* Attach to given connector */ | 721 | /* Attach to given connector */ |
diff --git a/drivers/staging/gma500/mdfld_dsi_dbi.h b/drivers/staging/gma500/mdfld_dsi_dbi.h index dc6242c51d0..f0fa986fd93 100644 --- a/drivers/staging/gma500/mdfld_dsi_dbi.h +++ b/drivers/staging/gma500/mdfld_dsi_dbi.h | |||
@@ -42,9 +42,6 @@ | |||
42 | #include "mdfld_dsi_output.h" | 42 | #include "mdfld_dsi_output.h" |
43 | #include "mdfld_output.h" | 43 | #include "mdfld_output.h" |
44 | 44 | ||
45 | #define DRM_MODE_ENCODER_MIPI 5 | ||
46 | |||
47 | |||
48 | /* | 45 | /* |
49 | * DBI encoder which inherits from mdfld_dsi_encoder | 46 | * DBI encoder which inherits from mdfld_dsi_encoder |
50 | */ | 47 | */ |
diff --git a/drivers/staging/gma500/mdfld_dsi_dpi.c b/drivers/staging/gma500/mdfld_dsi_dpi.c index 6e03a91e947..e685f1217ba 100644 --- a/drivers/staging/gma500/mdfld_dsi_dpi.c +++ b/drivers/staging/gma500/mdfld_dsi_dpi.c | |||
@@ -777,10 +777,15 @@ struct mdfld_dsi_encoder *mdfld_dsi_dpi_init(struct drm_device *dev, | |||
777 | /* Create drm encoder object */ | 777 | /* Create drm encoder object */ |
778 | connector = &dsi_connector->base.base; | 778 | connector = &dsi_connector->base.base; |
779 | encoder = &dpi_output->base.base; | 779 | encoder = &dpi_output->base.base; |
780 | /* | ||
781 | * On existing hardware this will be a panel of some form, | ||
782 | * if future devices also have HDMI bridges this will need | ||
783 | * revisiting | ||
784 | */ | ||
780 | drm_encoder_init(dev, | 785 | drm_encoder_init(dev, |
781 | encoder, | 786 | encoder, |
782 | p_funcs->encoder_funcs, | 787 | p_funcs->encoder_funcs, |
783 | DRM_MODE_ENCODER_MIPI); | 788 | DRM_MODE_ENCODER_LVDS); |
784 | drm_encoder_helper_add(encoder, | 789 | drm_encoder_helper_add(encoder, |
785 | p_funcs->encoder_helper_funcs); | 790 | p_funcs->encoder_helper_funcs); |
786 | 791 | ||
diff --git a/drivers/staging/gma500/mdfld_dsi_output.c b/drivers/staging/gma500/mdfld_dsi_output.c index 7536095c30a..9050c0f78b1 100644 --- a/drivers/staging/gma500/mdfld_dsi_output.c +++ b/drivers/staging/gma500/mdfld_dsi_output.c | |||
@@ -955,7 +955,9 @@ void mdfld_dsi_output_init(struct drm_device *dev, | |||
955 | psb_output->type = (pipe == 0) ? INTEL_OUTPUT_MIPI : INTEL_OUTPUT_MIPI2; | 955 | psb_output->type = (pipe == 0) ? INTEL_OUTPUT_MIPI : INTEL_OUTPUT_MIPI2; |
956 | 956 | ||
957 | connector = &psb_output->base; | 957 | connector = &psb_output->base; |
958 | drm_connector_init(dev, connector, &mdfld_dsi_connector_funcs, DRM_MODE_CONNECTOR_MIPI); | 958 | /* Revisit type if MIPI/HDMI bridges ever appear on Medfield */ |
959 | drm_connector_init(dev, connector, &mdfld_dsi_connector_funcs, | ||
960 | DRM_MODE_CONNECTOR_LVDS); | ||
959 | drm_connector_helper_add(connector, &mdfld_dsi_connector_helper_funcs); | 961 | drm_connector_helper_add(connector, &mdfld_dsi_connector_helper_funcs); |
960 | 962 | ||
961 | connector->display_info.subpixel_order = SubPixelHorizontalRGB; | 963 | connector->display_info.subpixel_order = SubPixelHorizontalRGB; |
diff --git a/drivers/staging/gma500/medfield.h b/drivers/staging/gma500/medfield.h index 38165e8367e..09e9687431f 100644 --- a/drivers/staging/gma500/medfield.h +++ b/drivers/staging/gma500/medfield.h | |||
@@ -21,8 +21,6 @@ | |||
21 | * DEALINGS IN THE SOFTWARE. | 21 | * DEALINGS IN THE SOFTWARE. |
22 | */ | 22 | */ |
23 | 23 | ||
24 | #define DRM_MODE_ENCODER_MIPI 5 | ||
25 | |||
26 | /* Medfield DSI controller registers */ | 24 | /* Medfield DSI controller registers */ |
27 | 25 | ||
28 | #define MIPIA_DEVICE_READY_REG 0xb000 | 26 | #define MIPIA_DEVICE_READY_REG 0xb000 |
diff --git a/drivers/staging/gma500/psb_drv.h b/drivers/staging/gma500/psb_drv.h index 72f487a2a1b..fd4732dd783 100644 --- a/drivers/staging/gma500/psb_drv.h +++ b/drivers/staging/gma500/psb_drv.h | |||
@@ -35,7 +35,6 @@ | |||
35 | 35 | ||
36 | /* Append new drm mode definition here, align with libdrm definition */ | 36 | /* Append new drm mode definition here, align with libdrm definition */ |
37 | #define DRM_MODE_SCALE_NO_SCALE 2 | 37 | #define DRM_MODE_SCALE_NO_SCALE 2 |
38 | #define DRM_MODE_CONNECTOR_MIPI 15 | ||
39 | 38 | ||
40 | enum { | 39 | enum { |
41 | CHIP_PSB_8108 = 0, /* Poulsbo */ | 40 | CHIP_PSB_8108 = 0, /* Poulsbo */ |
diff --git a/drivers/staging/octeon/ethernet-rgmii.c b/drivers/staging/octeon/ethernet-rgmii.c index 9c0d2936e48..c3d73f8431a 100644 --- a/drivers/staging/octeon/ethernet-rgmii.c +++ b/drivers/staging/octeon/ethernet-rgmii.c | |||
@@ -26,6 +26,7 @@ | |||
26 | **********************************************************************/ | 26 | **********************************************************************/ |
27 | #include <linux/kernel.h> | 27 | #include <linux/kernel.h> |
28 | #include <linux/netdevice.h> | 28 | #include <linux/netdevice.h> |
29 | #include <linux/interrupt.h> | ||
29 | #include <linux/phy.h> | 30 | #include <linux/phy.h> |
30 | #include <linux/ratelimit.h> | 31 | #include <linux/ratelimit.h> |
31 | #include <net/dst.h> | 32 | #include <net/dst.h> |
diff --git a/drivers/staging/octeon/ethernet-spi.c b/drivers/staging/octeon/ethernet-spi.c index 97082542188..d0e2d514968 100644 --- a/drivers/staging/octeon/ethernet-spi.c +++ b/drivers/staging/octeon/ethernet-spi.c | |||
@@ -26,6 +26,7 @@ | |||
26 | **********************************************************************/ | 26 | **********************************************************************/ |
27 | #include <linux/kernel.h> | 27 | #include <linux/kernel.h> |
28 | #include <linux/netdevice.h> | 28 | #include <linux/netdevice.h> |
29 | #include <linux/interrupt.h> | ||
29 | #include <net/dst.h> | 30 | #include <net/dst.h> |
30 | 31 | ||
31 | #include <asm/octeon/octeon.h> | 32 | #include <asm/octeon/octeon.h> |
diff --git a/drivers/staging/tidspbridge/core/dsp-clock.c b/drivers/staging/tidspbridge/core/dsp-clock.c index 589a0554332..3d1279c424a 100644 --- a/drivers/staging/tidspbridge/core/dsp-clock.c +++ b/drivers/staging/tidspbridge/core/dsp-clock.c | |||
@@ -209,7 +209,6 @@ int dsp_clk_enable(enum dsp_clk_id clk_id) | |||
209 | break; | 209 | break; |
210 | #ifdef CONFIG_OMAP_MCBSP | 210 | #ifdef CONFIG_OMAP_MCBSP |
211 | case MCBSP_CLK: | 211 | case MCBSP_CLK: |
212 | omap_mcbsp_set_io_type(MCBSP_ID(clk_id), OMAP_MCBSP_POLL_IO); | ||
213 | omap_mcbsp_request(MCBSP_ID(clk_id)); | 212 | omap_mcbsp_request(MCBSP_ID(clk_id)); |
214 | omap2_mcbsp_set_clks_src(MCBSP_ID(clk_id), MCBSP_CLKS_PAD_SRC); | 213 | omap2_mcbsp_set_clks_src(MCBSP_ID(clk_id), MCBSP_CLKS_PAD_SRC); |
215 | break; | 214 | break; |
diff --git a/drivers/staging/zcache/tmem.c b/drivers/staging/zcache/tmem.c index 975e34bcd72..1ca66ea9b28 100644 --- a/drivers/staging/zcache/tmem.c +++ b/drivers/staging/zcache/tmem.c | |||
@@ -604,7 +604,7 @@ int tmem_get(struct tmem_pool *pool, struct tmem_oid *oidp, uint32_t index, | |||
604 | struct tmem_obj *obj; | 604 | struct tmem_obj *obj; |
605 | void *pampd; | 605 | void *pampd; |
606 | bool ephemeral = is_ephemeral(pool); | 606 | bool ephemeral = is_ephemeral(pool); |
607 | uint32_t ret = -1; | 607 | int ret = -1; |
608 | struct tmem_hashbucket *hb; | 608 | struct tmem_hashbucket *hb; |
609 | bool free = (get_and_free == 1) || ((get_and_free == 0) && ephemeral); | 609 | bool free = (get_and_free == 1) || ((get_and_free == 0) && ephemeral); |
610 | bool lock_held = false; | 610 | bool lock_held = false; |
diff --git a/drivers/staging/zcache/zcache-main.c b/drivers/staging/zcache/zcache-main.c index 855a5bb56a4..462fbc20561 100644 --- a/drivers/staging/zcache/zcache-main.c +++ b/drivers/staging/zcache/zcache-main.c | |||
@@ -1158,7 +1158,7 @@ static void *zcache_pampd_create(char *data, size_t size, bool raw, int eph, | |||
1158 | size_t clen; | 1158 | size_t clen; |
1159 | int ret; | 1159 | int ret; |
1160 | unsigned long count; | 1160 | unsigned long count; |
1161 | struct page *page = virt_to_page(data); | 1161 | struct page *page = (struct page *)(data); |
1162 | struct zcache_client *cli = pool->client; | 1162 | struct zcache_client *cli = pool->client; |
1163 | uint16_t client_id = get_client_id_from_client(cli); | 1163 | uint16_t client_id = get_client_id_from_client(cli); |
1164 | unsigned long zv_mean_zsize; | 1164 | unsigned long zv_mean_zsize; |
@@ -1227,7 +1227,7 @@ static int zcache_pampd_get_data(char *data, size_t *bufsize, bool raw, | |||
1227 | int ret = 0; | 1227 | int ret = 0; |
1228 | 1228 | ||
1229 | BUG_ON(is_ephemeral(pool)); | 1229 | BUG_ON(is_ephemeral(pool)); |
1230 | zv_decompress(virt_to_page(data), pampd); | 1230 | zv_decompress((struct page *)(data), pampd); |
1231 | return ret; | 1231 | return ret; |
1232 | } | 1232 | } |
1233 | 1233 | ||
@@ -1242,7 +1242,7 @@ static int zcache_pampd_get_data_and_free(char *data, size_t *bufsize, bool raw, | |||
1242 | int ret = 0; | 1242 | int ret = 0; |
1243 | 1243 | ||
1244 | BUG_ON(!is_ephemeral(pool)); | 1244 | BUG_ON(!is_ephemeral(pool)); |
1245 | zbud_decompress(virt_to_page(data), pampd); | 1245 | zbud_decompress((struct page *)(data), pampd); |
1246 | zbud_free_and_delist((struct zbud_hdr *)pampd); | 1246 | zbud_free_and_delist((struct zbud_hdr *)pampd); |
1247 | atomic_dec(&zcache_curr_eph_pampd_count); | 1247 | atomic_dec(&zcache_curr_eph_pampd_count); |
1248 | return ret; | 1248 | return ret; |
@@ -1539,7 +1539,7 @@ static int zcache_put_page(int cli_id, int pool_id, struct tmem_oid *oidp, | |||
1539 | goto out; | 1539 | goto out; |
1540 | if (!zcache_freeze && zcache_do_preload(pool) == 0) { | 1540 | if (!zcache_freeze && zcache_do_preload(pool) == 0) { |
1541 | /* preload does preempt_disable on success */ | 1541 | /* preload does preempt_disable on success */ |
1542 | ret = tmem_put(pool, oidp, index, page_address(page), | 1542 | ret = tmem_put(pool, oidp, index, (char *)(page), |
1543 | PAGE_SIZE, 0, is_ephemeral(pool)); | 1543 | PAGE_SIZE, 0, is_ephemeral(pool)); |
1544 | if (ret < 0) { | 1544 | if (ret < 0) { |
1545 | if (is_ephemeral(pool)) | 1545 | if (is_ephemeral(pool)) |
@@ -1572,7 +1572,7 @@ static int zcache_get_page(int cli_id, int pool_id, struct tmem_oid *oidp, | |||
1572 | pool = zcache_get_pool_by_id(cli_id, pool_id); | 1572 | pool = zcache_get_pool_by_id(cli_id, pool_id); |
1573 | if (likely(pool != NULL)) { | 1573 | if (likely(pool != NULL)) { |
1574 | if (atomic_read(&pool->obj_count) > 0) | 1574 | if (atomic_read(&pool->obj_count) > 0) |
1575 | ret = tmem_get(pool, oidp, index, page_address(page), | 1575 | ret = tmem_get(pool, oidp, index, (char *)(page), |
1576 | &size, 0, is_ephemeral(pool)); | 1576 | &size, 0, is_ephemeral(pool)); |
1577 | zcache_put_pool(pool); | 1577 | zcache_put_pool(pool); |
1578 | } | 1578 | } |