Hunk Failure with 2.4.25

Steve Holmes steve at holmesgrown.com
Mon Feb 23 16:34:54 EST 2004


I just untared linux-2.4.25 and did a current CVS checkout.  During
the checkout, one hunk failed to patch.  Below is the Makefile.rej.  I
really don't know how to interpret patch reject files to understand
what is going on.  Can I forget this and go on? I'm never sure with
patch hunk failures <sigh>.

----- /usr/src/linux/drivers/char/Makefile.rej -----
***************
*** 23,32 ****
  
  export-objs     :=	busmouse.o console.o keyboard.o sysrq.o \
  			misc.o pty.o random.o selection.o serial.o \
- 			sonypi.o tty_io.o tty_ioctl.o generic_serial.o \
  			au1000_gpio.o hp_psaux.o nvram.o scx200.o fetchop.o
  
- mod-subdirs	:=	joystick ftape drm drm-4.0 pcmcia
  
  list-multi	:=	
  
--- 23,32 ----
  
  export-objs     :=	busmouse.o console.o keyboard.o sysrq.o \
  			misc.o pty.o random.o selection.o serial.o \
+ 			sonypi.o tty_io.o tty_ioctl.o generic_serial.o vt.o \
  			au1000_gpio.o hp_psaux.o nvram.o scx200.o fetchop.o
  
+ mod-subdirs	:=	joystick ftape drm drm-4.0 pcmcia speakup
  
  list-multi	:=	
----- end of Makefile.rej -----  

-- 
HolmesGrown Solutions
The best solutions for the best price!
http://ld.net/?holmesgrown




More information about the Speakup mailing list