Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 13223cb0 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'master' of /home/davem/src/GIT/linux-2.6/

parents 1383bdb9 07d43ba9
Loading
Loading
Loading
Loading
+4 −4
Original line number Original line Diff line number Diff line
@@ -40,13 +40,13 @@ Resuming
Machine Support
Machine Support
---------------
---------------


  The machine specific functions must call the s3c2410_pm_init() function
  The machine specific functions must call the s3c_pm_init() function
  to say that its bootloader is capable of resuming. This can be as
  to say that its bootloader is capable of resuming. This can be as
  simple as adding the following to the machine's definition:
  simple as adding the following to the machine's definition:


  INITMACHINE(s3c2410_pm_init)
  INITMACHINE(s3c_pm_init)


  A board can do its own setup before calling s3c2410_pm_init, if it
  A board can do its own setup before calling s3c_pm_init, if it
  needs to setup anything else for power management support.
  needs to setup anything else for power management support.


  There is currently no support for over-riding the default method of
  There is currently no support for over-riding the default method of
@@ -74,7 +74,7 @@ statuc void __init machine_init(void)


	enable_irq_wake(IRQ_EINT0);
	enable_irq_wake(IRQ_EINT0);


	s3c2410_pm_init();
	s3c_pm_init();
}
}




+8 −1
Original line number Original line Diff line number Diff line
@@ -29,7 +29,14 @@ ffff0000 ffff0fff CPU vector page.
				CPU supports vector relocation (control
				CPU supports vector relocation (control
				register V bit.)
				register V bit.)


ffc00000	fffeffff	DMA memory mapping region.  Memory returned
fffe0000	fffeffff	XScale cache flush area.  This is used
				in proc-xscale.S to flush the whole data
				cache.  Free for other usage on non-XScale.

fff00000	fffdffff	Fixmap mapping region.  Addresses provided
				by fix_to_virt() will be located here.

ffc00000	ffefffff	DMA memory mapping region.  Memory returned
				by the dma_alloc_xxx functions will be
				by the dma_alloc_xxx functions will be
				dynamically mapped here.
				dynamically mapped here.


+3 −3
Original line number Original line Diff line number Diff line
@@ -18,11 +18,11 @@ For an architecture to support this feature, it must define some of
these macros in include/asm-XXX/topology.h:
these macros in include/asm-XXX/topology.h:
#define topology_physical_package_id(cpu)
#define topology_physical_package_id(cpu)
#define topology_core_id(cpu)
#define topology_core_id(cpu)
#define topology_thread_siblings(cpu)
#define topology_thread_cpumask(cpu)
#define topology_core_siblings(cpu)
#define topology_core_cpumask(cpu)


The type of **_id is int.
The type of **_id is int.
The type of siblings is cpumask_t.
The type of siblings is (const) struct cpumask *.


To be consistent on all architectures, include/linux/topology.h
To be consistent on all architectures, include/linux/topology.h
provides default definitions for any of the above macros that are
provides default definitions for any of the above macros that are
+6 −0
Original line number Original line Diff line number Diff line
@@ -3145,6 +3145,12 @@ Your cooperation is appreciated.
		  1 = /dev/blockrom1	Second ROM card's translation layer interface
		  1 = /dev/blockrom1	Second ROM card's translation layer interface
		  ...
		  ...


260 char	OSD (Object-based-device) SCSI Device
		  0 = /dev/osd0		First OSD Device
		  1 = /dev/osd1		Second OSD Device
		  ...
		  255 = /dev/osd255	256th OSD Device

 ****	ADDITIONAL /dev DIRECTORY ENTRIES
 ****	ADDITIONAL /dev DIRECTORY ENTRIES


This section details additional entries that should or may exist in
This section details additional entries that should or may exist in
+2 −1
Original line number Original line Diff line number Diff line
@@ -340,7 +340,8 @@ Who: Krzysztof Piotr Oledzki <ole@ans.pl>
---------------------------
---------------------------


What:	i2c_attach_client(), i2c_detach_client(), i2c_driver->detach_client()
What:	i2c_attach_client(), i2c_detach_client(), i2c_driver->detach_client()
When:	2.6.29 (ideally) or 2.6.30 (more likely)
When:	2.6.30
Check:	i2c_attach_client i2c_detach_client
Why:	Deprecated by the new (standard) device driver binding model. Use
Why:	Deprecated by the new (standard) device driver binding model. Use
	i2c_driver->probe() and ->remove() instead.
	i2c_driver->probe() and ->remove() instead.
Who:	Jean Delvare <khali@linux-fr.org>
Who:	Jean Delvare <khali@linux-fr.org>
Loading