Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 (e1ec1b8c) · Commits · e / devices / android_kernel_fairphone_FP5

Documentation/networking/00-INDEX

+0 −3

Original line number	Diff line number	Diff line
		@@ -84,9 +84,6 @@ policy-routing.txt
		- IP policy-based routing
		ray_cs.txt
		- Raylink Wireless LAN card driver info.
		sk98lin.txt
		- Marvell Yukon Chipset / SysKonnect SK-98xx compliant Gigabit
		Ethernet Adapter family driver info
		skfp.txt
		- SysKonnect FDDI (SK-5xxx, Compaq Netelligent) driver info.
		smc9.txt

deleted100644 → 0

+0 −568

File deleted.

Preview size limit exceeded, changes collapsed.

+1 −0

Original line number	Diff line number	Diff line
		@@ -978,6 +978,7 @@ static int fs_open(struct atm_vcc *atm_vcc)
		/* Docs are vague about this atm_hdr field. By the way, the FS
		* chip makes odd errors if lower bits are set.... -- REW */
		tc->atm_hdr = (vpi << 20) \| (vci << 4);
		tmc0 = 0;
		{
		int pcr = atm_pcr_goal (txtp);

+1 −2

Original line number	Diff line number	Diff line
		@@ -3000,8 +3000,7 @@ he_proc_read(struct atm_dev dev, loff_t pos, char *page)

		/* eeprom routines -- see 4.7 */

		u8
		read_prom_byte(struct he_dev *he_dev, int addr)
		static u8 read_prom_byte(struct he_dev *he_dev, int addr)
		{
		u32 val = 0, tmp_read = 0;
		int i, j = 0;

+2 −4

Original line number	Diff line number	Diff line
		@@ -2016,8 +2016,7 @@ idt77252_send_skb(struct atm_vcc vcc, struct sk_buff skb, int oam)
		return 0;
		}

		int
		idt77252_send(struct atm_vcc vcc, struct sk_buff skb)
		static int idt77252_send(struct atm_vcc vcc, struct sk_buff skb)
		{
		return idt77252_send_skb(vcc, skb, 0);
		}
		@@ -3072,8 +3071,7 @@ idt77252_dev_open(struct idt77252_dev *card)
		return 0;
		}

		void
		idt77252_dev_close(struct atm_dev *dev)
		static void idt77252_dev_close(struct atm_dev *dev)
		{
		struct idt77252_dev *card = dev->dev_data;
		u32 conf;