Changeset 777 for GPL/trunk/alsa-kernel/pci/es1968.c

Legend:

Unmodified

Added

Removed

• GPL/trunk

  • Property svn:mergeinfo changed
    /GPL/branches/uniaud32-exp merged: 766-767,​770-771,​773-774

• GPL/trunk/alsa-kernel/pci/es1968.c

  r772	r777
  489	489	struct list_head list;
  490	490
  491	(削除) #ifdef CONFIG_PM_SLEEP (削除ここまで)
  492	491	u16 wc_map[4];
  493	(削除) #endif (削除ここまで)
  494	492	};
  495	493
  …	…
  542	540	spinlock_t substream_lock;
  543	541
  544	(削除) #ifdef CONFIG_PM_SLEEP (削除ここまで)
  545	542	u16 apu_map[NR_APUS][NR_APU_REGS];
  546	(削除) #endif (削除ここまで)
  547	543
  548	544	#ifdef SUPPORT_JOYSTICK
  …	…
  705	701	if (snd_BUG_ON(channel >= NR_APUS))
  706	702	return;
  707	(削除) #ifdef CONFIG_PM_SLEEP (削除ここまで)
  708	703	chip->apu_map[channel][reg] = data;
  709	(削除) #endif (削除ここまで)
  710	704	reg |= (channel << 4);
  711	705	apu_index_set(chip, reg);
  …	…
  992	986	wave_set_register(chip, es->apu[channel] << 3, tmpval);
  993	987
  994	(削除) #ifdef CONFIG_PM_SLEEP (削除ここまで)
  995	988	es->wc_map[channel] = tmpval;
  996	(削除) #endif (削除ここまで)
  997	989	}
  998	990
  …	…
  2393	2385	}
  2394	2386
  2395	(削除) #ifdef CONFIG_PM_SLEEP (削除ここまで)
  2396	2387	/*
  2397	2388	* PM support
  …	…
  2455	2446	}
  2456	2447
  2457	static SIMPLE_DEV_PM_OPS(es1968_pm, es1968_suspend, es1968_resume);
  2458	#define ES1968_PM_OPS &es1968_pm
  2459	#else
  2460	#define ES1968_PM_OPS NULL
  2461	#endif /* CONFIG_PM_SLEEP */
  2448	static DEFINE_SIMPLE_DEV_PM_OPS(es1968_pm, es1968_suspend, es1968_resume);
  2462	2449
  2463	2450	#ifdef SUPPORT_JOYSTICK
  …	…
  2889	2876	.probe = snd_es1968_probe,
  2890	2877	.driver = {
  2891	.pm = (削除) ES1968_PM_OPS (削除ここまで),
  2878	.pm = (追記) &es1968_pm (追記ここまで),
  2892	2879	},
  2893	2880	};

Note: See TracChangeset for help on using the changeset viewer.